minor naming convention refactor
adjusting some scoping stuff + more renames
more renaming wooooo
mondo-big namespace refactoring