bug-14786: minor renames
10 files changed