diff --git a/program/admin.py b/program/admin.py
index 6306b752e06a559f23f1315c7c42f5c8068aa9e9..0d7ea87c10bf37b9dbb8b49c3d1fa8081654da59 100644
--- a/program/admin.py
+++ b/program/admin.py
@@ -7,6 +7,7 @@ from django.contrib.auth.models import User
 from django.db.models import JSONField
 from django.utils.safestring import mark_safe
 from program.models import (
+    CBA,
     Category,
     FundingCategory,
     Host,
@@ -18,7 +19,6 @@ from program.models import (
     RRule,
     Topic,
     Type,
-    UserProfile,
 )
 
 
@@ -58,19 +58,20 @@ class RRuleAdmin(admin.ModelAdmin):
     list_display = ("name", "freq", "interval", "by_set_pos", "by_weekdays", "count")
 
 
-class UserProfileInline(admin.StackedInline):
-    model = UserProfile
-    fields = ("cba_username", "cba_user_token")
+class CBAInline(admin.StackedInline):
+    model = CBA
+    fields = ("username", "user_token")
     can_delete = False
-    verbose_name_plural = "Profile"
+    verbose_name = "CBA"
+    verbose_name_plural = "CBA"
     fk_name = "user"
 
 
-class UserProfileUserAdmin(UserAdmin):
-    inlines = (UserProfileInline,)
+class UserCBAAdmin(UserAdmin):
+    inlines = (CBAInline,)
 
     def get_queryset(self, request):
-        """Let common users only edit their own profile"""
+        """Let common users only edit their own CBA."""
         if not request.user.is_superuser:
             return super(UserAdmin, self).get_queryset(request).filter(pk=request.user.id)
 
@@ -92,15 +93,15 @@ class UserProfileUserAdmin(UserAdmin):
         return list()
 
     def get_inline_instances(self, request, obj=None):
-        """Append profile fields to UserAdmin"""
+        """Append CBA fields to UserAdmin"""
         if not obj:
             return list()
 
-        return super(UserProfileUserAdmin, self).get_inline_instances(request, obj)
+        return super(UserCBAAdmin, self).get_inline_instances(request, obj)
 
 
 admin.site.unregister(User)
-admin.site.register(User, UserProfileUserAdmin)
+admin.site.register(User, UserCBAAdmin)
 
 
 @admin.register(RadioSettings)