Added name field to templates