diff --git a/xos/attic/header.py b/xos/attic/header.py
index 56ffd5e..34b198f 100644
--- a/xos/attic/header.py
+++ b/xos/attic/header.py
@@ -1,7 +1,7 @@
 from django.db import models
 from django.db.models import *
-from core.models import Service, PlCoreBase, Slice, Instance, Tenant, TenantWithContainer, Node, Image, User, Flavor, TenantRoot, NetworkParameter, NetworkParameterType, Port, AddressPool, User
-from core.models.plcorebase import StrippedCharField
+from core.models import Service, XOSBase, Slice, Instance, Tenant, TenantWithContainer, Node, Image, User, Flavor, TenantRoot, NetworkParameter, NetworkParameterType, Port, AddressPool, User
+from core.models.xosbase import StrippedCharField
 import os
 from django.db import models, transaction
 from django.forms.models import model_to_dict
diff --git a/xos/volt.xproto b/xos/volt.xproto
index 52e5e87..3145408 100644
--- a/xos/volt.xproto
+++ b/xos/volt.xproto
@@ -14,13 +14,13 @@
      optional manytoone creator->User:created_volts = 3 [db_index = True, null = True, blank = True];
 }
 
-message AccessAgent (PlCoreBase){
+message AccessAgent (XOSBase){
      required string name = 1 [help_text = "name of agent", max_length = 254, null = False, db_index = False, blank = False];
      required manytoone volt_service->VOLTService:access_agents = 2 [db_index = True, null = False, blank = False];
      optional string mac = 3 [help_text = "MAC Address or Access Agent", max_length = 32, null = True, db_index = False, blank = True];
 }
 
-message VOLTDevice (PlCoreBase){
+message VOLTDevice (XOSBase){
      option verbose_name = "vOLT Device";
 
      required string name = 1 [help_text = "name of device", max_length = 254, null = False, db_index = False, blank = False];
@@ -30,13 +30,13 @@
      optional manytoone access_agent->AccessAgent:volt_devices = 5 [db_index = True, null = True, blank = True];
 }
 
-message AccessDevice (PlCoreBase){
+message AccessDevice (XOSBase){
      required manytoone volt_device->VOLTDevice:access_devices = 1 [db_index = True, null = False, blank = False];
      optional int32 uplink = 2 [db_index = False, null = True, blank = True];
      optional int32 vlan = 3 [db_index = False, null = True, blank = True];
 }
 
-message AgentPortMapping (PlCoreBase){
+message AgentPortMapping (XOSBase){
      required manytoone access_agent->AccessAgent:port_mappings = 1 [db_index = True, null = False, blank = False];
      optional string mac = 2 [help_text = "MAC Address", max_length = 32, null = True, db_index = False, blank = True];
      optional string port = 3 [help_text = "Openflow port ID", max_length = 32, null = True, db_index = False, blank = True];