Renamed Some variables to be more generic.

Also it seems to work somewhat at the moment.
-Connor