diff --git a/planetstack/model_policies/model_policy_User.py b/planetstack/model_policies/model_policy_User.py
index 703b28c..5e2adad 100644
--- a/planetstack/model_policies/model_policy_User.py
+++ b/planetstack/model_policies/model_policy_User.py
@@ -1,15 +1,15 @@
 from core.models import *
 
 def handle(user):
-	from core.models import Controller, ControllerSiteDeployments, ControllerUsers
+	from core.models import Controller, ControllerSite, ControllerUser
 	from collections import defaultdict
-	ctrl_site_deployments = ControllerSiteDeployments.objects.all()
+	ctrl_site_deployments = ControllerSite.objects.all()
 	controller_lookup = defaultdict(list)
 	for ctrl_site_deployment in ctrl_site_deployments:
 		controller_site_lookup[ctrl_site_deployment.site_deployment].append(ctrl_site_deployment)
 
 	controller_user_lookup = defaultdict(list)
-	for controller_user in ControllerUsers.objects.all():
+	for controller_user in ControllerUser.objects.all():
 		controller_user_lookup[controller_user.user].append(controller_user.controller)
    
 	if user.is_admin:
@@ -25,6 +25,6 @@
 		if not user in controller_user_lookup or \
 		  expected_controller not in controller_user_lookup[user]: 
 			# add new record
-			ud = ControllerUsers(user=user, controller=expected_controller)
+			ud = ControllerUser(user=user, controller=expected_controller)
 			ud.save()