diff --git a/lib/mix/tasks/pleroma/relay.ex b/lib/mix/tasks/pleroma/relay.ex
new file mode 100644
index 000000000..aa0232a32
--- /dev/null
+++ b/lib/mix/tasks/pleroma/relay.ex
@@ -0,0 +1,42 @@
+defmodule Mix.Tasks.Pleroma.Relay do
+  use Mix.Task
+  alias Pleroma.Web.ActivityPub.Relay
+
+  @shortdoc "Manages remote relays"
+  @moduledoc """
+  Manages remote relays
+
+  ## Follow a remote relay
+
+  ``mix pleroma.relay unfollow <relay_url>``
+
+  Example: ``mix pleroma.relay follow  https://example.org/relay``
+  
+  ## Unfollow a remote relay
+  
+  ``mix pleroma.relay unfollow <relay_url>``
+
+  Example: ``mix pleroma.relay unfollow https://example.org/relay``
+  """
+  def run(["follow", target]) do
+    Mix.Task.run("app.start")
+
+    with {:ok, activity} <- Relay.follow(target) do
+      # put this task to sleep to allow the genserver to push out the messages
+      :timer.sleep(500)
+    else
+      {:error, e} -> Mix.shell().error("Error while following #{target}: #{inspect(e)}")
+    end
+  end
+
+  def run(["unfollow", target]) do
+    Mix.Task.run("app.start")
+
+    with {:ok, activity} <- Relay.follow(target) do
+      # put this task to sleep to allow the genserver to push out the messages
+      :timer.sleep(500)
+    else
+      {:error, e} -> Mix.shell().error("Error while following #{target}: #{inspect(e)}")
+    end
+  end
+end
diff --git a/lib/mix/tasks/relay_follow.ex b/lib/mix/tasks/relay_follow.ex
deleted file mode 100644
index 85b1c024d..000000000
--- a/lib/mix/tasks/relay_follow.ex
+++ /dev/null
@@ -1,24 +0,0 @@
-defmodule Mix.Tasks.RelayFollow do
-  use Mix.Task
-  require Logger
-  alias Pleroma.Web.ActivityPub.Relay
-
-  @shortdoc "Follows a remote relay"
-  @moduledoc """
-  Follows a remote relay
-
-  Usage: ``mix relay_follow <relay_url>``
-
-  Example: ``mix relay_follow https://example.org/relay``
-  """
-  def run([target]) do
-    Mix.Task.run("app.start")
-
-    with {:ok, activity} <- Relay.follow(target) do
-      # put this task to sleep to allow the genserver to push out the messages
-      :timer.sleep(500)
-    else
-      {:error, e} -> Mix.shell().error("Error while following #{target}: #{inspect(e)}")
-    end
-  end
-end
diff --git a/lib/mix/tasks/relay_unfollow.ex b/lib/mix/tasks/relay_unfollow.ex
deleted file mode 100644
index 237fb771c..000000000
--- a/lib/mix/tasks/relay_unfollow.ex
+++ /dev/null
@@ -1,23 +0,0 @@
-defmodule Mix.Tasks.RelayUnfollow do
-  use Mix.Task
-  require Logger
-  alias Pleroma.Web.ActivityPub.Relay
-
-  @moduledoc """
-  Unfollows a remote relay
-
-  Usage: ``mix relay_follow <relay_url>``
-
-  Example: ``mix relay_follow https://example.org/relay``
-  """
-  def run([target]) do
-    Mix.Task.run("app.start")
-
-    with {:ok, activity} <- Relay.follow(target) do
-      # put this task to sleep to allow the genserver to push out the messages
-      :timer.sleep(500)
-    else
-      {:error, e} -> Mix.shell().error("Error while following #{target}: #{inspect(e)}")
-    end
-  end
-end