First pass on class/property naming
More to do, and lots of TODO's documented. Don't know if this makes any sense to merge yet... but feel free if you think it is a step forward.... Thought worth doing the PR so you can see where I am going so far @pospi .