Renamed classes, code clean-up