diff --git a/bindings/python/notmuch/__init__.py b/bindings/python/notmuch/__init__.py
index 89b98495..fddc492a 100644
--- a/bindings/python/notmuch/__init__.py
+++ b/bindings/python/notmuch/__init__.py
@@ -53,7 +53,7 @@ Copyright 2010-2011 Sebastian Spaeth <Sebastian@SSpaeth.de>
 """
 from .database import Database
 from .directory import Directory
-from .filename import Filenames
+from .filenames import Filenames
 from .message import Message
 from .messages import Messages
 from .query import Query
diff --git a/bindings/python/notmuch/directory.py b/bindings/python/notmuch/directory.py
index 3e0763f2..b679aa29 100644
--- a/bindings/python/notmuch/directory.py
+++ b/bindings/python/notmuch/directory.py
@@ -26,7 +26,7 @@ from notmuch.globals import (
     NotmuchDirectoryP,
     NotmuchFilenamesP
 )
-from .filename import Filenames
+from .filenames import Filenames
 
 class Directory(object):
     """Represents a directory entry in the notmuch directory
diff --git a/bindings/python/notmuch/filename.py b/bindings/python/notmuch/filenames.py
similarity index 100%
rename from bindings/python/notmuch/filename.py
rename to bindings/python/notmuch/filenames.py
diff --git a/bindings/python/notmuch/message.py b/bindings/python/notmuch/message.py
index 20ba9cb9..d17b9bc6 100644
--- a/bindings/python/notmuch/message.py
+++ b/bindings/python/notmuch/message.py
@@ -36,7 +36,7 @@ from .globals import (
     NotmuchFilenamesP,
 )
 from .tag import Tags
-from .filename import Filenames
+from .filenames import Filenames
 
 import email
 try: