fixes to comply with template naming convention