diff --git a/README-DOCKER.md b/README-DOCKER.md
index 45b19d7..ce62610 100644
--- a/README-DOCKER.md
+++ b/README-DOCKER.md
@@ -4,8 +4,8 @@ A sample `docker-compose.yml` file:
 version: '3'
 services:
     bot:
-        image: "classabbyamp/discord-qrm-bot:latest"
-        container_name: "qrmbot"
+        image: "classabbyamp/discord-qrm2:latest"
+        container_name: "discord-qrm2"
         volumes:
             - "./data:/app/data:rw"
 ```
diff --git a/README.md b/README.md
index b3bfa1d..3671116 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Discord QRM Bot
+# qrm, a Bot for Discord
 
 A discord bot with ham radio functionalities.
 
diff --git a/common.py b/common.py
index 0ed3731..bb0e052 100644
--- a/common.py
+++ b/common.py
@@ -3,7 +3,7 @@ Common tools for the bot.
 ---
 Copyright (C) 2019 Abigail Gold, 0x5c
 
-This file is part of discord-qrmbot and is released under the terms of the GNU
+This file is part of discord-qrm2 and is released under the terms of the GNU
 General Public License, version 2.
 ---
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 183d669..14ae78d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,6 @@ version: '3'
 services:
     bot:
         build: .
-        container_name: "qrmbot"
+        container_name: "discord-qrm2"
         volumes:
             - "./data:/app/data:rw"
diff --git a/exts/ae7q.py b/exts/ae7q.py
index 015808c..0cb9457 100644
--- a/exts/ae7q.py
+++ b/exts/ae7q.py
@@ -3,7 +3,7 @@ ae7q extension for qrm
 ---
 Copyright (C) 2019 Abigail Gold, 0x5c
 
-This file is part of discord-qrmbot and is released under the terms of the GNU
+This file is part of discord-qrm2 and is released under the terms of the GNU
 General Public License, version 2.
 ---
 Test callsigns:
diff --git a/exts/base.py b/exts/base.py
index 2bcf9eb..4adb6cb 100644
--- a/exts/base.py
+++ b/exts/base.py
@@ -3,7 +3,7 @@ Base extension for qrm
 ---
 Copyright (C) 2019 Abigail Gold, 0x5c
 
-This file is part of discord-qrmbot and is released under the terms of the GNU
+This file is part of discord-qrm2 and is released under the terms of the GNU
 General Public License, version 2.
 """
 
@@ -142,7 +142,7 @@ class BaseCog(commands.Cog):
         """Show what has changed in recent bot versions."""
         embed = discord.Embed(title="qrm Changelog",
                               description=("For a full listing, visit [Github](https://"
-                                           "github.com/classabbyamp/discord-qrm-bot/blob/master/CHANGELOG.md)."),
+                                           "github.com/classabbyamp/discord-qrm2/blob/master/CHANGELOG.md)."),
                               colour=cmn.colours.neutral,
                               timestamp=datetime.utcnow())
         embed.set_footer(text=ctx.author.name,
diff --git a/exts/fun.py b/exts/fun.py
index f7352ba..d90d99e 100644
--- a/exts/fun.py
+++ b/exts/fun.py
@@ -3,7 +3,7 @@ Fun extension for qrm
 ---
 Copyright (C) 2019 Abigail Gold, 0x5c
 
-This file is part of discord-qrmbot and is released under the terms of the GNU
+This file is part of discord-qrm2 and is released under the terms of the GNU
 General Public License, version 2.
 """
 
diff --git a/exts/grid.py b/exts/grid.py
index e8ca466..76f4d8e 100644
--- a/exts/grid.py
+++ b/exts/grid.py
@@ -3,7 +3,7 @@ Grid extension for qrm
 ---
 Copyright (C) 2019 Abigail Gold, 0x5c
 
-This file is part of discord-qrmbot and is released under the terms of the GNU
+This file is part of discord-qrm2 and is released under the terms of the GNU
 General Public License, version 2.
 """
 
diff --git a/exts/ham.py b/exts/ham.py
index 2f14eda..f48872e 100644
--- a/exts/ham.py
+++ b/exts/ham.py
@@ -3,7 +3,7 @@ Ham extension for qrm
 ---
 Copyright (C) 2019 Abigail Gold, 0x5c
 
-This file is part of discord-qrmbot and is released under the terms of the GNU
+This file is part of discord-qrm2 and is released under the terms of the GNU
 General Public License, version 2.
 """
 import json
diff --git a/exts/image.py b/exts/image.py
index 1056957..e1014b5 100644
--- a/exts/image.py
+++ b/exts/image.py
@@ -3,7 +3,7 @@ Image extension for qrm
 ---
 Copyright (C) 2019 Abigail Gold, 0x5c
 
-This file is part of discord-qrmbot and is released under the terms of the GNU
+This file is part of discord-qrm2 and is released under the terms of the GNU
 General Public License, version 2.
 """
 
diff --git a/exts/morse.py b/exts/morse.py
index 4b84ff4..8222518 100644
--- a/exts/morse.py
+++ b/exts/morse.py
@@ -3,7 +3,7 @@ Morse Code extension for qrm
 ---
 Copyright (C) 2019 Abigail Gold, 0x5c
 
-This file is part of discord-qrmbot and is released under the terms of the GNU
+This file is part of discord-qrm2 and is released under the terms of the GNU
 General Public License, version 2.
 """
 
diff --git a/exts/qrz.py b/exts/qrz.py
index 07db40c..c09d863 100644
--- a/exts/qrz.py
+++ b/exts/qrz.py
@@ -3,7 +3,7 @@ QRZ extension for qrm
 ---
 Copyright (C) 2019 Abigail Gold, 0x5c
 
-This file is part of discord-qrmbot and is released under the terms of the GNU
+This file is part of discord-qrm2 and is released under the terms of the GNU
 General Public License, version 2.
 """
 from collections import OrderedDict
@@ -101,7 +101,7 @@ class QRZCog(commands.Cog):
 
 
 async def qrz_login(user: str, passwd: str, session: aiohttp.ClientSession):
-    url = f'http://xmldata.qrz.com/xml/current/?username={user};password={passwd};agent=qrmbot'
+    url = f'http://xmldata.qrz.com/xml/current/?username={user};password={passwd};agent=discord-qrm2'
     async with session.get(url) as resp:
         if resp.status != 200:
             raise ConnectionError(f'Unable to connect to QRZ (HTTP Error {resp.status})')
diff --git a/exts/study.py b/exts/study.py
index e19b12d..8b85eaa 100644
--- a/exts/study.py
+++ b/exts/study.py
@@ -3,7 +3,7 @@ Study extension for qrm
 ---
 Copyright (C) 2019 Abigail Gold, 0x5c
 
-This file is part of discord-qrmbot and is released under the terms of the GNU
+This file is part of discord-qrm2 and is released under the terms of the GNU
 General Public License, version 2.
 """
 
diff --git a/exts/weather.py b/exts/weather.py
index a72e806..f7aed05 100644
--- a/exts/weather.py
+++ b/exts/weather.py
@@ -3,7 +3,7 @@ Weather extension for qrm
 ---
 Copyright (C) 2019 Abigail Gold, 0x5c
 
-This file is part of discord-qrmbot and is released under the terms of the GNU
+This file is part of discord-qrm2 and is released under the terms of the GNU
 General Public License, version 2.
 """
 
diff --git a/info.py b/info.py
index 3ca279b..20a174d 100644
--- a/info.py
+++ b/info.py
@@ -3,7 +3,7 @@ Static info about the bot.
 ---
 Copyright (C) 2019 Abigail Gold, 0x5c
 
-This file is part of discord-qrmbot and is released under the terms of the GNU
+This file is part of discord-qrm2 and is released under the terms of the GNU
 General Public License, version 2.
 ---
 
@@ -23,5 +23,5 @@ General Public License, version 2.
 authors = ("@ClassAbbyAmplifier#2229", "@0x5c#0639")
 description = """A bot with various useful ham radio-related functions, written in Python."""
 license = "Released under the GNU General Public License v2"
-contributing = "Check out the source on GitHub, contributions welcome: https://github.com/classabbyamp/discord-qrm-bot"
+contributing = "Check out the source on GitHub, contributions welcome: https://github.com/classabbyamp/discord-qrm2"
 release = '1.0.0'
diff --git a/main.py b/main.py
index 9b4199c..05a7b08 100644
--- a/main.py
+++ b/main.py
@@ -4,7 +4,7 @@ qrm, a bot for Discord
 ---
 Copyright (C) 2019 Abigail Gold, 0x5c
 
-This file is part of discord-qrmbot and is released under the terms of the GNU
+This file is part of discord-qrm2 and is released under the terms of the GNU
 General Public License, version 2.
 """