Fixing op_name issues