diff --git a/plugins/IMDB.py b/plugins/Movies.py
similarity index 98%
rename from plugins/IMDB.py
rename to plugins/Movies.py
index 53a7675c4..495011879 100644
--- a/plugins/IMDB.py
+++ b/plugins/Movies.py
@@ -62,7 +62,7 @@ example = utils.wrapLines("""
 <supybot> "Kevin Spacey" is apparently a person.  More information is available at <http://us.imdb.com/Name?Spacey,+Kevin>
 """)
 
-class IMDB(callbacks.Privmsg):
+class Movies(callbacks.Privmsg):
     threaded = True
     def _formatMovie(self, movie):
         title = utils.unCommaThe(movie.title())
@@ -109,6 +109,7 @@ class IMDB(callbacks.Privmsg):
             irc.reply(msg, 'Matches: ' + utils.commaAndify(titles))
 
 
-Class = IMDB
+Class = Movies
+
 
 # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/test/test_IMDB.py b/test/test_Movies.py
similarity index 95%
rename from test/test_IMDB.py
rename to test/test_Movies.py
index 9f8f55e8f..665712b2e 100644
--- a/test/test_IMDB.py
+++ b/test/test_Movies.py
@@ -31,8 +31,8 @@
 
 from test import *
 
-class IMDBTestCase(PluginTestCase, PluginDocumentation):
-    plugins = ('IMDB',)
+class MoviesTestCase(PluginTestCase, PluginDocumentation):
+    plugins = ('Movies',)
     def testImdb(self):
         self.assertNotError('imdb die hard')
         self.assertRegexp('imdb kevin spacey', 'is apparently a person')
@@ -40,7 +40,6 @@ class IMDBTestCase(PluginTestCase, PluginDocumentation):
     def testGenrePluralization(self):
         self.assertNotRegexp('imdb 24', 'genres')
         self.assertRegexp('imdb die hard', 'genres')
-        
 
 
 # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: