Performed uber-complex refactoring

(Renamed stuff.)