diff --git a/protogeni/rspec/protogeni-rspec-common.rnc b/protogeni/rspec/protogeni-rspec-common.rnc
index 9cb659df67ebaa725211e39d24791022da65d39a..068993ec283419861a8a03a37b0fa84830c5832e 100644
--- a/protogeni/rspec/protogeni-rspec-common.rnc
+++ b/protogeni/rspec/protogeni-rspec-common.rnc
@@ -53,14 +53,15 @@ include "../../assign/top.rnc" {
     InterfaceContents = 
 	# In an advertisement, the component_uuid is mandatory.
 	# In a request, the virtual_uuid is mandatory.
-        element virtual_uuid { text }?,
+        element virtual_node_uuid { text }?,
 	element virtual_interface_name { text }?,
-	element component_uuid { text }?,
+	element component_node_uuid { text }?,
         element component_interface_name { text }?
 }
 
 InterfaceDecl = element interface {
-	attribute name { text }
+	attribute virtual_name { text },
+	attribute component_name { text }
 }
 
 ComponentSpec =