diff --git a/xos/synchronizer/Dockerfile.synchronizer b/xos/synchronizer/Dockerfile.synchronizer
index f6607ac..859575e 100644
--- a/xos/synchronizer/Dockerfile.synchronizer
+++ b/xos/synchronizer/Dockerfile.synchronizer
@@ -1,15 +1,15 @@
-# xosproject/vsgw-synchronizer
+# xosproject/vsgwc-synchronizer
 FROM xosproject/xos-synchronizer-base:candidate
 
-COPY . /opt/xos/synchronizers/vsgw
+COPY . /opt/xos/synchronizers/vsgwc
 
 ENTRYPOINT []
 
-WORKDIR "/opt/xos/synchronizers/vsgw"
+WORKDIR "/opt/xos/synchronizers/vsgwc"
 
 # Label image
 ARG org_label_schema_schema_version=1.0
-ARG org_label_schema_name=vsgw-synchronizer
+ARG org_label_schema_name=vsgwc-synchronizer
 ARG org_label_schema_version=unknown
 ARG org_label_schema_vcs_url=unknown
 ARG org_label_schema_vcs_ref=unknown
@@ -36,4 +36,4 @@
       org.opencord.component.xos.vcs-url=$org_opencord_component_xos_vcs_url \
       org.opencord.component.xos.vcs-ref=$org_opencord_component_xos_vcs_ref
 
-CMD bash -c "cd /opt/xos/synchronizers/vsgw; ./run-from-api.sh"
\ No newline at end of file
+CMD bash -c "cd /opt/xos/synchronizers/vsgwc; ./run-from-api.sh"
\ No newline at end of file
diff --git a/xos/synchronizer/manifest b/xos/synchronizer/manifest
index 04700fd..42602f4 100644
--- a/xos/synchronizer/manifest
+++ b/xos/synchronizer/manifest
@@ -2,7 +2,7 @@
 manifest
 run.sh
 stop.sh
-vsgw-synchronizer.py
-vsgw_config
-steps/sync_vsgw.py
-steps/sync_vsgw.yaml
+vsgwc-synchronizer.py
+vsgwc_config
+steps/sync_vsgwc.py
+steps/sync_vsgwc.yaml
diff --git a/xos/synchronizer/run-from-api.sh b/xos/synchronizer/run-from-api.sh
index bcbc374..3b4b9f9 100755
--- a/xos/synchronizer/run-from-api.sh
+++ b/xos/synchronizer/run-from-api.sh
@@ -1,2 +1,2 @@
 export XOS_DIR=/opt/xos
-python vsgw-synchronizer.py  -C $XOS_DIR/synchronizers/vsgw/vsgw_from_api_config
\ No newline at end of file
+python vsgwc-synchronizer.py  -C $XOS_DIR/synchronizers/vsgwc/vsgwc_from_api_config
\ No newline at end of file
diff --git a/xos/synchronizer/steps/sync_vsgwtenant.py b/xos/synchronizer/steps/sync_vsgwctenant.py
similarity index 71%
rename from xos/synchronizer/steps/sync_vsgwtenant.py
rename to xos/synchronizer/steps/sync_vsgwctenant.py
index 4d7e3b4..31583f2 100644
--- a/xos/synchronizer/steps/sync_vsgwtenant.py
+++ b/xos/synchronizer/steps/sync_vsgwctenant.py
@@ -7,29 +7,29 @@
 parentdir = os.path.join(os.path.dirname(__file__), "..")
 sys.path.insert(0, parentdir)
 
-class SyncVSGWTenant(SyncInstanceUsingAnsible):
+class SyncVSGWCTenant(SyncInstanceUsingAnsible):
 
-    provides = [VSGWTenant]
+    provides = [VSGWCTenant]
 
-    observes = VSGWTenant
+    observes = VSGWCTenant
 
     requested_interval = 0
 
-    template_name = "vsgwtenant_playbook.yaml"
+    template_name = "vsgwctenant_playbook.yaml"
 
     service_key_name = "/opt/xos/configurations/mcord/mcord_private_key"
 
     def __init__(self, *args, **kwargs):
