diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb
index d6b3e130..e5e74bbd 100644
--- a/lib/travis/api/app.rb
+++ b/lib/travis/api/app.rb
@@ -18,11 +18,12 @@ require 'newrelic_rpm'
 # Requires TLS in production.
 class Travis::Api::App
   autoload :AccessToken,  'travis/api/app/access_token'
-  autoload :Responder,    'travis/api/app/responder'
+  autoload :Base,         'travis/api/app/base'
   autoload :Endpoint,     'travis/api/app/endpoint'
   autoload :Extensions,   'travis/api/app/extensions'
   autoload :Helpers,      'travis/api/app/helpers'
   autoload :Middleware,   'travis/api/app/middleware'
+  autoload :Responders,   'travis/api/app/responders'
 
   Rack.autoload :SSL, 'rack/ssl'
 
@@ -93,6 +94,6 @@ class Travis::Api::App
     end
 
     def self.setup_endpoints
-      Responder.subclasses.each(&:setup)
+      Base.subclasses.each(&:setup)
     end
 end
diff --git a/lib/travis/api/app/responder.rb b/lib/travis/api/app/base.rb
similarity index 96%
rename from lib/travis/api/app/responder.rb
rename to lib/travis/api/app/base.rb
index 2c8f2f38..49d22f6e 100644
--- a/lib/travis/api/app/responder.rb
+++ b/lib/travis/api/app/base.rb
@@ -4,7 +4,7 @@ require 'sinatra/base'
 class Travis::Api::App
   # Superclass for any endpoint and middleware.
   # Pulls in relevant helpers and extensions.
-  class Responder < Sinatra::Base
+  class Base < Sinatra::Base
     register Extensions::SmartConstants
 
     error NotImplementedError do
diff --git a/lib/travis/api/app/endpoint.rb b/lib/travis/api/app/endpoint.rb
index 0eb0d1d0..33c1aa2b 100644
--- a/lib/travis/api/app/endpoint.rb
+++ b/lib/travis/api/app/endpoint.rb
@@ -3,7 +3,7 @@ require 'addressable/uri'
 
 class Travis::Api::App
   # Superclass for HTTP endpoints. Takes care of prefixing.
-  class Endpoint < Responder
+  class Endpoint < Base
     include Travis::Services
 
     set(:prefix) { "/" << name[/[^:]+$/].underscore }
diff --git a/lib/travis/api/app/middleware.rb b/lib/travis/api/app/middleware.rb
index a70f473b..619db9d6 100644
--- a/lib/travis/api/app/middleware.rb
+++ b/lib/travis/api/app/middleware.rb
@@ -2,6 +2,6 @@ require 'travis/api/app'
 
 class Travis::Api::App
   # Superclass for all middleware.
-  class Middleware < Responder
+  class Middleware < Base
   end
 end