renamed entity -> ir_entity