Changed names of *_socket_klass to *_socket_class.