Rename obviously shared functions
Update all callers (32-bit)
Update all callers (64-bit)
Indentation fixes related to renames