diff --git a/oa-core/lib/omniauth/core.rb b/oa-core/lib/omniauth/core.rb
index 5f2f71e..33e2bd5 100644
--- a/oa-core/lib/omniauth/core.rb
+++ b/oa-core/lib/omniauth/core.rb
@@ -58,7 +58,8 @@ module OmniAuth
       'oauth2' => 'OAuth2',
       'openid' => 'OpenID',
       'open_id' => 'OpenID',
-      'github' => 'GitHub'
+      'github' => 'GitHub',
+      'tripit' => 'TripIt'
     }
 
     module_function
diff --git a/oa-oauth/lib/omniauth/oauth.rb b/oa-oauth/lib/omniauth/oauth.rb
index 51d6369..dda66ef 100644
--- a/oa-oauth/lib/omniauth/oauth.rb
+++ b/oa-oauth/lib/omniauth/oauth.rb
@@ -13,7 +13,7 @@ module OmniAuth
     autoload :Foursquare,         'omniauth/strategies/foursquare'
     autoload :Gowalla,            'omniauth/strategies/gowalla'
     autoload :Identica,           'omniauth/strategies/identica'
-    autoload :Tripit,             'omniauth/strategies/tripit'
+    autoload :TripIt,             'omniauth/strategies/trip_it'
     autoload :Dopplr,             'omniauth/strategies/dopplr'
   end
 end
diff --git a/oa-oauth/lib/omniauth/strategies/facebook.rb b/oa-oauth/lib/omniauth/strategies/facebook.rb
index 476901c..39965ca 100644
--- a/oa-oauth/lib/omniauth/strategies/facebook.rb
+++ b/oa-oauth/lib/omniauth/strategies/facebook.rb
@@ -7,7 +7,7 @@ module OmniAuth
     # basic user information.
     #
     # @example Basic Usage
-    # use OmniAuth::Strategies::Facebook, 'app_id', 'app_secret'
+    #   use OmniAuth::Strategies::Facebook, 'app_id', 'app_secret'
     class Facebook < OAuth2
       # @param [Rack Application] app standard middleware application parameter
       # @param [String] app_id the application id as [registered on Facebook](http://www.facebook.com/developers/)
diff --git a/oa-oauth/lib/omniauth/strategies/tripit.rb b/oa-oauth/lib/omniauth/strategies/trip_it.rb
similarity index 96%
rename from oa-oauth/lib/omniauth/strategies/tripit.rb
rename to oa-oauth/lib/omniauth/strategies/trip_it.rb
index 3f49adb..1b8e6d0 100644
--- a/oa-oauth/lib/omniauth/strategies/tripit.rb
+++ b/oa-oauth/lib/omniauth/strategies/trip_it.rb
@@ -9,7 +9,7 @@ module OmniAuth
     #
     #    use OmniAuth::Strategies::TripIt, 'consumerkey', 'consumersecret'
     #
-    class Tripit < OmniAuth::Strategies::OAuth
+    class TripIt < OmniAuth::Strategies::OAuth
       def initialize(app, consumer_key, consumer_secret)
         super(app, :tripit, consumer_key, consumer_secret,
                 :site => 'https://api.tripit.com',