Renamed classes and interfaces