fix issue with template paths & naming