diff --git a/xos/synchronizer/steps/sync_vpgwc.py b/xos/synchronizer/steps/sync_vpgwc.py
index 70056b3..bbfc0a8 100644
--- a/xos/synchronizer/steps/sync_vpgwc.py
+++ b/xos/synchronizer/steps/sync_vpgwc.py
@@ -1,17 +1,17 @@
 import os
 import sys
 from django.db.models import Q, F
-from services.vpgwc.models import VPGWCService, VPGWCComponent
+from services.vpgwc.models import VPGWCService, VPGWCTenant
 from synchronizers.base.SyncInstanceUsingAnsible import SyncInstanceUsingAnsible
 
 parentdir = os.path.join(os.path.dirname(__file__), "..")
 sys.path.insert(0, parentdir)
 
-class SyncVPGWCComponent(SyncInstanceUsingAnsible):
+class SyncVPGWCTenant(SyncInstanceUsingAnsible):
 
-    provides = [VPGWCComponent]
+    provides = [VPGWCTenant]
 
-    observes = VPGWCComponent
+    observes = VPGWCTenant
 
     requested_interval = 0
 
@@ -20,18 +20,20 @@
     service_key_name = "/opt/xos/configurations/mcord/mcord_private_key"
 
     def __init__(self, *args, **kwargs):
-        super(SyncVPGWCComponent, self).__init__(*args, **kwargs)
+        super(SyncVPGWCTenant, self).__init__(*args, **kwargs)
 
     def fetch_pending(self, deleted):
 
         if (not deleted):
-            objs = VPGWCComponent.get_tenant_objects().filter(
+            objs = VPGWCTenant.get_tenant_objects().filter(
                 Q(enacted__lt=F('updated')) | Q(enacted=None), Q(lazy_blocked=False))
         else:
 
-            objs = VPGWCComponent.get_deleted_tenant_objects()
+            objs = VPGWCTenant.get_deleted_tenant_objects()
 
         return objs
 
+    # Gets the attributes that are used by the Ansible template but are not
+    # part of the set of default attributes.
     def get_extra_attributes(self, o):
         return {"display_message": o.display_message, "s5s8_pgw_tag": o.s5s8_pgw_tag}
diff --git a/xos/synchronizer/vpgwc_config b/xos/synchronizer/vpgwc_config
index c6b9c23..d5cf77c 100755
--- a/xos/synchronizer/vpgwc_config
+++ b/xos/synchronizer/vpgwc_config
@@ -10,7 +10,8 @@
 [api]
 nova_enabled=True
 
-# Sets options for the observer
+
+# Sets options for the synchronizer
 [observer]
 # Optional name
 name=vpgwc