Micro cleanups, clarify a few comparisons
Rename a few files to be more consistent project wide