Fix naming convention with template