Change variable names to avoid hitting Puppet 3.4 future parser bug

This is a puppet bug as the variables are valid as per [the docs](http://docs.puppetlabs.com/puppet/latest/reference/lang_reserved.html#variables), but it's an easy work around to change the variable names. 

Completely understand if you don't want to accept the change.