Need to do a bunch of renaming.. make it easier to see if any mistakes were made.
Renamed and now I was able to fix a lot of the tests, there are a couple miscellaneous errors to deal with currently.