diff --git a/README.md b/README.md
index aa471f0555..1d5bfe5b74 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Paper [![CI Status](http://ci.destroystokyo.com/buildStatus/icon?job=PaperSpigot
 
 High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.
 
-[IRC Support and Project Discussion](http://irc.spi.gt/iris/?channels=PaperSpigot)
+[IRC Support and Project Discussion](http://irc.spi.gt/iris/?channels=paper)
 
 
 Documentation
diff --git a/Spigot-API-Patches/POM-changes.patch b/Spigot-API-Patches/POM-changes.patch
index a316a172ce..23ceb953b5 100644
--- a/Spigot-API-Patches/POM-changes.patch
+++ b/Spigot-API-Patches/POM-changes.patch
@@ -30,7 +30,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -    <name>Spigot-API</name>
 -    <url>http://www.spigotmc.org/</url>
 +    <name>Paper-API</name>
-+    <url>https://github.com/PaperSpigot/Paper</url>
++    <url>https://github.com/PaperMC/Paper</url>
      <description>An enhanced plugin API for Minecraft servers.</description>
  
      <properties>
diff --git a/Spigot-Server-Patches/Paper-config-files.patch b/Spigot-Server-Patches/Paper-config-files.patch
index a3d4895a9b..5326c53302 100644
--- a/Spigot-Server-Patches/Paper-config-files.patch
+++ b/Spigot-Server-Patches/Paper-config-files.patch
@@ -39,10 +39,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            + "As you can see, there's tons to configure. Some options may impact gameplay, so use\n"
 +            + "with caution, and make sure you know what each option does before configuring.\n"
 +            + "\n"
-+            + "If you need help with the configuration or have any questions related to PaperSpigot,\n"
-+            + "join us at the IRC.\n"
++            + "If you need help with the configuration or have any questions related to Paper,\n"
++            + "join us in our IRC channel.\n"
 +            + "\n"
-+            + "IRC: #paperspigot @ irc.spi.gt ( http://irc.spi.gt/iris/?channels=PaperSpigot )\n"
++            + "IRC: #paper @ irc.spi.gt ( http://irc.spi.gt/iris/?channels=paper )\n"
 +            + "Wiki: https://paper.readthedocs.org/ \n"
 +            + "Paper Forums: https://aquifermc.org/ \n";
 +    /*========================================================================*/
diff --git a/pom.xml b/pom.xml
index dfeeb38b61..0f0f8a8d6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
 
     <name>Paper-Parent</name>
     <description>Parent project for all Paper modules.</description>
-    <url>https://github.com/PaperSpigot/Paper</url>
+    <url>https://github.com/PaperMC/Paper</url>
 
     <modules>
         <module>Paper-Server</module>
diff --git a/work/Paperclip b/work/Paperclip
index e22721a1aa..370a5d44b6 160000
--- a/work/Paperclip
+++ b/work/Paperclip
@@ -1 +1 @@
-Subproject commit e22721a1aa7f7aca95175cb1430a583f202b757e
+Subproject commit 370a5d44b6bc121c25e0208e127304f8dbdfed55