diff --git a/lib/rack/handler/reel.rb b/lib/rack/handler/reel.rb
index 84225e9..673b847 100644
--- a/lib/rack/handler/reel.rb
+++ b/lib/rack/handler/reel.rb
@@ -4,8 +4,8 @@ module Rack
   module Handler
     class Reel
       DEFAULT_OPTIONS = {
-        :Host    => "0.0.0.0",
-        :Port    => 3000,
+        :host    => "0.0.0.0",
+        :port    => 3000,
         :quiet   => false
       }
 
diff --git a/lib/reel/rack/cli.rb b/lib/reel/rack/cli.rb
index 8433950..374eaa0 100644
--- a/lib/reel/rack/cli.rb
+++ b/lib/reel/rack/cli.rb
@@ -7,8 +7,8 @@ class CLI
       def initialize(argv)
         @argv   = argv
         @options = {
-          addr:   "localhost",
-          Port:   3000,
+          host:   "localhost",
+          port:   3000,
           quiet:  false,
           rackup: "config.ru"
         }
@@ -19,12 +19,12 @@ def parser
         @parser ||= OptionParser.new do |o|
           o.banner = "reel-rack <options> <rackup file>"
 
-          o.on "-a", "--addr ADDR", "Address to listen on (default #{@options[:addr]})" do |addr|
-            @options[:addr] = addr
+          o.on "-a", "--addr ADDR", "Address to listen on (default #{@options[:host]})" do |host|
+            @options[:host] = host
           end
 
-          o.on "-p", "--port PORT", "Port to bind to (default #{@options[:Port]})" do |port|
-            @options[:Port] = port
+          o.on "-p", "--port PORT", "Port to bind to (default #{@options[:port]})" do |port|
+            @options[:port] = port
           end
 
           o.on "-q", "--quiet", "Suppress normal logging output" do
diff --git a/lib/reel/rack/server.rb b/lib/reel/rack/server.rb
index 82a9367..752c885 100644
--- a/lib/reel/rack/server.rb
+++ b/lib/reel/rack/server.rb
@@ -5,19 +5,19 @@
 
 module Reel
   module Rack
-    class Server < Reel::Server::HTTP
+    class Server < Reel::Server
       include Celluloid::Logger
 
       attr_reader :app
 
       def initialize(app, options)
-        raise ArgumentError, "no host given" unless options[:Host]
-        raise ArgumentError, "no port given" unless options[:Port]
+        raise ArgumentError, "no host given" unless options[:host]
+        raise ArgumentError, "no port given" unless options[:port]
 
         info  "A Reel good HTTP server! (Codename \"#{::Reel::CODENAME}\")"
-        info "Listening on http://#{options[:Host]}:#{options[:Port]}"
+        info "Listening on http://#{options[:host]}:#{options[:port]}"
 
-        super(options[:Host], options[:Port], &method(:on_connection))
+        super(options[:host], options[:port], &method(:on_connection))
         @app = app
       end