diff --git a/xos/observers/vpn/run.sh b/xos/observers/vpn/run.sh
deleted file mode 100755
index 2fc0ca5..0000000
--- a/xos/observers/vpn/run.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export XOS_DIR=/opt/xos
-python vpn-observer.py  -C $XOS_DIR/observers/vpn/vpn_config
diff --git a/xos/observers/vpn/stop.sh b/xos/observers/vpn/stop.sh
deleted file mode 100755
index 5feca3c..0000000
--- a/xos/observers/vpn/stop.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Kill the observer
-pkill -9 -f vpn-observer.py
diff --git a/xos/observers/vpn/__init__.py b/xos/synchronizers/vpn/__init__.py
similarity index 100%
rename from xos/observers/vpn/__init__.py
rename to xos/synchronizers/vpn/__init__.py
diff --git a/xos/observers/vpn/model-deps b/xos/synchronizers/vpn/model-deps
similarity index 100%
rename from xos/observers/vpn/model-deps
rename to xos/synchronizers/vpn/model-deps
diff --git a/xos/synchronizers/vpn/run.sh b/xos/synchronizers/vpn/run.sh
new file mode 100755
index 0000000..1bf07bc
--- /dev/null
+++ b/xos/synchronizers/vpn/run.sh
@@ -0,0 +1,2 @@
+export XOS_DIR=/opt/xos
+python vpn-synchronizer.py  -C $XOS_DIR/synchronizer/vpn/vpn_config
diff --git a/xos/observers/vpn/steps/__init__.py b/xos/synchronizers/vpn/steps/__init__.py
similarity index 100%
rename from xos/observers/vpn/steps/__init__.py
rename to xos/synchronizers/vpn/steps/__init__.py
diff --git a/xos/observers/vpn/steps/sync_vpntenant.py b/xos/synchronizers/vpn/steps/sync_vpntenant.py
similarity index 97%
rename from xos/observers/vpn/steps/sync_vpntenant.py
rename to xos/synchronizers/vpn/steps/sync_vpntenant.py
index 17d2f45..a966dd8 100644
--- a/xos/observers/vpn/steps/sync_vpntenant.py
+++ b/xos/synchronizers/vpn/steps/sync_vpntenant.py
@@ -13,7 +13,7 @@
     observes = VPNTenant
     requested_interval = 0
     template_name = "sync_vpntenant.yaml"
-    service_key_name = "/opt/xos/observers/vpn/vpn_private_key"
+    service_key_name = "/opt/xos/synchronizer/vpn/vpn_private_key"
 
     def __init__(self, *args, **kwargs):
         super(SyncVPNTenant, self).__init__(*args, **kwargs)
diff --git a/xos/observers/vpn/steps/sync_vpntenant.yaml b/xos/synchronizers/vpn/steps/sync_vpntenant.yaml
similarity index 100%
rename from xos/observers/vpn/steps/sync_vpntenant.yaml
rename to xos/synchronizers/vpn/steps/sync_vpntenant.yaml
diff --git a/xos/synchronizers/vpn/stop.sh b/xos/synchronizers/vpn/stop.sh
new file mode 100755
index 0000000..4178688
--- /dev/null
+++ b/xos/synchronizers/vpn/stop.sh
@@ -0,0 +1,2 @@
+# Kill the observer
+pkill -9 -f vpn-synchronizer.py
diff --git a/xos/observers/vpn/vpn-observer.py b/xos/synchronizers/vpn/vpn-synchronizer.py
similarity index 78%
rename from xos/observers/vpn/vpn-observer.py
rename to xos/synchronizers/vpn/vpn-synchronizer.py
index 2d7644f..db5b759 100755
--- a/xos/observers/vpn/vpn-observer.py
+++ b/xos/synchronizers/vpn/vpn-synchronizer.py
@@ -6,5 +6,5 @@
 observer_path = os.path.join(os.path.dirname(
     os.path.realpath(__file__)), "../..")
 sys.path.append(observer_path)
-mod = importlib.import_module("xos-observer")
+mod = importlib.import_module("xos-synchronizer")
 mod.main()
diff --git a/xos/observers/vpn/vpn_config b/xos/synchronizers/vpn/vpn_config
similarity index 60%
rename from xos/observers/vpn/vpn_config
rename to xos/synchronizers/vpn/vpn_config
index 8165ae1..7433038 100644
--- a/xos/observers/vpn/vpn_config
+++ b/xos/synchronizers/vpn/vpn_config
@@ -10,12 +10,12 @@
 [api]
 nova_enabled=True
 
-# Sets options for the observer
+# Sets options for the synchronizer
 [observer]
 name=vpn
-dependency_graph=/opt/xos/observers/vpn/model-deps
-steps_dir=/opt/xos/observers/vpn/steps
-sys_dir=/opt/xos/observers/vpn/sys
+dependency_graph=/opt/xos/synchronizer/vpn/model-deps
+steps_dir=/opt/xos/synchronizer/vpn/steps
+sys_dir=/opt/xos/synchronizer/vpn/sys
 logfile=/var/log/xos_backend.log
 pretend=False
 backoff_disabled=True