Some renaming to help produce shorter names, and perhaps better show intent?