diff --git a/app/middleware/omni_auth_user_loader.rb b/app/middleware/omni_auth_user_loader.rb
index 9b9753b..3c1b628 100644
--- a/app/middleware/omni_auth_user_loader.rb
+++ b/app/middleware/omni_auth_user_loader.rb
@@ -28,7 +28,7 @@ class OmniAuthUserLoader
     user.uid        = omniauth['uid']
     user.nickname   = omniauth['info']['nickname']
     user.name       = omniauth['info']['name']
-    user.avatar_url = OauthHelper.get_avatar_url(omniauth)
+    user.avatar_url = OmniAuthHelper.get_avatar_url(omniauth)
 
     user
   end
diff --git a/lib/oauth_helper.rb b/lib/omni_auth_helper.rb
similarity index 90%
rename from lib/oauth_helper.rb
rename to lib/omni_auth_helper.rb
index 712b0c6..afc967f 100644
--- a/lib/oauth_helper.rb
+++ b/lib/omni_auth_helper.rb
@@ -1,4 +1,4 @@
-class OauthHelper
+class OmniAuthHelper
 
   def self.get_avatar_url(auth)
     if auth["provider"] == "twitter"
diff --git a/spec/lib/oauth_helper_spec.rb b/spec/lib/omni_auth_helper_spec.rb
similarity index 74%
rename from spec/lib/oauth_helper_spec.rb
rename to spec/lib/omni_auth_helper_spec.rb
index a62969e..00b6c6c 100644
--- a/spec/lib/oauth_helper_spec.rb
+++ b/spec/lib/omni_auth_helper_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe OauthHelper do
+describe OmniAuthHelper do
   describe ".avatar_url" do
     let(:avatar_url) { "http://foo.bar/foo.png" }
 
@@ -16,7 +16,7 @@ describe OauthHelper do
         }
       end
 
-      it { OauthHelper.get_avatar_url(auth).should == avatar_url }
+      it { OmniAuthHelper.get_avatar_url(auth).should == avatar_url }
 
     end
 
@@ -30,7 +30,7 @@ describe OauthHelper do
         }
       end
 
-      it { OauthHelper.get_avatar_url(auth).should == avatar_url }
+      it { OmniAuthHelper.get_avatar_url(auth).should == avatar_url }
     end
 
     context "when other provider" do
@@ -38,7 +38,7 @@ describe OauthHelper do
         { "provider" => "other" }
       end
 
-      it { OauthHelper.get_avatar_url(auth).should be_nil }
+      it { OmniAuthHelper.get_avatar_url(auth).should be_nil }
     end
   end
 end