Temp Rework #2

Renamed some of the classes to give them a better name.
Fixed some variables to be better identified when editing.