Network system, renamed some classes