Use more intuitive naming for template parts