diff --git a/config/config.exs b/config/config.exs
index 553c865..c93fafa 100755
--- a/config/config.exs
+++ b/config/config.exs
@@ -1,6 +1,6 @@
 import Config
 
-config :discordirc,
+config :carrierpidgeon,
   channels: [
   ],
   networks: [
diff --git a/lib/discordirc.ex b/lib/carrierpidgeon.ex
similarity index 64%
rename from lib/discordirc.ex
rename to lib/carrierpidgeon.ex
index face559..d2f56c5 100755
--- a/lib/discordirc.ex
+++ b/lib/carrierpidgeon.ex
@@ -1,12 +1,12 @@
-defmodule Discordirc do
+defmodule CarrierPidgeon do
   @moduledoc """
   Entrypoint
   """
   use Application
 
-  alias Discordirc.IrcNetworkSupervisor
-  alias Discordirc.DiscordHandler
-  alias Discordirc.WebhookService
+  alias CarrierPidgeon.IrcNetworkSupervisor
+  alias CarrierPidgeon.DiscordHandler
+  alias CarrierPidgeon.WebhookService
 
   def start(_type, _args) do
     children = [
diff --git a/lib/discordirc/channel_map.ex b/lib/carrierpidgeon/channel_map.ex
similarity index 77%
rename from lib/discordirc/channel_map.ex
rename to lib/carrierpidgeon/channel_map.ex
index 10ca0e7..d5403ba 100755
--- a/lib/discordirc/channel_map.ex
+++ b/lib/carrierpidgeon/channel_map.ex
@@ -1,10 +1,10 @@
-defmodule Discordirc.ChannelMap do
+defmodule CarrierPidgeon.ChannelMap do
   @moduledoc """
   maps discord channels to irc channels
   """
   def discord(network, channel) do
     id =
-      Application.fetch_env!(:discordirc, :channels)
+      Application.fetch_env!(:carrierpidgeon, :channels)
       |> Enum.filter(&(&1.ircnetwork == network and &1.ircchannel == channel))
       |> List.first()
 
@@ -19,7 +19,7 @@ defmodule Discordirc.ChannelMap do
 
   def irc(id) do
     channel =
-      Application.fetch_env!(:discordirc, :channels)
+      Application.fetch_env!(:carrierpidgeon, :channels)
       |> Enum.filter(&(&1.discordid == id))
       |> List.first()
 
@@ -33,7 +33,7 @@ defmodule Discordirc.ChannelMap do
   end
 
   def getircchannels(network) do
-    Application.fetch_env!(:discordirc, :channels)
+    Application.fetch_env!(:carrierpidgeon, :channels)
     |> Enum.filter(&(&1.ircnetwork == network))
     |> Enum.map(& &1.ircchannel)
   end
diff --git a/lib/discordirc/formatter.ex b/lib/carrierpidgeon/formatter.ex
similarity index 97%
rename from lib/discordirc/formatter.ex
rename to lib/carrierpidgeon/formatter.ex
index 4b78555..9994dc6 100755
--- a/lib/discordirc/formatter.ex
+++ b/lib/carrierpidgeon/formatter.ex
@@ -1,8 +1,8 @@
-defmodule Discordirc.Formatter do
+defmodule CarrierPidgeon.Formatter do
   @moduledoc """
   Transforms messages to/from discord from/to irc
   """
-  alias Discordirc.DiscordInfo
+  alias CarrierPidgeon.DiscordInfo
 
   @discordcdn "https://cdn.discordapp.com/"
 
diff --git a/lib/discord/discordhandler.ex b/lib/discord/discordhandler.ex
index 77e7111..12fcf97 100755
--- a/lib/discord/discordhandler.ex
+++ b/lib/discord/discordhandler.ex
@@ -1,10 +1,10 @@
-defmodule Discordirc.DiscordHandler do
+defmodule CarrierPidgeon.DiscordHandler do
   @moduledoc """
   discord bot
   """
   use Nostrum.Consumer
   alias Nostrum.Api
-  alias Discordirc.ChannelMap
+  alias CarrierPidgeon.ChannelMap
 
   def start_link do
     Consumer.start_link(__MODULE__)
diff --git a/lib/discord/discordinfo.ex b/lib/discord/discordinfo.ex
index b1c238f..e7cee92 100755
--- a/lib/discord/discordinfo.ex
+++ b/lib/discord/discordinfo.ex
@@ -1,4 +1,4 @@
-defmodule Discordirc.DiscordInfo do
+defmodule CarrierPidgeon.DiscordInfo do
   @moduledoc """
   helper functions for discord text things
   """
diff --git a/lib/discord/webhookservice.ex b/lib/discord/webhookservice.ex
index d768f36..29c65ff 100755
--- a/lib/discord/webhookservice.ex
+++ b/lib/discord/webhookservice.ex
@@ -1,4 +1,4 @@
-defmodule Discordirc.WebhookService do
+defmodule CarrierPidgeon.WebhookService do
   @moduledoc """
   This module manages the webhooks that we output
   to discord channels with
@@ -25,7 +25,7 @@ defmodule Discordirc.WebhookService do
     end
 
     def create_hook(state, channel_id, retry \\ 0) do
-      avatar = Base.encode64(File.read!("defaultavatar.jpg"))
+      avatar = Base.encode64(File.read!("priv/defaultavatar.jpg"))
 
       case DiscordAPI.create_webhook(
              channel_id,
diff --git a/lib/irc/irc_bot.ex b/lib/irc/irc_bot.ex
index d2a30e2..adbba31 100755
--- a/lib/irc/irc_bot.ex
+++ b/lib/irc/irc_bot.ex
@@ -1,10 +1,10 @@
-defmodule Discordirc.IRC do
+defmodule CarrierPidgeon.IRC do
   @moduledoc """
   IRC bot portion
   """
   use GenServer
   require Logger
-  import Discordirc.ByteSplit
+  import CarrierPidgeon.ByteSplit
 
   defmodule State do
     defstruct server: nil,
@@ -32,8 +32,8 @@ defmodule Discordirc.IRC do
   alias ExIRC.Client
   alias ExIRC.SenderInfo
   alias ExIRC.Whois
-  alias Discordirc.ChannelMap
-  alias Discordirc.Formatter
+  alias CarrierPidgeon.ChannelMap
+  alias CarrierPidgeon.Formatter
 
   def start_link(%{:network => network} = params) when is_map(params) do
     state = %State{State.from_params(params) | :channels => ChannelMap.getircchannels(network)}
diff --git a/lib/irc/irc_supervisor.ex b/lib/irc/irc_supervisor.ex
index 80c9e82..a1b66b6 100755
--- a/lib/irc/irc_supervisor.ex
+++ b/lib/irc/irc_supervisor.ex
@@ -1,11 +1,11 @@
-defmodule Discordirc.IrcNetworkSupervisor do
+defmodule CarrierPidgeon.IrcNetworkSupervisor do
   @moduledoc """
   Supervises all of the IRC networks.
   """
 
   use Supervisor
 
-  alias Discordirc.IRC
+  alias CarrierPidgeon.IRC
 
   def start_link(init_arg) do
     Supervisor.start_link(__MODULE__, init_arg, name: __MODULE__)
@@ -14,7 +14,7 @@ defmodule Discordirc.IrcNetworkSupervisor do
   @impl true
   def init(_init_arg) do
     networks =
-      Application.get_env(:discordirc, :networks)
+      Application.get_env(:carrierpidgeon, :networks)
       |> Enum.map(&%{start: {IRC, :start_link, [&1]}, id: &1.network})
 
     Supervisor.init(networks, strategy: :one_for_one)
diff --git a/lib/irc/splitter.ex b/lib/irc/splitter.ex
index b0eb1b1..694cde7 100755
--- a/lib/irc/splitter.ex
+++ b/lib/irc/splitter.ex
@@ -1,4 +1,4 @@
-defmodule Discordirc.ByteSplit do
+defmodule CarrierPidgeon.ByteSplit do
   @moduledoc """
   Module that splits text by bytes, Unicode Aware.
   """
diff --git a/mix.exs b/mix.exs
index f00ef90..31ad8ec 100755
--- a/mix.exs
+++ b/mix.exs
@@ -1,9 +1,9 @@
-defmodule Discordirc.MixProject do
+defmodule CarrierPidgeon.MixProject do
   use Mix.Project
 
   def project do
     [
-      app: :discordirc,
+      app: :carrierpidgeon,
       version: "0.1.0",
       elixir: "~> 1.10",
       start_permanent: Mix.env() == :prod,
@@ -15,7 +15,7 @@ defmodule Discordirc.MixProject do
   # Run "mix help compile.app" to learn about applications.
   def application do
     [
-      mod: {Discordirc, []},
+      mod: {CarrierPidgeon, []},
       extra_applications: [:logger]
     ]
   end
diff --git a/test/discordirc_test.exs b/test/discordirc_test.exs
deleted file mode 100755
index f57139f..0000000
--- a/test/discordirc_test.exs
+++ /dev/null
@@ -1,4 +0,0 @@
-defmodule DiscordircTest do
-  use ExUnit.Case
-  doctest Discordirc
-end
diff --git a/test/splitter_test.exs b/test/splitter_test.exs
index 4fc6554..69638f7 100755
--- a/test/splitter_test.exs
+++ b/test/splitter_test.exs
@@ -1,7 +1,7 @@
-defmodule Discordirc.SplitterTest do
+defmodule CarrierPidgeon.SplitterTest do
   use ExUnit.Case
-  import Discordirc.ByteSplit
-  doctest Discordirc.ByteSplit
+  import CarrierPidgeon.ByteSplit
+  doctest CarrierPidgeon.ByteSplit
 
   test "split by bytes" do
     assert byte_split("test", 2) == ["te", "st"]