Lots of updates
More conversion of interface/class names
Finished class/interface renaming
Finished class /interface renaming