diff --git a/presto-native-execution/presto_cpp/main/PrestoServer.cpp b/presto-native-execution/presto_cpp/main/PrestoServer.cpp
index 115b0f57f94bc..370d010ee3578 100644
--- a/presto-native-execution/presto_cpp/main/PrestoServer.cpp
+++ b/presto-native-execution/presto_cpp/main/PrestoServer.cpp
@@ -840,9 +840,8 @@ void PrestoServer::initializeThreadPools() {
 
   driverExecutor_ = std::make_unique<folly::CPUThreadPoolExecutor>(
       numDriverCpuThreads, threadFactory);
-  driverCpuExecutor_ =
-      velox::checked_pointer_cast<folly::CPUThreadPoolExecutor>(
-          driverExecutor_.get());
+  driverCpuExecutor_ = velox::checkedPointerCast<folly::CPUThreadPoolExecutor>(
+      driverExecutor_.get());
 
   const auto numIoThreads = std::max<size_t>(
       systemConfig->httpServerNumIoThreadsHwMultiplier() * hwConcurrency, 1);
@@ -861,7 +860,7 @@ void PrestoServer::initializeThreadPools() {
         numSpillerCpuThreads,
         std::make_shared<folly::NamedThreadFactory>("Spiller"));
     spillerCpuExecutor_ =
-        velox::checked_pointer_cast<folly::CPUThreadPoolExecutor>(
+        velox::checkedPointerCast<folly::CPUThreadPoolExecutor>(
             spillerExecutor_.get());
   }
   const auto numExchangeHttpClientIoThreads = std::max<size_t>(
diff --git a/presto-native-execution/presto_cpp/main/operators/LocalShuffle.cpp b/presto-native-execution/presto_cpp/main/operators/LocalShuffle.cpp
index a253bb2a70a65..c3a17902d9780 100644
--- a/presto-native-execution/presto_cpp/main/operators/LocalShuffle.cpp
+++ b/presto-native-execution/presto_cpp/main/operators/LocalShuffle.cpp
@@ -487,7 +487,7 @@ LocalShuffleReader::nextSorted(uint64_t maxBytes) {
   uint64_t bufferUsed = 0;
 
   while (auto* stream = merge_->next()) {
-    auto* reader = velox::checked_pointer_cast<SortedFileInputStream>(stream);
+    auto* reader = velox::checkedPointerCast<SortedFileInputStream>(stream);
     const auto data = reader->currentValue();
 
     if (bufferUsed + data.size() > maxBytes) {
diff --git a/presto-native-execution/presto_cpp/main/operators/ShuffleRead.cpp b/presto-native-execution/presto_cpp/main/operators/ShuffleRead.cpp
index 3e08f5369036e..aa4f2e9df43d1 100644
--- a/presto-native-execution/presto_cpp/main/operators/ShuffleRead.cpp
+++ b/presto-native-execution/presto_cpp/main/operators/ShuffleRead.cpp
@@ -75,7 +75,7 @@ RowVectorPtr ShuffleRead::getOutput() {
     VELOX_CHECK_EQ(nextRow_, 0);
     size_t numRows{0};
     for (const auto& page : currentPages_) {
-      auto* batch = checked_pointer_cast<ShuffleSerializedPage>(page.get());
+      auto* batch = checkedPointerCast<ShuffleSerializedPage>(page.get());
       VELOX_CHECK_LE(batch->size(), std::numeric_limits<int32_t>::max());
       rawInputBytes += page->size();
       const auto pageRows = page->numRows().value();
@@ -85,7 +85,7 @@ RowVectorPtr ShuffleRead::getOutput() {
     }
     rows_.reserve(numRows);
     for (const auto& page : currentPages_) {
-      auto* batch = checked_pointer_cast<ShuffleSerializedPage>(page.get());
+      auto* batch = checkedPointerCast<ShuffleSerializedPage>(page.get());
       const auto& rows = batch->rows();
       for (const auto& row : rows) {
         rows_.emplace_back(row);
diff --git a/presto-native-execution/velox b/presto-native-execution/velox
index ba2d78eee973b..6cfdded639923 160000
--- a/presto-native-execution/velox
+++ b/presto-native-execution/velox
@@ -1 +1 @@
-Subproject commit ba2d78eee973be24c0cb595d9f7f7c9a8e13baa2
+Subproject commit 6cfdded6399233615f33088f2b037f8d2c505e1a