Fixing Some Bugs
Renaming the class
Renaming classes