bug-14786: minor renames
17 files changed