Better names in entity.