Updated variable references to be puppet 3.x compliant