diff --git a/lib/pleroma/user/mailing_list.ex b/lib/pleroma/user/email_list.ex
similarity index 95%
rename from lib/pleroma/user/mailing_list.ex
rename to lib/pleroma/user/email_list.ex
index b60069023..f6e5ea619 100644
--- a/lib/pleroma/user/mailing_list.ex
+++ b/lib/pleroma/user/email_list.ex
@@ -2,7 +2,7 @@
 # Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
-defmodule Pleroma.User.MailingList do
+defmodule Pleroma.User.EmailList do
   @moduledoc """
   Functions for generating email lists from local users.
   """
diff --git a/lib/pleroma/web/admin_api/controllers/email_list_controller.ex b/lib/pleroma/web/admin_api/controllers/email_list_controller.ex
index dfe9009b8..d1fb9a306 100644
--- a/lib/pleroma/web/admin_api/controllers/email_list_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/email_list_controller.ex
@@ -5,7 +5,7 @@
 defmodule Pleroma.Web.AdminAPI.EmailListController do
   use Pleroma.Web, :controller
 
-  alias Pleroma.User.MailingList
+  alias Pleroma.User.EmailList
   alias Pleroma.Web.Plugs.OAuthScopesPlug
 
   require Logger
@@ -16,7 +16,7 @@ defmodule Pleroma.Web.AdminAPI.EmailListController do
   )
 
   def subscribers(conn, _params) do
-    csv = MailingList.generate_csv()
+    csv = EmailList.generate_csv()
 
     conn
     |> put_resp_content_type("text/csv")
diff --git a/test/pleroma/user/mailing_list_test.exs b/test/pleroma/user/email_list_test.exs
similarity index 77%
rename from test/pleroma/user/mailing_list_test.exs
rename to test/pleroma/user/email_list_test.exs
index 50b10584c..cd3439c1b 100644
--- a/test/pleroma/user/mailing_list_test.exs
+++ b/test/pleroma/user/email_list_test.exs
@@ -2,8 +2,8 @@
 # Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
-defmodule Pleroma.User.MailingListTest do
-  alias Pleroma.User.MailingList
+defmodule Pleroma.User.EmailListTest do
+  alias Pleroma.User.EmailList
 
   use Pleroma.DataCase
 
@@ -21,6 +21,6 @@ defmodule Pleroma.User.MailingListTest do
     #{user3.email}\
     """
 
-    assert MailingList.generate_csv() == expected
+    assert EmailList.generate_csv() == expected
   end
 end