Rename module function names (2/3)

Test: Build success
Bug: 354243057
Flag: NONE cleanup
Change-Id: I7f5642cf988a3ba6b5cc2ff1a0b48130bcea79c4
2 files changed