Merge "Get the correct operator name"