-        super(SyncVSGWTenant, self).__init__(*args, **kwargs)
+        super(SyncVSGWCTenant, self).__init__(*args, **kwargs)
 
     def fetch_pending(self, deleted):
 
         if (not deleted):
-            objs = VSGWTenant.get_tenant_objects().filter(
+            objs = VSGWCTenant.get_tenant_objects().filter(
                 Q(enacted__lt=F('updated')) | Q(enacted=None), Q(lazy_blocked=False))
         else:
             # If this is a deletion we get all of the deleted tenants..
-            objs = VSGWTenant.get_deleted_tenant_objects()
+            objs = VSGWCTenant.get_deleted_tenant_objects()
 
         return objs
 
diff --git a/xos/synchronizer/steps/vsgwtenant_playbook.yaml b/xos/synchronizer/steps/vsgwctenant_playbook.yaml
similarity index 100%
rename from xos/synchronizer/steps/vsgwtenant_playbook.yaml
rename to xos/synchronizer/steps/vsgwctenant_playbook.yaml
diff --git a/xos/synchronizer/stop.sh b/xos/synchronizer/stop.sh
index 4444370..68fe7c4 100644
--- a/xos/synchronizer/stop.sh
+++ b/xos/synchronizer/stop.sh
@@ -1,2 +1,2 @@
 # Kill the observer
-pkill -9 -f vsgw-synchronizer.py
+pkill -9 -f vsgwc-synchronizer.py
diff --git a/xos/synchronizer/vsgw_from_api_config b/xos/synchronizer/vsgw_from_api_config
deleted file mode 100644
index d0f23fd..0000000
--- a/xos/synchronizer/vsgw_from_api_config
+++ /dev/null
@@ -1,20 +0,0 @@
-# Sets options for the synchronizer
-[observer]
-name=vsgw
-dependency_graph=/opt/xos/synchronizers/vsgw/model-deps
-steps_dir=/opt/xos/synchronizers/vsgw/steps
-sys_dir=/opt/xos/synchronizers/vsgw/sys
-#logfile=/var/log/xos_backend.log
-log_file=console
-log_level=debug
-pretend=False
-backoff_disabled=True
-save_ansible_output=True
-proxy_ssh=True
-proxy_ssh_key=/opt/cord_profile/node_key
-proxy_ssh_user=root
-accessor_kind=api
-accessor_password=@/opt/xos/services/vsgw/credentials/xosadmin@opencord.org
-
-[networking]
-use_vtn=True
\ No newline at end of file
diff --git a/xos/synchronizer/vsgw-synchronizer.py b/xos/synchronizer/vsgwc-synchronizer.py
similarity index 100%
rename from xos/synchronizer/vsgw-synchronizer.py
rename to xos/synchronizer/vsgwc-synchronizer.py
diff --git a/xos/synchronizer/vsgwc_from_api_config b/xos/synchronizer/vsgwc_from_api_config
new file mode 100644
index 0000000..fcd8bd3
--- /dev/null
+++ b/xos/synchronizer/vsgwc_from_api_config
@@ -0,0 +1,20 @@
+# Sets options for the synchronizer
+[observer]
+name=vsgwc
+dependency_graph=/opt/xos/synchronizers/vsgwc/model-deps
+steps_dir=/opt/xos/synchronizers/vsgwc/steps
+sys_dir=/opt/xos/synchronizers/vsgwc/sys
+#logfile=/var/log/xos_backend.log
+log_file=console
+log_level=debug
+pretend=False
+backoff_disabled=True
+save_ansible_output=True
+proxy_ssh=True
+proxy_ssh_key=/opt/cord_profile/node_key
+proxy_ssh_user=root
+accessor_kind=api
+accessor_password=@/opt/xos/services/vsgwc/credentials/xosadmin@opencord.org
+
+[networking]
+use_vtn=True
\ No newline at end of file