Redesigned template index and naming