Change Template to use [self entityName] for entity name