Renamed a lot of classes to use more proper English words.