Change variable naming to comply with puppet 3.