diff --git a/plugins/OSU.py b/plugins/OSU.py
index 09051f6d3..41afe1697 100644
--- a/plugins/OSU.py
+++ b/plugins/OSU.py
@@ -248,7 +248,7 @@ buildings = {
 
 class OSU(callbacks.Privmsg):
     threaded = True
-    def osuemail(self, irc, msg, args):
+    def email(self, irc, msg, args):
         """<first name> <middle initial> <last name>
 
         Returns possible email address matches for the given name.
@@ -272,7 +272,7 @@ class OSU(callbacks.Privmsg):
         except Exception, e:
             irc.error(msg, debug.exnToString(e))
 
-    def osubuilding(self, irc, msg, args):
+    def building(self, irc, msg, args):
         """<building abbreviation>
 
         Returns the address and full name of an OSU building based on its
diff --git a/test/test_OSU.py b/test/test_OSU.py
index 83f15cd5f..bd65a8ff0 100644
--- a/test/test_OSU.py
+++ b/test/test_OSU.py
@@ -34,14 +34,14 @@ from test import *
 class OSUTestCase(PluginTestCase, PluginDocumentation):
     plugins = ('OSU',)
     def testOsuemail(self):
-        self.assertResponse('osuemail jeremiah fincher', 'fincher.8@osu.edu')
-        self.assertResponse('osuemail jeremiah d fincher', 'fincher.8@osu.edu')
+        self.assertResponse('osu email jeremiah fincher', 'fincher.8@osu.edu')
+        self.assertResponse('osu email jeremiah d fincher','fincher.8@osu.edu')
 
     def testOsubuilding(self):
-        self.assertRegexp('osubuilding DL', '^Dreese Lab')
-        self.assertRegexp('osubuilding Dl', '^Dreese Lab')
-        self.assertRegexp('osubuilding dL', '^Dreese Lab')
-        self.assertRegexp('osubuilding dl', '^Dreese Lab')
+        self.assertRegexp('osu building DL', '^Dreese Lab')
+        self.assertRegexp('osu building Dl', '^Dreese Lab')
+        self.assertRegexp('osu building dL', '^Dreese Lab')
+        self.assertRegexp('osu building dl', '^Dreese Lab')
         
 
 # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: