diff --git a/planetstack/hpc/admin.py b/planetstack/hpc/admin.py
index 1f4e759..75e0fbb 100644
--- a/planetstack/hpc/admin.py
+++ b/planetstack/hpc/admin.py
@@ -10,7 +10,7 @@
 from django.utils import timezone
 from django.contrib.contenttypes import generic
 from suit.widgets import LinkedSelect
-from core.admin import SingletonAdmin,SliceInline,ServiceAttrAsTabInline, ReadOnlyAwareAdmin, PlStackTabularInline
+from core.admin import SingletonAdmin,SliceInline,ServiceAttrAsTabInline, ReadOnlyAwareAdmin, XOSTabularInline
 
 class HpcServiceAdmin(SingletonAdmin):
     model = HpcService
@@ -29,14 +29,14 @@
         ('serviceattrs','Additional Attributes'),
     )
 
-class CDNPrefixInline(PlStackTabularInline):
+class CDNPrefixInline(XOSTabularInline):
     model = CDNPrefix
     extra = 0
     suit_classes = 'suit-tab suit-tab-prefixes'
     fields = ('backend_status_icon', 'cdn_prefix_id', 'prefix', 'defaultOriginServer', 'enabled')
     readonly_fields = ('backend_status_icon', 'cdn_prefix_id',)
 
-class ContentProviderInline(PlStackTabularInline):
+class ContentProviderInline(XOSTabularInline):
     model = ContentProvider
     extra = 0
     suit_classes = 'suit-tab suit-tab-cps'