Merge "Reorder function names (2/3)" into main