#15 - Doing a partial naming refactor.