diff --git a/templates/test.vhost.erb b/templates/test.vhost.erb
index ff3152d..3fc166b 100644
--- a/templates/test.vhost.erb
+++ b/templates/test.vhost.erb
@@ -4,8 +4,8 @@
 NameVirtualHost *:80
 <VirtualHost *:80>
   ServerName testvhost
-  DocumentRoot <%= docroot %>
-  <Directory <%= docroot %>> 
+  DocumentRoot <%= @docroot %>
+  <Directory <%= @docroot %>>
     Options Indexes FollowSymLinks MultiViews
     AllowOverride None
     Order allow,deny
diff --git a/templates/vhost-default.conf.erb b/templates/vhost-default.conf.erb
index dce19f2..2cb96d5 100644
--- a/templates/vhost-default.conf.erb
+++ b/templates/vhost-default.conf.erb
@@ -3,24 +3,24 @@
 # Managed by Puppet
 # ************************************
 
-NameVirtualHost <%= vhost_name %>:<%= port %>
-<VirtualHost <%= vhost_name %>:<%= port %>>
-  ServerName <%= srvname %>
-<% if serveraliases.is_a? Array -%>
-<% serveraliases.each do |name| -%><%= "  ServerAlias #{name}\n" %><% end -%>
-<% elsif serveraliases != '' -%>
-<%= "  ServerAlias #{serveraliases}" -%>
+NameVirtualHost <%= @vhost_name %>:<%= @port %>
+<VirtualHost <%= @vhost_name %>:<%= @port %>>
+  ServerName <%= @srvname %>
+<% if @serveraliases.is_a? Array -%>
+<% @serveraliases.each do |name| -%><%= "  ServerAlias #{name}\n" %><% end -%>
+<% elsif @serveraliases != '' -%>
+<%= "  ServerAlias #{@serveraliases}" -%>
 <% end -%>
-  DocumentRoot <%= docroot %>
-  <Directory <%= docroot %>>
-    Options <%= options %>
+  DocumentRoot <%= @docroot %>
+  <Directory <%= @docroot %>>
+    Options <%= @options %>
     AllowOverride None
     Order allow,deny
     allow from all
   </Directory>
-  ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= name %>_error.log
+  ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log
   LogLevel warn
-  CustomLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= name %>_access.log combined
+  CustomLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_access.log combined
   ServerSignature Off
 </VirtualHost>
 
diff --git a/templates/vhost-proxy.conf.erb b/templates/vhost-proxy.conf.erb
index 4794af8..8635dd5 100644
--- a/templates/vhost-proxy.conf.erb
+++ b/templates/vhost-proxy.conf.erb
@@ -1,28 +1,28 @@
-NameVirtualHost <%= vhost_name %>:<%= port %>
-<VirtualHost <%= vhost_name %>:<%= port %>>
-  <% if ssl == true %>
+NameVirtualHost <%= @vhost_name %>:<%= @port %>
+<VirtualHost <%= @vhost_name %>:<%= @port %>>
+  <% if @ssl == true %>
   SSLEngine on
-  SSLCertificateFile <%= ssl_path %>/certs/pl.cert
-  SSLCertificateKeyFile <%= ssl_path %>/private/pl.key
+  SSLCertificateFile <%= @ssl_path %>/certs/pl.cert
+  SSLCertificateKeyFile <%= @ssl_path %>/private/pl.key
   <% end %>
-  ServerName <%= srvname %>
-<% if serveraliases.is_a? Array %>
-<% serveraliases.each do |name| %><%= "  ServerAlias #{name}\n" %><% end %>
-<% elsif serveraliases != '' %>
-<%= "  ServerAlias #{serveraliases}" %>
+  ServerName <%= @srvname %>
+<% if @serveraliases.is_a? Array %>
+<% @serveraliases.each do |name| %><%= "  ServerAlias #{name}\n" %><% end %>
+<% elsif @serveraliases != '' %>
+<%= "  ServerAlias #{@serveraliases}" %>
 <% end %>
    ProxyRequests Off
    <Proxy *>
      Order deny,allow
      Allow from all
    </Proxy>
-   ProxyPass        / <%= dest %>/
-   ProxyPassReverse / <%= dest %>/
+   ProxyPass        / <%= @dest %>/
+   ProxyPassReverse / <%= @dest %>/
    ProxyPreserveHost On 
 
-   ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= name %>_error.log
+   ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log
    LogLevel warn
-   CustomLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= name %>_access.log combined
+   CustomLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_access.log combined
 
 </VirtualHost>
 
diff --git a/templates/vhost-redirect.conf.erb b/templates/vhost-redirect.conf.erb
index 240f924..1cd0362 100644
--- a/templates/vhost-redirect.conf.erb
+++ b/templates/vhost-redirect.conf.erb
@@ -1,11 +1,11 @@
-NameVirtualHost <%= vhost_name %>:<%= port %>
-<VirtualHost <%= vhost_name %>:<%= port %>>
-  ServerName <%= srvname %>
-<% if serveraliases.is_a? Array %>
-<% serveraliases.each do |name| %><%= "  ServerAlias #{name}\n" %><% end %>
-<% elsif serveraliases != '' %>
-<%= "  ServerAlias #{serveraliases}" %>
+NameVirtualHost <%= @vhost_name %>:<%= @port %>
+<VirtualHost <%= @vhost_name %>:<%= @port %>>
+  ServerName <%= @srvname %>
+<% if @serveraliases.is_a? Array %>
+<% @serveraliases.each do |name| %><%= "  ServerAlias #{name}\n" %><% end %>
+<% elsif @serveraliases != '' %>
+<%= "  ServerAlias #{@serveraliases}" %>
 <% end %>
-  Redirect / <%= dest %>/
+  Redirect / <%= @dest %>/
 </VirtualHost>