Improve naming ever-so-slightly