diff --git a/plugins/GoogleTools.py b/plugins/Google.py
similarity index 99%
rename from plugins/GoogleTools.py
rename to plugins/Google.py
index dadab51ea..47b1c36d5 100644
--- a/plugins/GoogleTools.py
+++ b/plugins/Google.py
@@ -114,7 +114,7 @@ def search(*args, **kwargs):
         last24hours.dequeue()
     return data
 
-class GoogleTools(callbacks.PrivmsgCommandAndRegexp):
+class Google(callbacks.PrivmsgCommandAndRegexp):
     threaded = True
     regexps = sets.Set(['googleSnarfer', 'googleGroups'])
     def __init__(self):
@@ -313,7 +313,7 @@ class GoogleTools(callbacks.PrivmsgCommandAndRegexp):
 
 
 
-Class = GoogleTools
+Class = Google
 
 
 # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/test/test_GoogleTools.py b/test/test_Google.py
similarity index 95%
rename from test/test_GoogleTools.py
rename to test/test_Google.py
index 503b8925b..d54c78936 100644
--- a/test/test_GoogleTools.py
+++ b/test/test_Google.py
@@ -31,8 +31,8 @@
 
 from test import *
 
-class GoogleToolsTestCase(PluginTestCase, PluginDocumentation):
-    plugins = ('GoogleTools',)
+class GoogleTestCase(PluginTestCase, PluginDocumentation):
+    plugins = ('Google',)
     def testGroupsSnarfer(self):
         self.assertRegexp('http://groups.google.com/groups?dq=&hl=en&'
                           'lr=lang_en&ie=UTF-8&oe=UTF-8&selm=698f09f8.'