From ad91d4e7f4fdc3d9418caf229b63a2a9c373c75c Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Tue, 8 Jun 2021 19:17:03 -0300
Subject: [PATCH] update Waterfall -> FlameCord rename methods

---
 .../0001-POM-Changes.patch                    | 168 +++++++++---------
 ...erences-from-Waterfall-to-FlameCord.patch} |  20 +--
 .../0013-FlameCord-rebrand.patch              |  56 ------
 3 files changed, 94 insertions(+), 150 deletions(-)
 rename Waterfall-Proxy-Patches/{0002-Rename-references-from-Waterfall-to-Travertine.patch => 0002-Rename-references-from-Waterfall-to-FlameCord.patch} (88%)
 delete mode 100644 Waterfall-Proxy-Patches/0013-FlameCord-rebrand.patch

diff --git a/Waterfall-Proxy-Patches/0001-POM-Changes.patch b/Waterfall-Proxy-Patches/0001-POM-Changes.patch
index a5195e9..aa309ad 100644
--- a/Waterfall-Proxy-Patches/0001-POM-Changes.patch
+++ b/Waterfall-Proxy-Patches/0001-POM-Changes.patch
@@ -13,47 +13,47 @@ index ca1ed8811..adec9d39f 100644
      <parent>
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>travertine-parent</artifactId>
++        <artifactId>flamecord-parent</artifactId>
          <version>1.16-R0.5-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-api</artifactId>
-+    <artifactId>travertine-api</artifactId>
++    <artifactId>flamecord-api</artifactId>
      <version>1.16-R0.5-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Waterfall-API</name>
-+    <name>Travertine-API</name>
++    <name>FlameCord-API</name>
      <description>API implemented by the Elastic Portal Suite</description>
  
      <dependencies>
          <dependency>
              <groupId>io.github.waterfallmc</groupId>
 -            <artifactId>waterfall-chat</artifactId>
-+            <artifactId>travertine-chat</artifactId>
++            <artifactId>flamecord-chat</artifactId>
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
          <dependency>
              <groupId>io.github.waterfallmc</groupId>
 -            <artifactId>waterfall-config</artifactId>
-+            <artifactId>travertine-config</artifactId>
++            <artifactId>flamecord-config</artifactId>
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
          <dependency>
              <groupId>io.github.waterfallmc</groupId>
 -            <artifactId>waterfall-event</artifactId>
-+            <artifactId>travertine-event</artifactId>
++            <artifactId>flamecord-event</artifactId>
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
          <dependency>
              <groupId>io.github.waterfallmc</groupId>
 -            <artifactId>waterfall-protocol</artifactId>
-+            <artifactId>travertine-protocol</artifactId>
++            <artifactId>flamecord-protocol</artifactId>
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
@@ -66,21 +66,21 @@ index 37c0880cd..139b7ac12 100644
      <parent>
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>travertine-parent</artifactId>
++        <artifactId>flamecord-parent</artifactId>
          <version>1.16-R0.5-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-bootstrap</artifactId>
-+    <artifactId>travertine-bootstrap</artifactId>
++    <artifactId>flamecord-bootstrap</artifactId>
      <version>1.16-R0.5-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Waterfall-Bootstrap</name>
 -    <description>Java 1.6 loader for Waterfall</description>
-+    <name>Travertine-Bootstrap</name>
-+    <description>Java 1.6 loader for Travertine</description>
++    <name>FlameCord-Bootstrap</name>
++    <description>Java 1.6 loader for FlameCord</description>
  
      <properties>
          <maven.deploy.skip>true</maven.deploy.skip>
@@ -89,7 +89,7 @@ index 37c0880cd..139b7ac12 100644
          <dependency>
              <groupId>io.github.waterfallmc</groupId>
 -            <artifactId>waterfall-proxy</artifactId>
-+            <artifactId>travertine-proxy</artifactId>
++            <artifactId>flamecord-proxy</artifactId>
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
@@ -97,7 +97,7 @@ index 37c0880cd..139b7ac12 100644
  
      <build>
 -        <finalName>Waterfall</finalName>
-+        <finalName>Travertine</finalName>
++        <finalName>FlameCord</finalName>
          <plugins>
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
@@ -110,21 +110,21 @@ index 853092339..5cc621414 100644
      <parent>
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>travertine-parent</artifactId>
++        <artifactId>flamecord-parent</artifactId>
          <version>1.16-R0.5-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-chat</artifactId>
-+    <artifactId>travertine-chat</artifactId>
++    <artifactId>flamecord-chat</artifactId>
      <version>1.16-R0.5-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Waterfall-Chat</name>
 -    <description>Minecraft JSON chat API intended for use with Waterfall</description>
-+    <name>Travertine-Chat</name>
-+    <description>Minecraft JSON chat API intended for use with Travertine</description>
++    <name>FlameCord-Chat</name>
++    <description>Minecraft JSON chat API intended for use with FlameCord</description>
  
      <dependencies>
          <dependency>
@@ -137,21 +137,21 @@ index 38db2292d..7cdcbd8b3 100644
      <parent>
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>travertine-parent</artifactId>
++        <artifactId>flamecord-parent</artifactId>
          <version>1.16-R0.5-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-config</artifactId>
-+    <artifactId>travertine-config</artifactId>
++    <artifactId>flamecord-config</artifactId>
      <version>1.16-R0.5-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Waterfall-Config</name>
 -    <description>Generic java configuration API intended for use with Waterfall</description>
-+    <name>Travertine-Config</name>
-+    <description>Generic java configuration API intended for use with Travertine</description>
++    <name>FlameCord-Config</name>
++    <description>Generic java configuration API intended for use with FlameCord</description>
  
      <dependencies>
          <dependency>
@@ -164,21 +164,21 @@ index 82a411b08..b1a990c93 100644
      <parent>
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>travertine-parent</artifactId>
++        <artifactId>flamecord-parent</artifactId>
          <version>1.16-R0.5-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-event</artifactId>
-+    <artifactId>travertine-event</artifactId>
++    <artifactId>flamecord-event</artifactId>
      <version>1.16-R0.5-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Waterfall-Event</name>
 -    <description>Generic java event dispatching API intended for use with Waterfall.</description>
-+    <name>Travertine-Event</name>
-+    <description>Generic java event dispatching API intended for use with Travertine.</description>
++    <name>FlameCord-Event</name>
++    <description>Generic java event dispatching API intended for use with FlameCord.</description>
  </project>
 diff --git a/log/pom.xml b/log/pom.xml
 index 646dbfae5..00f7b9c92 100644
@@ -189,21 +189,21 @@ index 646dbfae5..00f7b9c92 100644
      <parent>
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>travertine-parent</artifactId>
++        <artifactId>flamecord-parent</artifactId>
          <version>1.16-R0.5-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-log</artifactId>
-+    <artifactId>travertine-log</artifactId>
++    <artifactId>flamecord-log</artifactId>
      <version>1.16-R0.5-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Waterfall-Log</name>
 -    <description>Simplistic and performant java.util.Logger based logger and console API designed for use with Waterfall and Minecraft related applications.</description>
-+    <name>Travertine-Log</name>
-+    <description>Simplistic and performant java.util.Logger based logger and console API designed for use with Travertine and Minecraft related applications.</description>
++    <name>FlameCord-Log</name>
++    <description>Simplistic and performant java.util.Logger based logger and console API designed for use with FlameCord and Minecraft related applications.</description>
  
      <dependencies>
          <dependency>
@@ -212,7 +212,7 @@ index 646dbfae5..00f7b9c92 100644
          <dependency>
              <groupId>io.github.waterfallmc</groupId>
 -            <artifactId>waterfall-chat</artifactId>
-+            <artifactId>travertine-chat</artifactId>
++            <artifactId>flamecord-chat</artifactId>
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
@@ -225,21 +225,21 @@ index 51187fd15..9fe7044f9 100644
      <parent>
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>travertine-parent</artifactId>
++        <artifactId>flamecord-parent</artifactId>
          <version>1.16-R0.5-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-log4j</artifactId>
-+    <artifactId>travertine-log4j</artifactId>
++    <artifactId>flamecord-log4j</artifactId>
      <version>1.16-R0.5-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Waterfall-Log</name>
 -    <description>Simplistic and performant Log4j2 based logger and console API designed for use with Waterfall and Minecraft related applications.</description>
-+    <name>Travertine-Log</name>
-+    <description>Simplistic and performant Log4j2 based logger and console API designed for use with Travertine and Minecraft related applications.</description>
++    <name>FlameCord-Log</name>
++    <description>Simplistic and performant Log4j2 based logger and console API designed for use with FlameCord and Minecraft related applications.</description>
  
      <properties>
          <log4j2.version>2.14.0</log4j2.version>
@@ -262,7 +262,7 @@ index 51187fd15..9fe7044f9 100644
 +
 +        <dependency>
 +            <groupId>io.github.waterfallmc</groupId>
-+            <artifactId>travertine-chat</artifactId>
++            <artifactId>flamecord-chat</artifactId>
 +            <version>${project.version}</version>
 +            <scope>compile</scope>
 +        </dependency>
@@ -277,14 +277,14 @@ index 472314c2f..8eb065721 100644
      <parent>
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-module</artifactId>
-+        <artifactId>travertine-module</artifactId>
++        <artifactId>flamecord-module</artifactId>
          <version>1.16-R0.5-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-module-cmd-alert</artifactId>
-+    <artifactId>travertine-module-cmd-alert</artifactId>
++    <artifactId>flamecord-module-cmd-alert</artifactId>
      <version>1.16-R0.5-SNAPSHOT</version>
      <packaging>jar</packaging>
  
@@ -297,14 +297,14 @@ index de8faee02..09e2835aa 100644
      <parent>
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-module</artifactId>
-+        <artifactId>travertine-module</artifactId>
++        <artifactId>flamecord-module</artifactId>
          <version>1.16-R0.5-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-module-cmd-find</artifactId>
-+    <artifactId>travertine-module-cmd-find</artifactId>
++    <artifactId>flamecord-module-cmd-find</artifactId>
      <version>1.16-R0.5-SNAPSHOT</version>
      <packaging>jar</packaging>
  
@@ -317,14 +317,14 @@ index 0cab9a7ab..5d1ff0424 100644
      <parent>
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-module</artifactId>
-+        <artifactId>travertine-module</artifactId>
++        <artifactId>flamecord-module</artifactId>
          <version>1.16-R0.5-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-module-cmd-list</artifactId>
-+    <artifactId>travertine-module-cmd-list</artifactId>
++    <artifactId>flamecord-module-cmd-list</artifactId>
      <version>1.16-R0.5-SNAPSHOT</version>
      <packaging>jar</packaging>
  
@@ -337,14 +337,14 @@ index 240c95487..1f6a7c681 100644
      <parent>
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-module</artifactId>
-+        <artifactId>travertine-module</artifactId>
++        <artifactId>flamecord-module</artifactId>
          <version>1.16-R0.5-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-module-cmd-send</artifactId>
-+    <artifactId>travertine-module-cmd-send</artifactId>
++    <artifactId>flamecord-module-cmd-send</artifactId>
      <version>1.16-R0.5-SNAPSHOT</version>
      <packaging>jar</packaging>
  
@@ -357,14 +357,14 @@ index 4c13d5177..c353e8293 100644
      <parent>
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-module</artifactId>
-+        <artifactId>travertine-module</artifactId>
++        <artifactId>flamecord-module</artifactId>
          <version>1.16-R0.5-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-module-cmd-server</artifactId>
