diff --git a/lib/geocoder/lookup.rb b/lib/geocoder/lookup.rb
index 11d0a8a20d5fac110f3516c2791479aced6b176b..7f6ed3bca38249f3c28df4bbdd9ac185427d8de3 100644
--- a/lib/geocoder/lookup.rb
+++ b/lib/geocoder/lookup.rb
@@ -50,13 +50,16 @@ module Geocoder
       if all_services.include?(name)
         name = name.to_s
         require "geocoder/lookups/#{name}"
-        klass = name.split("_").map{ |i| i[0...1].upcase + i[1..-1] }.join
-        Geocoder::Lookup.const_get(klass).new
+        Geocoder::Lookup.const_get(classify_name(name)).new
       else
         valids = all_services.map(&:inspect).join(", ")
         raise ConfigurationError, "Please specify a valid lookup for Geocoder " +
           "(#{name.inspect} is not one of: #{valids})."
       end
     end
+
+    def self.classify_name(filename)
+      filename.split("_").map{ |i| i[0...1].upcase + i[1..-1] }.join
+    end
   end
 end