Fix up template crap to not use same name locally hurr