Renamed client only files to distinct class names.