Fix generated entity name