Change variable names to avoid hitting Puppet 3.4 future parser bug