diff --git a/src/amqproxy/cli.cr b/src/amqproxy/cli.cr
index 0ba65e4..65721b4 100644
--- a/src/amqproxy/cli.cr
+++ b/src/amqproxy/cli.cr
@@ -107,7 +107,7 @@ class AMQProxy::CLI
     Signal::INT.trap &shutdown
     Signal::TERM.trap &shutdown
 
-    AMQProxy::HTTPServer.new(server, @listen_address, @http_port.to_i)
+    HTTPServer.new(server, @listen_address, @http_port.to_i)
     server.listen(@listen_address, @listen_port.to_i)
 
     # wait until all client connections are closed
diff --git a/src/amqproxy/http_server.cr b/src/amqproxy/http_server.cr
index 8db184e..dddc2e3 100644
--- a/src/amqproxy/http_server.cr
+++ b/src/amqproxy/http_server.cr
@@ -28,7 +28,7 @@ module AMQProxy
         end
       end
       bind_tcp
-      spawn @http.listen, name: "HTTP_Server"
+      spawn @http.listen, name: "HTTP Server"
       Log.info { "HTTP server listening on #{@address}:#{@port}" }
     end
 
@@ -39,7 +39,6 @@ module AMQProxy
 
     def metrics(context)
       writer = PrometheusWriter.new(context.response, "amqproxy")
-
       writer.write({name:   "identity_info",
                     type:   "gauge",
                     value:  1,
@@ -50,11 +49,11 @@ module AMQProxy
                     }})
       writer.write({name:  "client_connections",
                     value: @amqproxy.client_connections,
-                    type:  "counter",
+                    type:  "gauge",
                     help:  "Number of client connections"})
       writer.write({name:  "upstream_connections",
                     value: @amqproxy.upstream_connections,
-                    type:  "counter",
+                    type:  "gauge",
                     help:  "Number of upstream connections"})
 
       context.response.status = ::HTTP::Status::OK