Changed client class name and exported