Fix Templating

After a recent update to default values it was noticed that some templates were still using the deprecated values. Update all templates to make sure they use the proper values.