diff --git a/orc-rt/test/CMakeLists.txt b/orc-rt/test/CMakeLists.txt
index 66c8f5bef2ca..cfe268c4acc8 100644
--- a/orc-rt/test/CMakeLists.txt
+++ b/orc-rt/test/CMakeLists.txt
@@ -12,7 +12,7 @@ if (ORC_RT_LLVM_TOOLS_AVAILABLE)
   add_subdirectory(tools)
 
   list(APPEND ORC_RT_TEST_DEPS
-    orc-executor
+    ogre
     orc-rt-log-check
     orc-rt-smoke-check
   )
diff --git a/orc-rt/test/regression/init.test b/orc-rt/test/regression/init.test
index eaa666ef75d7..4bd17014ca97 100644
--- a/orc-rt/test/regression/init.test
+++ b/orc-rt/test/regression/init.test
@@ -1 +1 @@
-RUN: orc-executor %s %s
+RUN: ogre %s %s
diff --git a/orc-rt/test/regression/lit.cfg.py b/orc-rt/test/regression/lit.cfg.py
index 013d2c8699d6..f3b006f4834e 100644
--- a/orc-rt/test/regression/lit.cfg.py
+++ b/orc-rt/test/regression/lit.cfg.py
@@ -22,7 +22,7 @@ test_tools_dir = os.path.join(config.orc_rt_obj_root, "test", "tools")
 
 llvm_config.with_environment(
     "PATH",
-    os.path.join(config.orc_rt_obj_root, "tools", "orc-executor"),
+    os.path.join(config.orc_rt_obj_root, "tools", "ogre"),
     append_path=True)
 llvm_config.with_environment("PATH", test_tools_dir, append_path=True)
 
diff --git a/orc-rt/tools/CMakeLists.txt b/orc-rt/tools/CMakeLists.txt
index fc78ea413160..b7239567406a 100644
--- a/orc-rt/tools/CMakeLists.txt
+++ b/orc-rt/tools/CMakeLists.txt
@@ -1 +1 @@
-add_subdirectory(orc-executor)
+add_subdirectory(ogre)
diff --git a/orc-rt/tools/ogre/CMakeLists.txt b/orc-rt/tools/ogre/CMakeLists.txt
new file mode 100644
index 000000000000..6b42eb636ec9
--- /dev/null
+++ b/orc-rt/tools/ogre/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_executable(ogre ogre.cpp)
+target_link_libraries(ogre PRIVATE orc-rt-executor)
diff --git a/orc-rt/tools/orc-executor/orc-executor.cpp b/orc-rt/tools/ogre/ogre.cpp
similarity index 70%
rename from orc-rt/tools/orc-executor/orc-executor.cpp
rename to orc-rt/tools/ogre/ogre.cpp
index e83d28fa03d5..79c31a2b4112 100644
--- a/orc-rt/tools/orc-executor/orc-executor.cpp
+++ b/orc-rt/tools/ogre/ogre.cpp
@@ -1,4 +1,4 @@
-//===- orc-executor.cpp - Placeholder implementation for orc-rt ----------===//
+//===- ogre.cpp - ORC Generic Runtime Environment -------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -6,7 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// Placeholder implementation file for initial orc-rt checkin.
+// The ORC Generic Runtime Environment (OGRE) is intended as a canonical
+// "blank executor".
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/orc-rt/tools/orc-executor/CMakeLists.txt b/orc-rt/tools/orc-executor/CMakeLists.txt
deleted file mode 100644
index b4a2292f5817..000000000000
--- a/orc-rt/tools/orc-executor/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_executable(orc-executor orc-executor.cpp)
-target_link_libraries(orc-executor PRIVATE orc-rt-executor)