diff --git a/beets/library.py b/beets/library.py
index 7cf700b0c..65bda9ae0 100644
--- a/beets/library.py
+++ b/beets/library.py
@@ -1,5 +1,5 @@
 import sqlite3, os, sys, operator, re, shutil
-from beets.tag import MediaFile, FileTypeError
+from beets.mediafile import MediaFile, FileTypeError
 from string import Template
 
 # Fields in the "items" table; all the metadata available for items in the
diff --git a/beets/tag.py b/beets/mediafile.py
similarity index 100%
rename from beets/tag.py
rename to beets/mediafile.py
diff --git a/test/alltests.py b/test/alltests.py
index 9edc13a34..f568ddb72 100755
--- a/test/alltests.py
+++ b/test/alltests.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 import unittest
 
-test_modules = ['tag', 'library']
+test_modules = ['test_mediafile', 'test_library']
 
 def suite():
     s = unittest.TestSuite()
diff --git a/test/library.py b/test/test_library.py
similarity index 100%
rename from test/library.py
rename to test/test_library.py
diff --git a/test/tag.py b/test/test_mediafile.py
similarity index 96%
rename from test/tag.py
rename to test/test_mediafile.py
index 418d66770..89931f444 100755
--- a/test/tag.py
+++ b/test/test_mediafile.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 import unittest, sys, os, shutil
 sys.path.append('..')
-import beets.tag
+import beets.mediafile
 
 def MakeReadingTest(path, correct_dict, field):
     class ReadingTest(unittest.TestCase):
         def setUp(self):
-            self.f = beets.tag.MediaFile(path)
+            self.f = beets.mediafile.MediaFile(path)
         def runTest(self):
             got = getattr(self.f, field)
             correct = correct_dict[field]
@@ -37,12 +37,12 @@ def MakeWritingTest(path, correct_dict, field, testsuffix='_test'):
         
         def runTest(self):    
             # write new tag
-            a = beets.tag.MediaFile(self.tpath)
+            a = beets.mediafile.MediaFile(self.tpath)
             setattr(a, field, self.value)
             a.save_tags()
             
             # verify ALL tags are correct with modification
-            b = beets.tag.MediaFile(self.tpath)
+            b = beets.mediafile.MediaFile(self.tpath)
             for readfield in correct_dict.keys():
                 got = getattr(b, readfield)
                 if readfield is field: