Renamed classes and fixed telnet bug