Finished renaming template code