tweaks: rename three functions, to be shorter or clearer
4 files changed