Refactors and Renames

Performed several refactors and renames as needed. Found at least one
cautionary item and added notes for it.