-Changed a bunch of class names.
-General cleanup duty, nothing really relevant to stability/logic.