(maint) Appease puppet-line

This updates some variable names in templates, as well as some fixes to
make puppet-line happier.