-+    <artifactId>travertine-module-cmd-server</artifactId>
++    <artifactId>flamecord-module-cmd-server</artifactId>
      <version>1.16-R0.5-SNAPSHOT</version>
      <packaging>jar</packaging>
  
@@ -377,21 +377,21 @@ index c9849b6c1..ca0a9c87d 100644
      <parent>
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>travertine-parent</artifactId>
++        <artifactId>flamecord-parent</artifactId>
          <version>1.16-R0.5-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-module</artifactId>
-+    <artifactId>travertine-module</artifactId>
++    <artifactId>flamecord-module</artifactId>
      <version>1.16-R0.5-SNAPSHOT</version>
      <packaging>pom</packaging>
  
 -    <name>Waterfall Modules</name>
 -    <description>Parent project for all Waterfall modules.</description>
-+    <name>Travertine Modules</name>
-+    <description>Parent project for all Travertine modules.</description>
++    <name>FlameCord Modules</name>
++    <description>Parent project for all FlameCord modules.</description>
  
      <modules>
          <module>cmd-alert</module>
@@ -400,7 +400,7 @@ index c9849b6c1..ca0a9c87d 100644
          <dependency>
              <groupId>io.github.waterfallmc</groupId>
 -            <artifactId>waterfall-api</artifactId>
-+            <artifactId>travertine-api</artifactId>
++            <artifactId>flamecord-api</artifactId>
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
@@ -413,14 +413,14 @@ index 45910b0e7..d1a2d86c8 100644
      <parent>
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-module</artifactId>
-+        <artifactId>travertine-module</artifactId>
++        <artifactId>flamecord-module</artifactId>
          <version>1.16-R0.5-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-module-reconnect-yaml</artifactId>
-+    <artifactId>travertine-module-reconnect-yaml</artifactId>
++    <artifactId>flamecord-module-reconnect-yaml</artifactId>
      <version>1.16-R0.5-SNAPSHOT</version>
      <packaging>jar</packaging>
  
@@ -433,21 +433,21 @@ index db15febbc..a2efb5e52 100644
      <parent>
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>travertine-parent</artifactId>
++        <artifactId>flamecord-parent</artifactId>
          <version>1.16-R0.5-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-native</artifactId>
-+    <artifactId>travertine-native</artifactId>
++    <artifactId>flamecord-native</artifactId>
      <version>1.16-R0.5-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Waterfall-Native</name>
 -    <description>Optional native code to speed up and enhance Waterfall functionality.</description>
-+    <name>Travertine-Native</name>
-+    <description>Optional native code to speed up and enhance Travertine functionality.</description>
++    <name>FlameCord-Native</name>
++    <description>Optional native code to speed up and enhance FlameCord functionality.</description>
  
      <dependencies>
          <dependency>
@@ -460,23 +460,23 @@ index 02480a208..f61cdf375 100644
      <parent>
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-super</artifactId>
-+        <artifactId>travertine-super</artifactId>
++        <artifactId>flamecord-super</artifactId>
          <version>dev-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-parent</artifactId>
-+    <artifactId>travertine-parent</artifactId>
++    <artifactId>flamecord-parent</artifactId>
      <version>1.16-R0.5-SNAPSHOT</version>
      <packaging>pom</packaging>
  
 -    <name>Waterfall-Parent</name>
 -    <description>Parent project for all Waterfall modules.</description>
 -    <url>https://github.com/WaterfallMC/Waterfall</url>
-+    <name>Travertine-Parent</name>
-+    <description>Parent project for all Travertine modules.</description>
-+    <url>https://github.com/PaperMC/Travertine</url>
++    <name>FlameCord-Parent</name>
++    <description>Parent project for all FlameCord modules.</description>
++    <url>https://github.com/PaperMC/FlameCord</url>
      <inceptionYear>2015</inceptionYear>
      <organization>
          <name>WaterfallMC</name>
