diff --git a/MinecraftRelocate/pom.xml b/MinecraftRelocate/pom.xml
index c223fe9539..1c7105850c 100644
--- a/MinecraftRelocate/pom.xml
+++ b/MinecraftRelocate/pom.xml
@@ -3,13 +3,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.spigotmc</groupId>
-        <artifactId>spigot-parent</artifactId>
+        <groupId>org.github.paperspigot</groupId>
+        <artifactId>paperspigot-parent</artifactId>
         <version>dev-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.spigotmc</groupId>
+    <groupId>org.github.paperspigot</groupId>
     <artifactId>minecraft-server-relocated</artifactId>
     <version>1.7.10-SNAPSHOT</version>
     <packaging>jar</packaging>
diff --git a/MinecraftRelocate/rename.sh b/MinecraftRelocate/rename.sh
index b814ea54a7..b9b25f357c 100755
--- a/MinecraftRelocate/rename.sh
+++ b/MinecraftRelocate/rename.sh
@@ -1,7 +1,11 @@
 #!/bin/sh
 
+find ../PaperSpigot-Server/src/ -type f -exec sed -i 's/net.minecraft.util.//g' {} \;
 find ../Spigot-Server/src/ -type f -exec sed -i 's/net.minecraft.util.//g' {} \;
+find ../Spigot-Server-Patches/ -type f -exec sed -i 's/net.minecraft.util.//g' {} \;
 find ../CraftBukkit-Patches/ -type f -exec sed -i 's/net.minecraft.util.//g' {} \;
 
+find ../PaperSpigot-Server/src/ -type f -exec sed -i 's/com.mojang.authlib./net.minecraft.util.com.mojang.authlib./g' {} \;
 find ../Spigot-Server/src/ -type f -exec sed -i 's/com.mojang.authlib./net.minecraft.util.com.mojang.authlib./g' {} \;
 find ../CraftBukkit-Patches/ -type f -exec sed -i 's/com.mojang.authlib./net.minecraft.util.com.mojang.authlib./g' {} \;
+find ../Spigot-Server-Patches/ -type f -exec sed -i 's/com.mojang.authlib./net.minecraft.util.com.mojang.authlib./g' {} \;
diff --git a/MinecraftServer/pom.xml b/MinecraftServer/pom.xml
index 8679736760..827c2fa386 100644
--- a/MinecraftServer/pom.xml
+++ b/MinecraftServer/pom.xml
@@ -3,13 +3,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.spigotmc</groupId>
-        <artifactId>spigot-parent</artifactId>
+        <groupId>org.github.paperspigot</groupId>
+        <artifactId>paperspigot-parent</artifactId>
         <version>dev-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.spigotmc</groupId>
+    <groupId>org.github.paperspigot</groupId>
     <artifactId>minecraft-server</artifactId>
     <version>1.7.10-SNAPSHOT</version>
     <packaging>jar</packaging>
diff --git a/README.md b/README.md
index cc5a05c2f0..2b31641ff7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-PaperSpigot [![Build Status](https://travis-ci.org/PaperSpigot/Spigot.png)](https://travis-ci.org/PaperSpigot/Spigot)
+PaperSpigot [![Build Status](http://ci.destroystokyo.com/buildStatus/icon?job=PaperSpigot)](http://ci.destroystokyo.com/job/PaperSpigot/)
 ===========
 
 High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.