diff --git a/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch b/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch
new file mode 100644
index 0000000..a8cc07b
--- /dev/null
+++ b/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch
@@ -0,0 +1,122 @@
+From 889e365b05827e550dc91269a4a3be5a8f65c493 Mon Sep 17 00:00:00 2001
+From: Techcable <Techcable@techcable.net>
+Date: Mon, 6 Jun 2016 13:47:46 -0600
+Subject: [PATCH] Rename references from Waterfall to Travertine
+
+
+diff --git a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
+index a4516ed..1f63a2c 100644
+--- a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
++++ b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
+@@ -7,7 +7,7 @@ public class Bootstrap
+     {
+         if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 52.0 )
+         {
+-            System.err.println( "*** ERROR *** Waterfall requires Java 8 or above to function! Please download and install it!" );
++            System.err.println( "*** ERROR *** Travertine requires Java 8 or above to function! Please download and install it!" );
+             System.out.println( "You can check your Java version with the command: java -version" );
+             return;
+         }
+diff --git a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+index 29e2294..fb28fd8 100644
+--- a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
++++ b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+@@ -57,7 +57,7 @@ public class BungeeCordLauncher
+ 
+         BungeeCord bungee = new BungeeCord();
+         ProxyServer.setInstance( bungee );
+-        bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() );
++        bungee.getLogger().info( "Enabled Travertine version " + bungee.getVersion() );
+         bungee.start();
+ 
+         if ( !options.has( "noconsole" ) )
+diff --git a/proxy/src/main/java/Test.java b/proxy/src/main/java/Test.java
+index 446dfe2..f068a38 100644
+--- a/proxy/src/main/java/Test.java
++++ b/proxy/src/main/java/Test.java
+@@ -19,7 +19,7 @@ public class Test
+     {
+         BungeeCord bungee = new BungeeCord();
+         ProxyServer.setInstance( bungee );
+-        bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() );
++        bungee.getLogger().info( "Enabled Travertine version " + bungee.getVersion() );
+         bungee.start();
+ 
+         while ( bungee.isRunning )
+diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+index d0739c1..b0f2dd6 100644
+--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
++++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+@@ -174,7 +174,7 @@ public class BungeeCord extends ProxyServer
+     public BungeeCord() throws IOException
+     {
+         // Java uses ! to indicate a resource inside of a jar/zip/other container. Running Bungee from within a directory that has a ! will cause this to muck up.
+-        Preconditions.checkState( new File( "." ).getAbsolutePath().indexOf( '!' ) == -1, "Cannot use Waterfall in directory with ! in path." );
++        Preconditions.checkState( new File( "." ).getAbsolutePath().indexOf( '!' ) == -1, "Cannot use Travertine in directory with ! in path." );
+ 
+         try
+         {
+@@ -464,7 +464,7 @@ public class BungeeCord extends ProxyServer
+     @Override
+     public String getName()
+     {
+-        return "Waterfall";
++        return "Travertine";
+     }
+ 
+     @Override
+diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java b/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
+index b26035c..4e2c612 100644
+--- a/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
++++ b/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
+@@ -16,6 +16,6 @@ public class CommandBungee extends Command
+     @Override
+     public void execute(CommandSender sender, String[] args)
+     {
+-        sender.sendMessage( ChatColor.BLUE + "This server is running Waterfall version " + ProxyServer.getInstance().getVersion() + " by md_5" );
++        sender.sendMessage( ChatColor.BLUE + "This server is running Travertine version " + ProxyServer.getInstance().getVersion() + " by md_5" );
+     }
+ }
+diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java b/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
+index 4a49241..55267f4 100644
+--- a/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
++++ b/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
+@@ -22,7 +22,7 @@ public class CommandReload extends Command
+         BungeeCord.getInstance().startListeners();
+         BungeeCord.getInstance().getPluginManager().callEvent( new ProxyReloadEvent( sender ) );
+ 
+-        sender.sendMessage( ChatColor.BOLD.toString() + ChatColor.RED.toString() + "Waterfall has been reloaded."
+-                + " This is NOT advisable and you will not be supported with any issues that arise! Please restart Waterfall ASAP." );
++        sender.sendMessage( ChatColor.BOLD.toString() + ChatColor.RED.toString() + "Travertine has been reloaded."
++                + " This is NOT advisable and you will not be supported with any issues that arise! Please restart Travertine ASAP." );
+     }
+ }
+diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
+index 4ec9782..25e9781 100644
+--- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
++++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
+@@ -211,7 +211,7 @@ public class YamlConfig implements ConfigurationAdapter
+             Map<String, Object> val = entry.getValue();
+             String name = entry.getKey();
+             String addr = get( "address", "localhost:25565", val );
+-            String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another Waterfall - Forced Host", val ) );
++            String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another Travertine - Forced Host", val ) );
+             boolean restricted = get( "restricted", false, val );
+             InetSocketAddress address = Util.getAddr( addr );
+             ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
+diff --git a/proxy/src/main/java/net/md_5/bungee/log/LogDispatcher.java b/proxy/src/main/java/net/md_5/bungee/log/LogDispatcher.java
+index d703d6d..d8dcdc1 100644
+--- a/proxy/src/main/java/net/md_5/bungee/log/LogDispatcher.java
++++ b/proxy/src/main/java/net/md_5/bungee/log/LogDispatcher.java
+@@ -12,7 +12,7 @@ public class LogDispatcher extends Thread
+ 
+     public LogDispatcher(BungeeLogger logger)
+     {
+-        super( "Waterfall Logger Thread" );
++        super( "Travertine Logger Thread" );
+         this.logger = logger;
+     }
+ 
+-- 
+2.8.3
+
diff --git a/Waterfall-Proxy-Patches/0003-Metrics.patch b/Waterfall-Proxy-Patches/0003-Metrics.patch
new file mode 100644
index 0000000..02ec3f9
--- /dev/null
+++ b/Waterfall-Proxy-Patches/0003-Metrics.patch
@@ -0,0 +1,22 @@
+From ff461b8c47aadc617c4c7f322e44db80473906db Mon Sep 17 00:00:00 2001
+From: Techcable <Techcable@techcable.net>
+Date: Mon, 6 Jun 2016 13:49:46 -0600
+Subject: [PATCH] Metrics
+
+
+diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/Metrics.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/Metrics.java
+index ae5a2a9..4b70e8c 100644
+--- a/proxy/src/main/java/io/github/waterfallmc/waterfall/Metrics.java
++++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/Metrics.java
+@@ -73,7 +73,7 @@ public class Metrics extends TimerTask
+         }
+ 
+         // Create the url
+-        URL url = new URL( BASE_URL + String.format( REPORT_URL, encode( "Waterfall" ) ) );
++        URL url = new URL( BASE_URL + String.format( REPORT_URL, encode( "Travertine" ) ) );
+ 
+         // Connect to the website
+         URLConnection connection;
+-- 
+2.8.3
+
diff --git a/applyPatches.sh b/applyPatches.sh
index 0171df5..7118f73 100755
--- a/applyPatches.sh
+++ b/applyPatches.sh
@@ -60,8 +60,14 @@ if [[ "$gpgsign" == "true" ]]; then
     git config --global commit.gpgsign false
 fi
 
+# Apply waterfall patches
+basedir=$basedir/Waterfall
+pushd Waterfall
+applyPatch BungeeCord Waterfall-Proxy HEAD
+popd
+basedir=$(dirname $basedir)
 
-# Apply patches
+# Apply travertine patches
 applyPatch Waterfall/Waterfall-Proxy Travertine-Proxy HEAD
 
 enableCommitSigningIfNeeded
diff --git a/build.sh b/build.sh
index 8c7ceb2..ff81108 100755
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-./prepareBuild.sh && pushd Travertine-Proxy && mvn clean package && popd
+./applyPatches.sh && pushd Travertine-Proxy && mvn clean package && popd
 
diff --git a/prepareBuild.sh b/prepareBuild.sh
deleted file mode 100755
index cb8d9e2..0000000
--- a/prepareBuild.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-git submodule update --recursive --init
-
-pushd Waterfall
-
-./applyPatches.sh
-
-popd
-
-./applyPatches.sh
-