diff --git a/README.md b/README.md
index 075d663..bcbcb6f 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Add the following in your Synapse config:
 ```yaml
    saml2_config:
      user_mapping_provider:
-       module: "saml_mapping_provider.MozillaSamlMappingProvider"
+       module: "saml_mapping_provider_mozilla.SamlMappingProvider"
        config:
          mxid_source_attribute: "uid"
 ```
diff --git a/saml_mapping_provider.py b/saml_mapping_provider_mozilla.py
similarity index 99%
rename from saml_mapping_provider.py
rename to saml_mapping_provider_mozilla.py
index b03f7c0..ac1dbed 100644
--- a/saml_mapping_provider.py
+++ b/saml_mapping_provider_mozilla.py
@@ -27,7 +27,7 @@ class SamlConfig(object):
     mxid_source_attribute = attr.ib()
 
 
-class MozillaSamlMappingProvider(object):
+class SamlMappingProvider(object):
     def __init__(self, parsed_config: SamlConfig):
         """A Mozilla-flavoured, Synapse user mapping provider
 
diff --git a/setup.py b/setup.py
index cf477ca..3f03471 100755
--- a/setup.py
+++ b/setup.py
@@ -41,8 +41,8 @@ def exec_file(path_segments, name):
 
 setup(
     name="matrix-synapse-saml-mozilla",
-    version=exec_file(("saml_mapping_provider.py",), "__version__"),
-    py_modules=["matrix-synapse-saml-moz"],
+    version=exec_file(("saml_mapping_provider_mozilla.py",), "__version__"),
+    py_modules=["matrix-synapse-saml-mozilla"],
     description="An Mozilla-flavoured SAML MXID mapper for Synapse",
     install_requires=[
         "attr>=0.3.1",
diff --git a/tests/__init__.py b/tests/__init__.py
index 5264967..bc9c4dd 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
-from saml_mapping_provider import SamlMappingProvider
+from saml_mapping_provider_mozilla import SamlMappingProvider
 
 
 def create_mapping_provider() -> SamlMappingProvider: