diff --git a/xos/vmme.xproto b/xos/vmme.xproto
index de2374a..feaee04 100644
--- a/xos/vmme.xproto
+++ b/xos/vmme.xproto
@@ -1,24 +1,22 @@
 option name = "vMME";
-option verbose_name = "Virtual Mobility Management Entity";
 option app_label = "vmme";
 option kind = "vEPC";
 
 message VMMEService (Service){
-    option name = "VMMEService";
     option verbose_name = "Virtual Mobility Management Entity Service";
 }
 
 message VMMEVendor (XOSBase){
-    option name = "VMMEVendor";
     option verbose_name = "Virtual Mobility Management Entity Vendor";
+
     required string name = 1 [help_text = "vendor name", max_length = 32, null = False, db_index = False, blank = False]; 
     required manytoone image->Image:+ = 2 [help_text = "select image for this vendor", db_index = True, null = False, blank = False];
     required manytoone flavor->Flavor:+ = 3 [help_text = "select openstack flavor for vendor image", db_index = True, null = False, blank = False];
 }
 
 message VMMETenant (TenantWithContainer){
-    option name = "VMMETenant";
-    option verbose_name = "Virtual Mobility Management Entity Tenant";
+    option verbose_name = "Virtual Mobility Management Entity Service Instance";
+
     optional manytoone vmme_vendor->VMMEVendor:vendor_tenants = 1 [help_text = "select vendor of choice, leave blank for slice default", db_index = True, null = True, blank = True]; 
 }