Change Template to use [self name] for entity name