diff --git a/Formula/geode.rb b/Formula/apache-geode.rb
similarity index 97%
rename from Formula/geode.rb
rename to Formula/apache-geode.rb
index 654f0be226..595de9dd53 100644
--- a/Formula/geode.rb
+++ b/Formula/apache-geode.rb
@@ -1,4 +1,4 @@
-class Geode < Formula
+class ApacheGeode < Formula
   desc "In-memory Data Grid for fast transactional data processing"
   homepage "https://geode.apache.org/"
   url "https://www.apache.org/dyn/closer.cgi?path=incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.tar.gz"
diff --git a/formula_renames.json b/formula_renames.json
index afed6c1337..65b5550508 100644
--- a/formula_renames.json
+++ b/formula_renames.json
@@ -8,6 +8,7 @@
   "cyassl": "wolfssl",
   "d-bus": "dbus",
   "fig": "docker-compose",
+  "geode": "apache-geode",
   "go-app-engine-32": "app-engine-go-32",
   "go-app-engine-64": "app-engine-go-64",
   "google-app-engine": "app-engine-python",