Merge "Rename .map.txt used by tests" into main