Rename Condition_Type_Entity to Condition_Entity_Type