Improve naming as requested by huntc in PR 1806