diff --git a/xos/configurations/openvpn/docker-compose.yml b/xos/configurations/openvpn/docker-compose.yml
index 478653c..e609838 100644
--- a/xos/configurations/openvpn/docker-compose.yml
+++ b/xos/configurations/openvpn/docker-compose.yml
@@ -19,10 +19,10 @@
 
 xos_synchronizer_openvpn:
     image: xosproject/xos-openvpn
-    command: bash -c "sleep 120 ; python /opt/xos/synchronizers/vpn/vpn-synchronizer.py -C /opt/xos/synchronizers/vpn/vpn_config"
+    command: bash -c "sleep 120 ; python /opt/xos/synchronizers/openvpn/openvpn-synchronizer.py -C /opt/xos/synchronizers/openvpn/openvpn_config"
     labels:
         org.xosproject.kind: synchronizer
-        org.xosproject.target: vpn
+        org.xosproject.target: openvpn
     links:
         - xos_db
     extra_hosts:
diff --git a/xos/synchronizers/openvpn/vpn-synchronizer.py b/xos/synchronizers/openvpn/openvpn-synchronizer.py
similarity index 100%
rename from xos/synchronizers/openvpn/vpn-synchronizer.py
rename to xos/synchronizers/openvpn/openvpn-synchronizer.py
diff --git a/xos/synchronizers/openvpn/vpn_config b/xos/synchronizers/openvpn/openvpn_config
similarity index 64%
rename from xos/synchronizers/openvpn/vpn_config
rename to xos/synchronizers/openvpn/openvpn_config
index 2cdb192..8a58b52 100644
--- a/xos/synchronizers/openvpn/vpn_config
+++ b/xos/synchronizers/openvpn/openvpn_config
@@ -12,10 +12,10 @@
 
 # Sets options for the synchronizer
 [observer]
-name=vpn
-dependency_graph=/opt/xos/synchronizers/vpn/model-deps
-steps_dir=/opt/xos/synchronizers/vpn/steps
-sys_dir=/opt/xos/synchronizers/vpn/sys
+name=openvpn
+dependency_graph=/opt/xos/synchronizers/openvpn/model-deps
+steps_dir=/opt/xos/synchronizers/openvpn/steps
+sys_dir=/opt/xos/synchronizers/openvpn/sys
 logfile=/var/log/xos_backend.log
 pretend=False
 backoff_disabled=True
diff --git a/xos/synchronizers/openvpn/run.sh b/xos/synchronizers/openvpn/run.sh
index 9a2e69b..a5d90c9 100755
--- a/xos/synchronizers/openvpn/run.sh
+++ b/xos/synchronizers/openvpn/run.sh
@@ -1,2 +1,2 @@
 export XOS_DIR=/opt/xos
-python vpn-synchronizer.py  -C $XOS_DIR/synchronizers/vpn/vpn_config
+python openvpn-synchronizer.py  -C $XOS_DIR/synchronizers/openvpn/openvpn_config
diff --git a/xos/synchronizers/openvpn/stop.sh b/xos/synchronizers/openvpn/stop.sh
index 4178688..4a83aca 100755
--- a/xos/synchronizers/openvpn/stop.sh
+++ b/xos/synchronizers/openvpn/stop.sh
@@ -1,2 +1,2 @@
 # Kill the observer
-pkill -9 -f vpn-synchronizer.py
+pkill -9 -f openvpn-synchronizer.py