renamed ENTITY_UNDEFINED => ENTITY_ENTITY