Improving on the naming convention of our classes with consistency adjustments. Also creates a better hierarchy (matched pairs) for them.