Fixing variable names which don't conform to Puppet 3.4 naming rules.