diff --git a/mod_mam/COPYING b/mod_mam_mnesia/COPYING
similarity index 100%
rename from mod_mam/COPYING
rename to mod_mam_mnesia/COPYING
diff --git a/mod_mam/README.txt b/mod_mam_mnesia/README.txt
similarity index 96%
rename from mod_mam/README.txt
rename to mod_mam_mnesia/README.txt
index 63116d4..8734f89 100644
--- a/mod_mam/README.txt
+++ b/mod_mam_mnesia/README.txt
@@ -1,5 +1,5 @@
 
-	mod_mam - Message Archive Management (XEP-0313)
+	mod_mam_mnesia - Message Archive Management (XEP-0313)
 
 	Author: Holger Weiss <holger@zedat.fu-berlin.de>
 	Requirements: ejabberd 14.12 or newer
@@ -19,7 +19,7 @@ synchronization of multiple clients.
 In order to use this module with the default settings, add the following
 line to the 'modules' section of your ejabberd.yml file:
 
-  mod_mam: {}
+  mod_mam_mnesia: {}
 
 The configurable options are:
 
diff --git a/mod_mam/TODO.txt b/mod_mam_mnesia/TODO.txt
similarity index 78%
rename from mod_mam/TODO.txt
rename to mod_mam_mnesia/TODO.txt
index c08c01f..ee99c40 100644
--- a/mod_mam/TODO.txt
+++ b/mod_mam_mnesia/TODO.txt
@@ -1,5 +1,5 @@
 
-	Feature requests for mod_mam
+	Feature requests for mod_mam_mnesia
 
 - Add ODBC support.
 - Support archiving preferences (XEP-0313, section 6).
diff --git a/mod_mam/conf/mod_mam.yml b/mod_mam_mnesia/conf/mod_mam_mnesia.yml
similarity index 76%
rename from mod_mam/conf/mod_mam.yml
rename to mod_mam_mnesia/conf/mod_mam_mnesia.yml
index 49fe0e1..661cc6a 100644
--- a/mod_mam/conf/mod_mam.yml
+++ b/mod_mam_mnesia/conf/mod_mam_mnesia.yml
@@ -1,4 +1,4 @@
 modules:
-  mod_mam:
+  mod_mam_mnesia:
     default_page_size: 25
     max_page_size: 100
diff --git a/mod_mam/mod_mam.spec b/mod_mam_mnesia/mod_mam_mnesia.spec
similarity index 100%
rename from mod_mam/mod_mam.spec
rename to mod_mam_mnesia/mod_mam_mnesia.spec
diff --git a/mod_mam/src/mod_mam.erl b/mod_mam_mnesia/src/mod_mam_mnesia.erl
similarity index 99%
rename from mod_mam/src/mod_mam.erl
rename to mod_mam_mnesia/src/mod_mam_mnesia.erl
index 0ab0dd7..78a1683 100644
--- a/mod_mam/src/mod_mam.erl
+++ b/mod_mam_mnesia/src/mod_mam_mnesia.erl
@@ -1,5 +1,5 @@
 %%%----------------------------------------------------------------------
-%%% File    : mod_mam.erl
+%%% File    : mod_mam_mnesia.erl
 %%% Author  : Holger Weiss <holger@zedat.fu-berlin.de>
 %%% Purpose : Message Archive Management (XEP-0313)
 %%% Created : 25 Jan 2015 by Holger Weiss <holger@zedat.fu-berlin.de>
@@ -23,7 +23,7 @@
 %%%
 %%%----------------------------------------------------------------------
 
--module(mod_mam).
+-module(mod_mam_mnesia).
 -author('holger@zedat.fu-berlin.de').
 
 -define(NS_MAM, <<"urn:xmpp:mam:0">>).