Various Add/Edits

Re-Named some classes and some names. Also playing with an item from
vswe tutorials. (Will be removed soon)