Adds better template naming