consolidated templates and renamed