Change uniqueness from (operator_type, operator_name) to operator_name.