changed the entity names