@@ -487,14 +487,14 @@ index 02480a208..f61cdf375 100644
 -        <connection>scm:git:git@github.com:com:WaterfallMC/Waterfall.git</connection>
 -        <developerConnection>scm:git:git@github.com:WaterfallMC/Waterfall.git</developerConnection>
 -        <url>git@github.com:WaterfallMC/Waterfall.git</url>
-+        <connection>scm:git:git@github.com:com:PaperMC/Travertine.git</connection>
-+        <developerConnection>scm:git:git@github.com:PaperMC/Travertine.git</developerConnection>
-+        <url>git@github.com:PaperMC/Travertine.git</url>
++        <connection>scm:git:git@github.com:com:PaperMC/FlameCord.git</connection>
++        <developerConnection>scm:git:git@github.com:PaperMC/FlameCord.git</developerConnection>
++        <url>git@github.com:PaperMC/FlameCord.git</url>
      </scm>
      <issueManagement>
          <system>GitHub</system>
 -        <url>https://github.com/PaperMC/Waterfall/issues</url>
-+        <url>https://github.com/PaperMC/Travertine/issues</url>
++        <url>https://github.com/PaperMC/FlameCord/issues</url>
      </issueManagement>
  
      <distributionManagement>
@@ -507,21 +507,21 @@ index 402266ca1..993cbca95 100644
      <parent>
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>travertine-parent</artifactId>
++        <artifactId>flamecord-parent</artifactId>
          <version>1.16-R0.5-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-protocol</artifactId>
-+    <artifactId>travertine-protocol</artifactId>
++    <artifactId>flamecord-protocol</artifactId>
      <version>1.16-R0.5-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Waterfall-Protocol</name>
 -    <description>Minimal implementation of the Minecraft protocol for use in Waterfall</description>
-+    <name>Travertine-Protocol</name>
-+    <description>Minimal implementation of the Minecraft protocol for use in Travertine</description>
++    <name>FlameCord-Protocol</name>
++    <description>Minimal implementation of the Minecraft protocol for use in FlameCord</description>
  
      <!-- We really shouldn't depend on external repositories, but at least this is the Central staging one -->
      <repositories>
@@ -530,7 +530,7 @@ index 402266ca1..993cbca95 100644
          <dependency>
              <groupId>io.github.waterfallmc</groupId>
 -            <artifactId>waterfall-chat</artifactId>
-+            <artifactId>travertine-chat</artifactId>
++            <artifactId>flamecord-chat</artifactId>
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
@@ -543,19 +543,19 @@ index 602b9a93f..e2ce69e43 100644
      <parent>
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>travertine-parent</artifactId>
++        <artifactId>flamecord-parent</artifactId>
          <version>1.16-R0.5-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-proxy</artifactId>
-+    <artifactId>travertine-proxy</artifactId>
++    <artifactId>flamecord-proxy</artifactId>
      <version>1.16-R0.5-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Waterfall-Proxy</name>
-+    <name>Travertine-Proxy</name>
++    <name>FlameCord-Proxy</name>
      <description>Proxy component of the Elastic Portal Suite</description>
  
      <properties>
@@ -564,35 +564,35 @@ index 602b9a93f..e2ce69e43 100644
          <dependency>
              <groupId>io.github.waterfallmc</groupId>
 -            <artifactId>waterfall-api</artifactId>
-+            <artifactId>travertine-api</artifactId>
++            <artifactId>flamecord-api</artifactId>
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
          <dependency>
              <groupId>io.github.waterfallmc</groupId>
 -            <artifactId>waterfall-log4j</artifactId>
-+            <artifactId>travertine-log4j</artifactId>
++            <artifactId>flamecord-log4j</artifactId>
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
          <dependency>
              <groupId>io.github.waterfallmc</groupId>
 -            <artifactId>waterfall-native</artifactId>
-+            <artifactId>travertine-native</artifactId>
++            <artifactId>flamecord-native</artifactId>
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
          <dependency>
              <groupId>io.github.waterfallmc</groupId>
 -            <artifactId>waterfall-protocol</artifactId>
