Did some terminology refactoring before I got to deep into coding