align nomenclature to 'includes' instead of 'templates'