better consistency in template naming