diff --git a/manifests/server.pp b/manifests/server.pp
index 5a0a7a06..e28a9001 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -369,7 +369,7 @@
       }
 
       $ca_common_name = $common_name
-      ::openvpn::ca { $name:
+      openvpn::ca { $name:
         dn_mode        => $dn_mode,
         country        => $country,
         province       => $province,
diff --git a/templates/etc-default-openvpn.erb b/templates/etc-default-openvpn.erb
index b6cb0d29..f4fcb9c4 100644
--- a/templates/etc-default-openvpn.erb
+++ b/templates/etc-default-openvpn.erb
@@ -17,7 +17,7 @@
 #STATUSREFRESH=0
 # Optional arguments to openvpn's command line
 OPTARGS=""
-<% if scope.lookupvar('::openvpn::autostart_all') -%>
+<% if scope.lookupvar('openvpn::autostart_all') -%>
 AUTOSTART="all"
 <% else -%>
 AUTOSTART=""
diff --git a/templates/server.erb b/templates/server.erb
index e9036a0c..b921bc7e 100644
--- a/templates/server.erb
+++ b/templates/server.erb
@@ -178,7 +178,7 @@ client-disconnect "<% unless @client_disconnect =~ /^\// %><%= @_script_dir %>/<
 username-as-common-name
 <% end -%>
 <% if @ldap_enabled == true -%>
-plugin <%= scope.lookupvar('::openvpn::ldap_auth_plugin_location') %> "<%= @server_directory %>/<%= @name %>/auth/ldap.conf"
+plugin <%= scope.lookupvar('openvpn::ldap_auth_plugin_location') %> "<%= @server_directory %>/<%= @name %>/auth/ldap.conf"
 <% end -%>
 <% if @client_cert_not_required -%>
 client-cert-not-required