Minor renamings of internal inline functions
13 files changed