Fix issues with naming; create only one template