diff --git a/presto-native-execution/presto_cpp/main/PrestoServer.cpp b/presto-native-execution/presto_cpp/main/PrestoServer.cpp
index fb926119c25d9..2db8f254d235f 100644
--- a/presto-native-execution/presto_cpp/main/PrestoServer.cpp
+++ b/presto-native-execution/presto_cpp/main/PrestoServer.cpp
@@ -839,7 +839,7 @@ void PrestoServer::initializeVeloxMemory() {
   PRESTO_STARTUP_LOG(INFO) << "Starting with node memory " << memoryGb << "GB";
 
   // Set up velox memory manager.
-  velox::memory::MemoryManagerOptions options;
+  velox::memory::MemoryManager::Options options;
   options.allocatorCapacity = memoryGb << 30;
   if (systemConfig->useMmapAllocator()) {
     options.useMmapAllocator = true;
diff --git a/presto-native-execution/presto_cpp/main/http/tests/HttpJwtTest.cpp b/presto-native-execution/presto_cpp/main/http/tests/HttpJwtTest.cpp
index 25e2c2c351f52..08d3135b593d0 100644
--- a/presto-native-execution/presto_cpp/main/http/tests/HttpJwtTest.cpp
+++ b/presto-native-execution/presto_cpp/main/http/tests/HttpJwtTest.cpp
@@ -34,7 +34,7 @@ class HttpJwtTestSuite : public ::testing::TestWithParam<bool> {
 
  protected:
   static void SetUpTestCase() {
-    memory::MemoryManager::testingSetInstance(memory::MemoryManagerOptions{});
+    memory::MemoryManager::testingSetInstance(memory::MemoryManager::Options{});
   }
 
   std::unique_ptr<config::ConfigBase> jwtSystemConfig(
diff --git a/presto-native-execution/presto_cpp/main/http/tests/HttpTest.cpp b/presto-native-execution/presto_cpp/main/http/tests/HttpTest.cpp
index e24b70a3575c0..5e4a1ceddf371 100644
--- a/presto-native-execution/presto_cpp/main/http/tests/HttpTest.cpp
+++ b/presto-native-execution/presto_cpp/main/http/tests/HttpTest.cpp
@@ -25,7 +25,7 @@ int main(int argc, char** argv) {
 class HttpsBasicTest : public ::testing::Test {
  protected:
   static void SetUpTestCase() {
-    memory::MemoryManager::testingSetInstance(memory::MemoryManagerOptions{});
+    memory::MemoryManager::testingSetInstance(memory::MemoryManager::Options{});
   }
 };
 
@@ -64,7 +64,7 @@ class HttpTestSuite : public ::testing::TestWithParam<bool> {
 
  protected:
   static void SetUpTestCase() {
-    memory::MemoryManager::testingSetInstance(memory::MemoryManagerOptions{});
+    memory::MemoryManager::testingSetInstance(memory::MemoryManager::Options{});
   }
 
   std::unique_ptr<http::HttpServer> getServer(
diff --git a/presto-native-execution/presto_cpp/main/operators/benchmarks/BinarySortableSerializerBenchmark.cpp b/presto-native-execution/presto_cpp/main/operators/benchmarks/BinarySortableSerializerBenchmark.cpp
index 0dccfddc28cbf..9e95ba1deffbc 100644
--- a/presto-native-execution/presto_cpp/main/operators/benchmarks/BinarySortableSerializerBenchmark.cpp
+++ b/presto-native-execution/presto_cpp/main/operators/benchmarks/BinarySortableSerializerBenchmark.cpp
@@ -164,7 +164,7 @@ BENCHMARK(structsSerialize) {
 int main(int argc, char** argv) {
   folly::Init init{&argc, &argv};
   facebook::velox::memory::MemoryManager::initialize(
-      facebook::velox::memory::MemoryManagerOptions{});
+      facebook::velox::memory::MemoryManager::Options{});
   folly::runBenchmarks();
   return 0;
 }
diff --git a/presto-native-execution/presto_cpp/main/operators/tests/BinarySortableSerializerTest.cpp b/presto-native-execution/presto_cpp/main/operators/tests/BinarySortableSerializerTest.cpp
index 7c1ea80d10df5..1fd77ec99994d 100644
--- a/presto-native-execution/presto_cpp/main/operators/tests/BinarySortableSerializerTest.cpp
+++ b/presto-native-execution/presto_cpp/main/operators/tests/BinarySortableSerializerTest.cpp
@@ -52,7 +52,7 @@ class BinarySortableSerializerTest : public ::testing::Test,
                                      public velox::test::VectorTestBase {
  protected:
   static void SetUpTestCase() {
-    velox::memory::MemoryManager::testingSetInstance(velox::memory::MemoryManagerOptions{});
+    velox::memory::MemoryManager::testingSetInstance(velox::memory::MemoryManager::Options{});
   }
 
   int compareRowVector(
@@ -142,7 +142,7 @@ class BinarySortableSerializerFuzzerTest : public ::testing::Test,
                                            public velox::test::VectorTestBase {
  protected:
   static void SetUpTestCase() {
-    velox::memory::MemoryManager::testingSetInstance(velox::memory::MemoryManagerOptions{});
+    velox::memory::MemoryManager::testingSetInstance(velox::memory::MemoryManager::Options{});
   }
 
   void runFuzzerTest(const velox::RowTypePtr& rowType) {
diff --git a/presto-native-execution/presto_cpp/main/operators/tests/PlanNodeSerdeTest.cpp b/presto-native-execution/presto_cpp/main/operators/tests/PlanNodeSerdeTest.cpp
index 48f69569a78f7..2fa2bcc738773 100644
--- a/presto-native-execution/presto_cpp/main/operators/tests/PlanNodeSerdeTest.cpp
+++ b/presto-native-execution/presto_cpp/main/operators/tests/PlanNodeSerdeTest.cpp
@@ -30,7 +30,7 @@ class PlanNodeSerdeTest : public testing::Test,
                           public velox::test::VectorTestBase {
  protected:
   static void SetUpTestCase() {
-    memory::MemoryManager::testingSetInstance(memory::MemoryManagerOptions{});
+    memory::MemoryManager::testingSetInstance(memory::MemoryManager::Options{});
   }
 
   PlanNodeSerdeTest() {
diff --git a/presto-native-execution/presto_cpp/main/tests/PeriodicMemoryCheckerTest.cpp b/presto-native-execution/presto_cpp/main/tests/PeriodicMemoryCheckerTest.cpp
index 855813db9f1e2..445bc82ee9dc4 100644
--- a/presto-native-execution/presto_cpp/main/tests/PeriodicMemoryCheckerTest.cpp
+++ b/presto-native-execution/presto_cpp/main/tests/PeriodicMemoryCheckerTest.cpp
@@ -176,7 +176,7 @@ TEST_F(PeriodicMemoryCheckerTest, heapdump) {
 }
 
 TEST_F(PeriodicMemoryCheckerTest, pushbackMemory) {
-  memory::MemoryManagerOptions options;
+  memory::MemoryManager::Options options;
   options.allocatorCapacity = 32L << 20;
   memory::MemoryManager::testingSetInstance(options);
   auto asyncDataCache =
@@ -222,6 +222,6 @@ TEST_F(PeriodicMemoryCheckerTest, pushbackMemory) {
   // Shutdown global memory setups
   asyncDataCache->shutdown();
   cache::AsyncDataCache::setInstance(nullptr);
-  memory::MemoryManager::testingSetInstance(memory::MemoryManagerOptions{});
+  memory::MemoryManager::testingSetInstance(memory::MemoryManager::Options{});
 }
 } // namespace facebook::presto
diff --git a/presto-native-execution/presto_cpp/main/tests/PrestoExchangeSourceTest.cpp b/presto-native-execution/presto_cpp/main/tests/PrestoExchangeSourceTest.cpp
index 04ded54b62a58..321332ff3c386 100644
--- a/presto-native-execution/presto_cpp/main/tests/PrestoExchangeSourceTest.cpp
+++ b/presto-native-execution/presto_cpp/main/tests/PrestoExchangeSourceTest.cpp
@@ -496,7 +496,7 @@ struct Params {
 class PrestoExchangeSourceTest : public ::testing::TestWithParam<Params> {
  public:
   static void SetUpTestCase() {
-    MemoryManagerOptions options;
+    MemoryManager::Options options;
     options.allocatorCapacity = 1L << 30;
     options.useMmapAllocator = true;
     MemoryManager::testingSetInstance(options);
diff --git a/presto-native-execution/presto_cpp/main/tests/QueryContextCacheTest.cpp b/presto-native-execution/presto_cpp/main/tests/QueryContextCacheTest.cpp
index c2ccebd449870..cc0dda757263a 100644
--- a/presto-native-execution/presto_cpp/main/tests/QueryContextCacheTest.cpp
+++ b/presto-native-execution/presto_cpp/main/tests/QueryContextCacheTest.cpp
@@ -37,7 +37,7 @@ void verifyQueryCtxCache(
 class QueryContextCacheTest : public testing::Test {
  protected:
   static void SetUpTestCase() {
-    memory::MemoryManager::testingSetInstance(memory::MemoryManagerOptions{});
+    memory::MemoryManager::testingSetInstance(memory::MemoryManager::Options{});
   }
 
   void SetUp() override {
diff --git a/presto-native-execution/presto_cpp/main/tests/QueryContextManagerTest.cpp b/presto-native-execution/presto_cpp/main/tests/QueryContextManagerTest.cpp
index 4fb0bc40d9cb5..4dcbd9d4edd17 100644
--- a/presto-native-execution/presto_cpp/main/tests/QueryContextManagerTest.cpp
+++ b/presto-native-execution/presto_cpp/main/tests/QueryContextManagerTest.cpp
@@ -22,7 +22,7 @@ namespace facebook::presto {
 class QueryContextManagerTest : public testing::Test {
  protected:
   static void SetUpTestCase() {
-    velox::memory::MemoryManager::testingSetInstance(velox::memory::MemoryManagerOptions{});
+    velox::memory::MemoryManager::testingSetInstance(velox::memory::MemoryManager::Options{});
   }
 
   void SetUp() override {
diff --git a/presto-native-execution/presto_cpp/main/types/tests/PlanConverterTest.cpp b/presto-native-execution/presto_cpp/main/types/tests/PlanConverterTest.cpp
index 9508a3e91e28f..cb840ecae1491 100644
--- a/presto-native-execution/presto_cpp/main/types/tests/PlanConverterTest.cpp
+++ b/presto-native-execution/presto_cpp/main/types/tests/PlanConverterTest.cpp
@@ -79,7 +79,7 @@ std::shared_ptr<const core::PlanNode> assertToBatchVeloxQueryPlan(
 class PlanConverterTest : public ::testing::Test {
  protected:
   static void SetUpTestCase() {
-    memory::MemoryManager::testingSetInstance(memory::MemoryManagerOptions{});
+    memory::MemoryManager::testingSetInstance(memory::MemoryManager::Options{});
   }
 
   void SetUp() override {
diff --git a/presto-native-execution/presto_cpp/main/types/tests/RowExpressionTest.cpp b/presto-native-execution/presto_cpp/main/types/tests/RowExpressionTest.cpp
index ddbe1dfa5170a..530067def9059 100644
--- a/presto-native-execution/presto_cpp/main/types/tests/RowExpressionTest.cpp
+++ b/presto-native-execution/presto_cpp/main/types/tests/RowExpressionTest.cpp
@@ -27,7 +27,7 @@ using namespace facebook::velox::core;
 class RowExpressionTest : public ::testing::Test {
  public:
   static void SetUpTestCase() {
-    memory::MemoryManager::testingSetInstance(memory::MemoryManagerOptions{});
+    memory::MemoryManager::testingSetInstance(memory::MemoryManager::Options{});
   }
 
   void SetUp() override {