-+            <artifactId>travertine-protocol</artifactId>
++            <artifactId>flamecord-protocol</artifactId>
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
          <dependency>
              <groupId>io.github.waterfallmc</groupId>
 -            <artifactId>waterfall-query</artifactId>
-+            <artifactId>travertine-query</artifactId>
++            <artifactId>flamecord-query</artifactId>
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
@@ -605,7 +605,7 @@ index 338c30d35..c04992523 100644
              final String url = String.format(
                  "https://papermc.io/api/v2/projects/%1$s/versions/%2$s/builds/%3$s/downloads/%4$s-%2$s-%3$s.jar",
 -                "waterfall",
-+                "travertine", // Travertine
++                "flamecord", // FlameCord
                  net.md_5.bungee.api.ProxyServer.getInstance().getVersion().split(":")[2].split("-")[0],
                  version.getBuild(),
                  module.getName()
@@ -618,21 +618,21 @@ index 8ce88f4a4..813696e45 100644
      <parent>
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>travertine-parent</artifactId>
++        <artifactId>flamecord-parent</artifactId>
          <version>1.16-R0.5-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-query</artifactId>
-+    <artifactId>travertine-query</artifactId>
++    <artifactId>flamecord-query</artifactId>
      <version>1.16-R0.5-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Waterfall-Query</name>
 -    <description>Minecraft query implementation based on the Waterfall API.</description>
-+    <name>Travertine-Query</name>
-+    <description>Minecraft query implementation based on the Travertine API.</description>
++    <name>FlameCord-Query</name>
++    <description>Minecraft query implementation based on the FlameCord API.</description>
  
      <dependencies>
          <dependency>
@@ -641,7 +641,7 @@ index 8ce88f4a4..813696e45 100644
          <dependency>
              <groupId>io.github.waterfallmc</groupId>
 -            <artifactId>waterfall-api</artifactId>
-+            <artifactId>travertine-api</artifactId>
++            <artifactId>flamecord-api</artifactId>
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
diff --git a/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch b/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-FlameCord.patch
similarity index 88%
rename from Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch
rename to Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-FlameCord.patch
index bc8a74a..43775c0 100644
--- a/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch
+++ b/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-FlameCord.patch
@@ -1,7 +1,7 @@
 From a5f023bb3c21941eaf45f1c8946b719d0752590e 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
+Subject: [PATCH] Rename references from Waterfall to FlameCord
 
 
 diff --git a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
@@ -13,7 +13,7 @@ index a4516ed96..1f63a2c27 100644
          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.err.println( "*** ERROR *** FlameCord 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;
          }
@@ -26,7 +26,7 @@ index d703d6d24..d8dcdc1e3 100644
      public LogDispatcher(BungeeLogger logger)
      {
 -        super( "Waterfall Logger Thread" );
-+        super( "Travertine Logger Thread" );
++        super( "FlameCord Logger Thread" );
          this.logger = logger;
      }
  
@@ -39,7 +39,7 @@ index c09f5b4c3..97de4271c 100644
      {
          // 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." );
++        Preconditions.checkState( new File( "." ).getAbsolutePath().indexOf( '!' ) == -1, "Cannot use FlameCord in directory with ! in path." );
  
          try
          {
@@ -48,7 +48,7 @@ index c09f5b4c3..97de4271c 100644
      public String getName()
      {
 -        return "Waterfall";
-+        return "Travertine";
++        return "FlameCord";
      }
  
      @Override
@@ -61,7 +61,7 @@ index 356805285..1c2628d31 100644
          BungeeCord bungee = new BungeeCord();
          ProxyServer.setInstance( bungee );
 -        bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() );
-+        bungee.getLogger().info( "Enabled Travertine version " + bungee.getVersion() );
++        bungee.getLogger().info( "Enabled FlameCord version " + bungee.getVersion() );
          bungee.start();
  
          if ( !options.has( "noconsole" ) )
@@ -74,7 +74,7 @@ index b26035cf9..4e2c6129c 100644
      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" );
++        sender.sendMessage( ChatColor.BLUE + "This server is running FlameCord 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
@@ -87,8 +87,8 @@ index 720d0c3b5..dca7601b0 100644
  
 -        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." );
++        sender.sendMessage( ChatColor.BOLD.toString() + ChatColor.RED.toString() + "FlameCord has been reloaded."
++                + " This is NOT advisable and you will not be supported with any issues that arise! Please restart FlameCord 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
@@ -100,7 +100,7 @@ index 65121ba24..d4fad294c 100644
              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 ) );
++            String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another FlameCord - Forced Host", val ) );
              boolean restricted = get( "restricted", false, val );
              SocketAddress address = Util.getAddr( addr );
              ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
diff --git a/Waterfall-Proxy-Patches/0013-FlameCord-rebrand.patch b/Waterfall-Proxy-Patches/0013-FlameCord-rebrand.patch
deleted file mode 100644
index 7aa44f7..0000000
--- a/Waterfall-Proxy-Patches/0013-FlameCord-rebrand.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From af418e4ac240fa80ec84bf88b6089e0b494b2204 Mon Sep 17 00:00:00 2001
-From: foss-mc <69294560+foss-mc@users.noreply.github.com>
-Date: Wed, 16 Dec 2020 18:11:48 +0800
-Subject: [PATCH] FlameCord rebrand
-
-
-diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-index 527f310e..a4ef6d3b 100644
---- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-@@ -51,7 +51,8 @@ public class WaterfallConfiguration extends Configuration {
-         YamlConfig config = new YamlConfig(new File("waterfall.yml"));
-         config.load(false); // Load, but no permissions
-         logInitialHandlerConnections = config.getBoolean( "log_initial_handler_connections", logInitialHandlerConnections );
--        gameVersion = config.getString("game_version", "").isEmpty() ? Joiner.on(", ").join(ProtocolConstants.SUPPORTED_VERSIONS) : config.getString("game_version", "");
-+        // FlameCord - Make the version look better
-+        gameVersion = config.getString("game_version", "").isEmpty() ? ProtocolConstants.SUPPORTED_VERSIONS.get(0) + "-" + ProtocolConstants.SUPPORTED_VERSIONS.get(ProtocolConstants.SUPPORTED_VERSIONS.size() - 1) : config.getString("game_version", "");
-         useNettyDnsResolver = config.getBoolean("use_netty_dns_resolver", useNettyDnsResolver);
-         // Throttling options
-         tabThrottle = config.getInt("throttling.tab_complete", tabThrottle);
-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 3b0dff08..41d752a5 100644
---- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -547,13 +547,13 @@ public class BungeeCord extends ProxyServer
-     @Override
-     public String getName()
-     {
--        return "Travertine";
-+        return "FlameCord";
-     }
- 
-     @Override
-     public String getVersion()
-     {
--        return ( BungeeCord.class.getPackage().getImplementationVersion() == null ) ? "unknown" : BungeeCord.class.getPackage().getImplementationVersion();
-+        return "0.5.3";
-     }
- 
-     public void reloadMessages()
-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 4e2c6129..aeda7963 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,7 @@ public class CommandBungee extends Command
-     @Override
-     public void execute(CommandSender sender, String[] args)
-     {
--        sender.sendMessage( ChatColor.BLUE + "This server is running Travertine version " + ProxyServer.getInstance().getVersion() + " by md_5" );
-+        // FlameCord - Use custom version message
-+        sender.sendMessage( ChatColor.translateAlternateColorCodes( '&', "&eThis server is running &c" + ProxyServer.getInstance().getName() + "&e version &a" + ProxyServer.getInstance().getVersion() + "&e by &bLinsaFTW & Sammwy&e." ) );
-     }
- }
--- 
-2.31.1
-