rename the entity fields