Renaming some variables/templates