Feature/rename template type labels