Merge "Rename module function names (2/3)" into main