Template fix

Added names to templates. Hooray!