diff --git a/node_http.cc b/node_http.cc
index 089317d5eb..f530976ac0 100644
--- a/node_http.cc
+++ b/node_http.cc
@@ -544,14 +544,10 @@ Init_http (Handle<Object> target)
 {
   HandleScope scope;
 
-  Local<Object> http = Object::New();
-  target->Set (String::NewSymbol("HTTP"), http);
-
   Local<FunctionTemplate> server_t = FunctionTemplate::New(server_constructor);
   server_t->InstanceTemplate()->SetInternalFieldCount(1);
 
-  http->Set(String::New("Server"), server_t->GetFunction());
-
+  target->Set(String::New("HTTPServer"), server_t->GetFunction());
 
   path_str         = Persistent<String>::New( String::NewSymbol("path") );
   uri_str          = Persistent<String>::New( String::NewSymbol("uri") );
diff --git a/spec/index.html b/spec/index.html
index d6fd96a8aa..50772e4177 100644
--- a/spec/index.html
+++ b/spec/index.html
@@ -86,10 +86,19 @@
     <code>spawn()</code> to start a new context/event loop? 
 
   <h2 id=http_server><span class=secno>2 </span>HTTP Server</h2>
+  <pre class=idl>[Constructor(in String host, in String port)]
+interface <dfn id=httpserver>HTTPServer</dfn>  {
+  readonly attribute String <a href="index.html#host">host</a>;
+  readonly attribute String <a href="index.html#port">port</a>;
+
+  // networking                
+    attribute Function <a href="index.html#onrequest">onRequest</a>;
+  void close(); // yet not implemented
+};</pre>
 
   <h2 id=tcp_client><span class=secno>3 </span>TCP Client</h2>
   <pre class=idl>[Constructor(in String host, in String port)]
-  interface <dfn id=tcpclient>TCPClient</dfn>  {
+interface <dfn id=tcpclient>TCPClient</dfn>  {
   readonly attribute String <a href="index.html#host">host</a>;
   readonly attribute String <a href="index.html#port">port</a>;
 
diff --git a/test/test_http_server_echo.rb b/test/test_http_server_echo.rb
index 55c97cfba7..1d3e1e3f3a 100755
--- a/test/test_http_server_echo.rb
+++ b/test/test_http_server_echo.rb
@@ -32,7 +32,7 @@ function encode(data) {
 }
 
 var port = 8000;
-var server = new HTTP.Server("localhost", port);
+var server = new HTTPServer("localhost", port);
 
 server.onRequest = function (request) {