Merge "Revert erroneous rename from previous CL" into main