diff --git a/lib/geocoder/lookup.rb b/lib/geocoder/lookup.rb
index 0fbce38eb..5f45c031e 100644
--- a/lib/geocoder/lookup.rb
+++ b/lib/geocoder/lookup.rb
@@ -42,7 +42,11 @@ def street_services
     # All IP address lookup services, default first.
     #
     def ip_services
-      [:freegeoip, :maxmind, :baiduip]
+      [
+        :freegeoip,
+        :maxmind,
+        :baidu_ip
+      ]
     end
 
     ##
diff --git a/lib/geocoder/lookups/baiduip.rb b/lib/geocoder/lookups/baidu_ip.rb
similarity index 94%
rename from lib/geocoder/lookups/baiduip.rb
rename to lib/geocoder/lookups/baidu_ip.rb
index dfcaa1e61..548d26b85 100644
--- a/lib/geocoder/lookups/baiduip.rb
+++ b/lib/geocoder/lookups/baidu_ip.rb
@@ -1,11 +1,11 @@
 require 'geocoder/lookups/base'
-require 'geocoder/results/baiduip'
+require 'geocoder/results/baidu_ip'
 
 module Geocoder::Lookup
-  class Baiduip < Base
+  class BaiduIp < Base
 
     def name
-      "BaiduIP"
+      "Baidu IP"
     end
 
     def required_api_key_parts
diff --git a/lib/geocoder/results/baiduip.rb b/lib/geocoder/results/baidu_ip.rb
similarity index 96%
rename from lib/geocoder/results/baiduip.rb
rename to lib/geocoder/results/baidu_ip.rb
index 6b4b21b1c..d65fdd46c 100644
--- a/lib/geocoder/results/baiduip.rb
+++ b/lib/geocoder/results/baidu_ip.rb
@@ -1,7 +1,7 @@
 require 'geocoder/results/base'
 
 module Geocoder::Result
-  class Baiduip < Base
+  class BaiduIp < Base
     def coordinates
       [point['y'].to_f, point['x'].to_f]
     end
@@ -13,7 +13,7 @@ def address
     def state
       province
     end
-    
+
     def province
       address_detail['province']
     end
diff --git a/test/fixtures/baiduip_202_198_16_3 b/test/fixtures/baidu_ip_202_198_16_3
similarity index 100%
rename from test/fixtures/baiduip_202_198_16_3
rename to test/fixtures/baidu_ip_202_198_16_3
diff --git a/test/fixtures/baiduip_invalid_key b/test/fixtures/baidu_ip_invalid_key
similarity index 100%
rename from test/fixtures/baiduip_invalid_key
rename to test/fixtures/baidu_ip_invalid_key
diff --git a/test/fixtures/baiduip_no_results b/test/fixtures/baidu_ip_no_results
similarity index 100%
rename from test/fixtures/baiduip_no_results
rename to test/fixtures/baidu_ip_no_results
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 8bfbe25b7..48b958480 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -157,13 +157,13 @@ def default_fixture_filename
       end
     end
 
-    class Baiduip
+    class BaiduIp
       private
       def fixture_prefix
-        "baiduip"
+        "baidu_ip"
       end
       def default_fixture_filename
-        "baiduip_202_198_16_3"
+        "baidu_ip_202_198_16_3"
       end
     end
   end