Fixed Class Name References

Since I changed the name of all the classes, I had to fix all the
references so they reflected the new names.