Keep entity type casing