diff --git a/CMake/abseil.cmake b/CMake/abseil.cmake
index 8768f24..b25c991 100644
--- a/CMake/abseil.cmake
+++ b/CMake/abseil.cmake
@@ -1,7 +1,7 @@
 include_guard(GLOBAL)
 
-# TODO: these variables are named VELOX_* because we are piggy-backing on 
-# Velox's resolve dependency module for now. We should change and have 
+# TODO: these variables are named VELOX_* because we are piggy-backing on
+# Velox's resolve dependency module for now. We should change and have
 # our own in the future.
 set(VELOX_ABSEIL_VERSION 20240116.0)
 set(VELOX_ABSEIL_BUILD_SHA256_CHECKSUM
@@ -9,7 +9,7 @@ set(VELOX_ABSEIL_BUILD_SHA256_CHECKSUM
 set(VELOX_ABSEIL_SOURCE_URL
   "https://github.com/abseil/abseil-cpp/archive/refs/tags/${VELOX_ABSEIL_VERSION}.tar.gz")
 
-resolve_dependency_url(ABSEIL)
+velox_resolve_dependency_url(ABSEIL)
 
 message(STATUS "Building abseil from source")
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa4d343..06a1786 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,25 +98,25 @@ include(CTest) # include after project() but before add_subdirectory()
 # generated .cpp/.h files), but adding this for convenience for now.
 find_package(FlatBuffers REQUIRED)
 
-set_source(gtest)
-resolve_dependency(gtest)
+velox_set_source(gtest)
+velox_ resolve_dependency(gtest)
 
-set_source(glog)
-resolve_dependency(glog)
+velox_set_source(glog)
+velox_ resolve_dependency(glog)
 
-set_source(gflags)
-resolve_dependency(gflags COMPONENTS shared)
+velox_set_source(gflags)
+velox_ resolve_dependency(gflags COMPONENTS shared)
 
 set(BOOST_INCLUDE_LIBRARIES algorithm context filesystem program_options)
 
-set_source(Boost)
-resolve_dependency(Boost 1.77.0 COMPONENTS ${BOOST_INCLUDE_LIBRARIES})
+velox_set_source(Boost)
+velox_ resolve_dependency(Boost 1.77.0 COMPONENTS ${BOOST_INCLUDE_LIBRARIES})
 
-set_source(folly)
-resolve_dependency(folly)
+velox_set_source(folly)
+velox_ resolve_dependency(folly)
 
-set_source(abseil)
-resolve_dependency(abseil)
+velox_set_source(abseil)
+velox_ resolve_dependency(abseil)
 
 # Use xxhash and xsimd from Velox for now.
 include_directories(.)
diff --git a/dwio/nimble/common/BitEncoder.h b/dwio/nimble/common/BitEncoder.h
index 5e8cf49..97b5402 100644
--- a/dwio/nimble/common/BitEncoder.h
+++ b/dwio/nimble/common/BitEncoder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/common/Bits.cpp b/dwio/nimble/common/Bits.cpp
index 359f157..56cb803 100644
--- a/dwio/nimble/common/Bits.cpp
+++ b/dwio/nimble/common/Bits.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/common/Bits.h b/dwio/nimble/common/Bits.h
index 7c83f1a..dbc5969 100644
--- a/dwio/nimble/common/Bits.h
+++ b/dwio/nimble/common/Bits.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/common/Buffer.h b/dwio/nimble/common/Buffer.h
index 6408ca5..e6850d8 100644
--- a/dwio/nimble/common/Buffer.h
+++ b/dwio/nimble/common/Buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/common/CMakeLists.txt b/dwio/nimble/common/CMakeLists.txt
index fd3728d..5208905 100644
--- a/dwio/nimble/common/CMakeLists.txt
+++ b/dwio/nimble/common/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) Meta Platforms, Inc. and its affiliates.
+# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,13 +13,7 @@
 # limitations under the License.
 add_subdirectory(tests)
 
-add_library(
-  nimble_common
-  Bits.cpp
-  Checksum.cpp
-  FixedBitArray.cpp
-  MetricsLogger.cpp
-  Types.cpp
-  Varint.cpp)
+add_library(nimble_common Bits.cpp Checksum.cpp FixedBitArray.cpp
+                          MetricsLogger.cpp Types.cpp Varint.cpp)
 
 target_link_libraries(nimble_common velox_memory Folly::folly)
diff --git a/dwio/nimble/common/Checksum.cpp b/dwio/nimble/common/Checksum.cpp
index b5fbd8c..24f1e72 100644
--- a/dwio/nimble/common/Checksum.cpp
+++ b/dwio/nimble/common/Checksum.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/common/Checksum.h b/dwio/nimble/common/Checksum.h
index 65dfac0..d395c63 100644
--- a/dwio/nimble/common/Checksum.h
+++ b/dwio/nimble/common/Checksum.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/common/EncodingPrimitives.h b/dwio/nimble/common/EncodingPrimitives.h
index 9dad49c..662d064 100644
--- a/dwio/nimble/common/EncodingPrimitives.h
+++ b/dwio/nimble/common/EncodingPrimitives.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/common/EncodingType.h b/dwio/nimble/common/EncodingType.h
index 8e0f8ba..832ce26 100644
--- a/dwio/nimble/common/EncodingType.h
+++ b/dwio/nimble/common/EncodingType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/common/Entropy.h b/dwio/nimble/common/Entropy.h
index 8a826c2..8e6b039 100644
--- a/dwio/nimble/common/Entropy.h
+++ b/dwio/nimble/common/Entropy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/common/Exceptions.h b/dwio/nimble/common/Exceptions.h
index 9556387..366ea9a 100644
--- a/dwio/nimble/common/Exceptions.h
+++ b/dwio/nimble/common/Exceptions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/common/FixedBitArray.cpp b/dwio/nimble/common/FixedBitArray.cpp
index 70ce6f7..6e7473e 100644
--- a/dwio/nimble/common/FixedBitArray.cpp
+++ b/dwio/nimble/common/FixedBitArray.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/common/FixedBitArray.h b/dwio/nimble/common/FixedBitArray.h
index a585f92..46b2ba5 100644
--- a/dwio/nimble/common/FixedBitArray.h
+++ b/dwio/nimble/common/FixedBitArray.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/common/MetricsLogger.cpp b/dwio/nimble/common/MetricsLogger.cpp
index fc5c19a..318c5ba 100644
--- a/dwio/nimble/common/MetricsLogger.cpp
+++ b/dwio/nimble/common/MetricsLogger.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/common/MetricsLogger.h b/dwio/nimble/common/MetricsLogger.h
index 1f20d79..63efd93 100644
--- a/dwio/nimble/common/MetricsLogger.h
+++ b/dwio/nimble/common/MetricsLogger.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/common/Rle.h b/dwio/nimble/common/Rle.h
index b8324c4..670f30c 100644
--- a/dwio/nimble/common/Rle.h
+++ b/dwio/nimble/common/Rle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/common/Types.cpp b/dwio/nimble/common/Types.cpp
index 40a52fd..6c59d73 100644
--- a/dwio/nimble/common/Types.cpp
+++ b/dwio/nimble/common/Types.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/common/Types.h b/dwio/nimble/common/Types.h
index 78201bf..fae247d 100644
--- a/dwio/nimble/common/Types.h
+++ b/dwio/nimble/common/Types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/common/Varint.cpp b/dwio/nimble/common/Varint.cpp
index 61ca49b..d4e4db1 100644
--- a/dwio/nimble/common/Varint.cpp
+++ b/dwio/nimble/common/Varint.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/common/Varint.h b/dwio/nimble/common/Varint.h
index 6ed6650..1c3be78 100644
--- a/dwio/nimble/common/Varint.h
+++ b/dwio/nimble/common/Varint.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/common/Vector.h b/dwio/nimble/common/Vector.h
index 3694bde..3fce00e 100644
--- a/dwio/nimble/common/Vector.h
+++ b/dwio/nimble/common/Vector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/CMakeLists.txt b/dwio/nimble/encodings/CMakeLists.txt
index 8f16186..d5ba89d 100644
--- a/dwio/nimble/encodings/CMakeLists.txt
+++ b/dwio/nimble/encodings/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) Meta Platforms, Inc. and its affiliates.
+# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/Compression.cpp b/dwio/nimble/encodings/Compression.cpp
index 53be6ec..84d6a8f 100644
--- a/dwio/nimble/encodings/Compression.cpp
+++ b/dwio/nimble/encodings/Compression.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/Compression.h b/dwio/nimble/encodings/Compression.h
index 2abd8fb..c402abe 100644
--- a/dwio/nimble/encodings/Compression.h
+++ b/dwio/nimble/encodings/Compression.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/ConstantEncoding.h b/dwio/nimble/encodings/ConstantEncoding.h
index 4f17122..8004d5f 100644
--- a/dwio/nimble/encodings/ConstantEncoding.h
+++ b/dwio/nimble/encodings/ConstantEncoding.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/DeltaEncoding.h b/dwio/nimble/encodings/DeltaEncoding.h
index 4a74871..06d3b50 100644
--- a/dwio/nimble/encodings/DeltaEncoding.h
+++ b/dwio/nimble/encodings/DeltaEncoding.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/DictionaryEncoding.h b/dwio/nimble/encodings/DictionaryEncoding.h
index 42568d7..495e036 100644
--- a/dwio/nimble/encodings/DictionaryEncoding.h
+++ b/dwio/nimble/encodings/DictionaryEncoding.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/Encoding.cpp b/dwio/nimble/encodings/Encoding.cpp
index 108e0d6..f17ac51 100644
--- a/dwio/nimble/encodings/Encoding.cpp
+++ b/dwio/nimble/encodings/Encoding.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/Encoding.h b/dwio/nimble/encodings/Encoding.h
index 3924f75..6b7e052 100644
--- a/dwio/nimble/encodings/Encoding.h
+++ b/dwio/nimble/encodings/Encoding.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/EncodingFactory.cpp b/dwio/nimble/encodings/EncodingFactory.cpp
index c0afe08..538efd3 100644
--- a/dwio/nimble/encodings/EncodingFactory.cpp
+++ b/dwio/nimble/encodings/EncodingFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/EncodingFactory.h b/dwio/nimble/encodings/EncodingFactory.h
index 6083c5a..7f274ec 100644
--- a/dwio/nimble/encodings/EncodingFactory.h
+++ b/dwio/nimble/encodings/EncodingFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/EncodingIdentifier.h b/dwio/nimble/encodings/EncodingIdentifier.h
index 37fd0e2..f04143c 100644
--- a/dwio/nimble/encodings/EncodingIdentifier.h
+++ b/dwio/nimble/encodings/EncodingIdentifier.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/EncodingLayout.cpp b/dwio/nimble/encodings/EncodingLayout.cpp
index 341bc71..9f94ace 100644
--- a/dwio/nimble/encodings/EncodingLayout.cpp
+++ b/dwio/nimble/encodings/EncodingLayout.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/EncodingLayout.h b/dwio/nimble/encodings/EncodingLayout.h
index e54dc84..4d13d76 100644
--- a/dwio/nimble/encodings/EncodingLayout.h
+++ b/dwio/nimble/encodings/EncodingLayout.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/EncodingLayoutCapture.cpp b/dwio/nimble/encodings/EncodingLayoutCapture.cpp
index f7bd2dd..db73c08 100644
--- a/dwio/nimble/encodings/EncodingLayoutCapture.cpp
+++ b/dwio/nimble/encodings/EncodingLayoutCapture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/EncodingLayoutCapture.h b/dwio/nimble/encodings/EncodingLayoutCapture.h
index f1a5b7c..c265c44 100644
--- a/dwio/nimble/encodings/EncodingLayoutCapture.h
+++ b/dwio/nimble/encodings/EncodingLayoutCapture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/EncodingSelection.h b/dwio/nimble/encodings/EncodingSelection.h
index 382136c..1cdaf2d 100644
--- a/dwio/nimble/encodings/EncodingSelection.h
+++ b/dwio/nimble/encodings/EncodingSelection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/EncodingSelectionPolicy.h b/dwio/nimble/encodings/EncodingSelectionPolicy.h
index 29af2d3..e4b5034 100644
--- a/dwio/nimble/encodings/EncodingSelectionPolicy.h
+++ b/dwio/nimble/encodings/EncodingSelectionPolicy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/EncodingUtils.h b/dwio/nimble/encodings/EncodingUtils.h
index 74f1996..87e83e0 100644
--- a/dwio/nimble/encodings/EncodingUtils.h
+++ b/dwio/nimble/encodings/EncodingUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/FixedBitWidthEncoding.h b/dwio/nimble/encodings/FixedBitWidthEncoding.h
index 8e4be40..000ac62 100644
--- a/dwio/nimble/encodings/FixedBitWidthEncoding.h
+++ b/dwio/nimble/encodings/FixedBitWidthEncoding.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/MainlyConstantEncoding.h b/dwio/nimble/encodings/MainlyConstantEncoding.h
index b17ea99..3370456 100644
--- a/dwio/nimble/encodings/MainlyConstantEncoding.h
+++ b/dwio/nimble/encodings/MainlyConstantEncoding.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/NullableEncoding.h b/dwio/nimble/encodings/NullableEncoding.h
index be5debb..44ac65a 100644
--- a/dwio/nimble/encodings/NullableEncoding.h
+++ b/dwio/nimble/encodings/NullableEncoding.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/RleEncoding.cpp b/dwio/nimble/encodings/RleEncoding.cpp
index 76e69d4..0da78fa 100644
--- a/dwio/nimble/encodings/RleEncoding.cpp
+++ b/dwio/nimble/encodings/RleEncoding.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/RleEncoding.h b/dwio/nimble/encodings/RleEncoding.h
index 3217d01..d8952f8 100644
--- a/dwio/nimble/encodings/RleEncoding.h
+++ b/dwio/nimble/encodings/RleEncoding.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/SentinelEncoding.h b/dwio/nimble/encodings/SentinelEncoding.h
index 02738c0..73a18ec 100644
--- a/dwio/nimble/encodings/SentinelEncoding.h
+++ b/dwio/nimble/encodings/SentinelEncoding.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/SparseBoolEncoding.cpp b/dwio/nimble/encodings/SparseBoolEncoding.cpp
index abeea9b..7ff8d62 100644
--- a/dwio/nimble/encodings/SparseBoolEncoding.cpp
+++ b/dwio/nimble/encodings/SparseBoolEncoding.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/SparseBoolEncoding.h b/dwio/nimble/encodings/SparseBoolEncoding.h
index eb1192f..a57c01c 100644
--- a/dwio/nimble/encodings/SparseBoolEncoding.h
+++ b/dwio/nimble/encodings/SparseBoolEncoding.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/Statistics.cpp b/dwio/nimble/encodings/Statistics.cpp
index f4d8e9b..bea716e 100644
--- a/dwio/nimble/encodings/Statistics.cpp
+++ b/dwio/nimble/encodings/Statistics.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/Statistics.h b/dwio/nimble/encodings/Statistics.h
index a4009a0..c5099a0 100644
--- a/dwio/nimble/encodings/Statistics.h
+++ b/dwio/nimble/encodings/Statistics.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/TrivialEncoding.cpp b/dwio/nimble/encodings/TrivialEncoding.cpp
index 4ebe548..5c2a140 100644
--- a/dwio/nimble/encodings/TrivialEncoding.cpp
+++ b/dwio/nimble/encodings/TrivialEncoding.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/TrivialEncoding.h b/dwio/nimble/encodings/TrivialEncoding.h
index 61e5e7d..ebaa6d9 100644
--- a/dwio/nimble/encodings/TrivialEncoding.h
+++ b/dwio/nimble/encodings/TrivialEncoding.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/VarintEncoding.h b/dwio/nimble/encodings/VarintEncoding.h
index 4bc339e..a0f7ce8 100644
--- a/dwio/nimble/encodings/VarintEncoding.h
+++ b/dwio/nimble/encodings/VarintEncoding.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/ZstdCompressor.cpp b/dwio/nimble/encodings/ZstdCompressor.cpp
index ec515b5..7a70166 100644
--- a/dwio/nimble/encodings/ZstdCompressor.cpp
+++ b/dwio/nimble/encodings/ZstdCompressor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/encodings/ZstdCompressor.h b/dwio/nimble/encodings/ZstdCompressor.h
index 8e615ba..fc79b32 100644
--- a/dwio/nimble/encodings/ZstdCompressor.h
+++ b/dwio/nimble/encodings/ZstdCompressor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/tablet/CMakeLists.txt b/dwio/nimble/tablet/CMakeLists.txt
index 3cbe53f..ab452d8 100644
--- a/dwio/nimble/tablet/CMakeLists.txt
+++ b/dwio/nimble/tablet/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) Meta Platforms, Inc. and its affiliates.
+# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/tablet/Compression.cpp b/dwio/nimble/tablet/Compression.cpp
index fbd6b07..b8de75c 100644
--- a/dwio/nimble/tablet/Compression.cpp
+++ b/dwio/nimble/tablet/Compression.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/tablet/Compression.h b/dwio/nimble/tablet/Compression.h
index 44d1c35..e40522c 100644
--- a/dwio/nimble/tablet/Compression.h
+++ b/dwio/nimble/tablet/Compression.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/tablet/Constants.h b/dwio/nimble/tablet/Constants.h
index d9dc390..46271f9 100644
--- a/dwio/nimble/tablet/Constants.h
+++ b/dwio/nimble/tablet/Constants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/tablet/Footer.fbs b/dwio/nimble/tablet/Footer.fbs
index fcccf70..7167736 100644
--- a/dwio/nimble/tablet/Footer.fbs
+++ b/dwio/nimble/tablet/Footer.fbs
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/tablet/TabletReader.cpp b/dwio/nimble/tablet/TabletReader.cpp
index ce1c56d..aa65878 100644
--- a/dwio/nimble/tablet/TabletReader.cpp
+++ b/dwio/nimble/tablet/TabletReader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/tablet/TabletReader.h b/dwio/nimble/tablet/TabletReader.h
index 0b327ec..93ab654 100644
--- a/dwio/nimble/tablet/TabletReader.h
+++ b/dwio/nimble/tablet/TabletReader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/tablet/TabletWriter.cpp b/dwio/nimble/tablet/TabletWriter.cpp
index bb92416..89ce6bb 100644
--- a/dwio/nimble/tablet/TabletWriter.cpp
+++ b/dwio/nimble/tablet/TabletWriter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/tablet/TabletWriter.h b/dwio/nimble/tablet/TabletWriter.h
index 8d4cee2..3cf722a 100644
--- a/dwio/nimble/tablet/TabletWriter.h
+++ b/dwio/nimble/tablet/TabletWriter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/tablet/footer_flatc.sh b/dwio/nimble/tablet/footer_flatc.sh
index d5013f0..07c6496 100755
--- a/dwio/nimble/tablet/footer_flatc.sh
+++ b/dwio/nimble/tablet/footer_flatc.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) Meta Platforms, Inc. and its affiliates.
+# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/BufferGrowthPolicy.cpp b/dwio/nimble/velox/BufferGrowthPolicy.cpp
index b6102fd..bd7f386 100644
--- a/dwio/nimble/velox/BufferGrowthPolicy.cpp
+++ b/dwio/nimble/velox/BufferGrowthPolicy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/BufferGrowthPolicy.h b/dwio/nimble/velox/BufferGrowthPolicy.h
index abd2afb..10d943c 100644
--- a/dwio/nimble/velox/BufferGrowthPolicy.h
+++ b/dwio/nimble/velox/BufferGrowthPolicy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/CMakeLists.txt b/dwio/nimble/velox/CMakeLists.txt
index 4a9de32..a4d9f44 100644
--- a/dwio/nimble/velox/CMakeLists.txt
+++ b/dwio/nimble/velox/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) Meta Platforms, Inc. and its affiliates.
+# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/ChunkedStream.cpp b/dwio/nimble/velox/ChunkedStream.cpp
index 19be3ce..392b98e 100644
--- a/dwio/nimble/velox/ChunkedStream.cpp
+++ b/dwio/nimble/velox/ChunkedStream.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/ChunkedStream.h b/dwio/nimble/velox/ChunkedStream.h
index 89e2a51..0117b04 100644
--- a/dwio/nimble/velox/ChunkedStream.h
+++ b/dwio/nimble/velox/ChunkedStream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/ChunkedStreamDecoder.cpp b/dwio/nimble/velox/ChunkedStreamDecoder.cpp
index 5849070..23332b4 100644
--- a/dwio/nimble/velox/ChunkedStreamDecoder.cpp
+++ b/dwio/nimble/velox/ChunkedStreamDecoder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/ChunkedStreamDecoder.h b/dwio/nimble/velox/ChunkedStreamDecoder.h
index 38f543f..728d047 100644
--- a/dwio/nimble/velox/ChunkedStreamDecoder.h
+++ b/dwio/nimble/velox/ChunkedStreamDecoder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/ChunkedStreamWriter.cpp b/dwio/nimble/velox/ChunkedStreamWriter.cpp
index ded58f6..a4e4208 100644
--- a/dwio/nimble/velox/ChunkedStreamWriter.cpp
+++ b/dwio/nimble/velox/ChunkedStreamWriter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/ChunkedStreamWriter.h b/dwio/nimble/velox/ChunkedStreamWriter.h
index d24ee38..25cb4d6 100644
--- a/dwio/nimble/velox/ChunkedStreamWriter.h
+++ b/dwio/nimble/velox/ChunkedStreamWriter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/Decoder.h b/dwio/nimble/velox/Decoder.h
index c7175d4..7163f07 100644
--- a/dwio/nimble/velox/Decoder.h
+++ b/dwio/nimble/velox/Decoder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/DeduplicationUtils.cpp b/dwio/nimble/velox/DeduplicationUtils.cpp
index 102d0f4..bc737fd 100644
--- a/dwio/nimble/velox/DeduplicationUtils.cpp
+++ b/dwio/nimble/velox/DeduplicationUtils.cpp
@@ -1,4 +1,18 @@
-// (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #include "dwio/nimble/velox/DeduplicationUtils.h"
 
diff --git a/dwio/nimble/velox/DeduplicationUtils.h b/dwio/nimble/velox/DeduplicationUtils.h
index be65b37..01c5c2e 100644
--- a/dwio/nimble/velox/DeduplicationUtils.h
+++ b/dwio/nimble/velox/DeduplicationUtils.h
@@ -1,4 +1,18 @@
-// (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #pragma once
 #include "velox/common/base/CompareFlags.h"
diff --git a/dwio/nimble/velox/EncodingLayoutTree.cpp b/dwio/nimble/velox/EncodingLayoutTree.cpp
index 9cca4cf..3cdf0dd 100644
--- a/dwio/nimble/velox/EncodingLayoutTree.cpp
+++ b/dwio/nimble/velox/EncodingLayoutTree.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/EncodingLayoutTree.h b/dwio/nimble/velox/EncodingLayoutTree.h
index f52d01a..cae9466 100644
--- a/dwio/nimble/velox/EncodingLayoutTree.h
+++ b/dwio/nimble/velox/EncodingLayoutTree.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/FieldReader.cpp b/dwio/nimble/velox/FieldReader.cpp
index 7f27933..c468aae 100644
--- a/dwio/nimble/velox/FieldReader.cpp
+++ b/dwio/nimble/velox/FieldReader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/FieldReader.h b/dwio/nimble/velox/FieldReader.h
index 4870bb9..40face0 100644
--- a/dwio/nimble/velox/FieldReader.h
+++ b/dwio/nimble/velox/FieldReader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/FieldWriter.cpp b/dwio/nimble/velox/FieldWriter.cpp
index 754a7f6..88832c8 100644
--- a/dwio/nimble/velox/FieldWriter.cpp
+++ b/dwio/nimble/velox/FieldWriter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/FieldWriter.h b/dwio/nimble/velox/FieldWriter.h
index 98212c4..8d8d413 100644
--- a/dwio/nimble/velox/FieldWriter.h
+++ b/dwio/nimble/velox/FieldWriter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/FlushPolicy.cpp b/dwio/nimble/velox/FlushPolicy.cpp
index 2890b60..84e3d62 100644
--- a/dwio/nimble/velox/FlushPolicy.cpp
+++ b/dwio/nimble/velox/FlushPolicy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/FlushPolicy.h b/dwio/nimble/velox/FlushPolicy.h
index 5eec1e3..1ad8667 100644
--- a/dwio/nimble/velox/FlushPolicy.h
+++ b/dwio/nimble/velox/FlushPolicy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/LayoutPlanner.cpp b/dwio/nimble/velox/LayoutPlanner.cpp
index 5bd4ca4..21bdf98 100644
--- a/dwio/nimble/velox/LayoutPlanner.cpp
+++ b/dwio/nimble/velox/LayoutPlanner.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/LayoutPlanner.h b/dwio/nimble/velox/LayoutPlanner.h
index a224bb2..93ee30b 100644
--- a/dwio/nimble/velox/LayoutPlanner.h
+++ b/dwio/nimble/velox/LayoutPlanner.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/Metadata.fbs b/dwio/nimble/velox/Metadata.fbs
index ff8b061..01fd3ab 100644
--- a/dwio/nimble/velox/Metadata.fbs
+++ b/dwio/nimble/velox/Metadata.fbs
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/OrderedRanges.h b/dwio/nimble/velox/OrderedRanges.h
index d954ef1..dbeb9cc 100644
--- a/dwio/nimble/velox/OrderedRanges.h
+++ b/dwio/nimble/velox/OrderedRanges.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/Schema.fbs b/dwio/nimble/velox/Schema.fbs
index 7ac655e..957d8f6 100644
--- a/dwio/nimble/velox/Schema.fbs
+++ b/dwio/nimble/velox/Schema.fbs
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/SchemaBuilder.cpp b/dwio/nimble/velox/SchemaBuilder.cpp
index 3ef8bab..04614a2 100644
--- a/dwio/nimble/velox/SchemaBuilder.cpp
+++ b/dwio/nimble/velox/SchemaBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/SchemaBuilder.h b/dwio/nimble/velox/SchemaBuilder.h
index 04dda5c..bfd34d4 100644
--- a/dwio/nimble/velox/SchemaBuilder.h
+++ b/dwio/nimble/velox/SchemaBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/SchemaReader.cpp b/dwio/nimble/velox/SchemaReader.cpp
index a2e2e24..c05aadf 100644
--- a/dwio/nimble/velox/SchemaReader.cpp
+++ b/dwio/nimble/velox/SchemaReader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/SchemaReader.h b/dwio/nimble/velox/SchemaReader.h
index 14bdf8f..eaa7eb4 100644
--- a/dwio/nimble/velox/SchemaReader.h
+++ b/dwio/nimble/velox/SchemaReader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/SchemaSerialization.cpp b/dwio/nimble/velox/SchemaSerialization.cpp
index c784c8b..de820b6 100644
--- a/dwio/nimble/velox/SchemaSerialization.cpp
+++ b/dwio/nimble/velox/SchemaSerialization.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/SchemaSerialization.h b/dwio/nimble/velox/SchemaSerialization.h
index 876dba4..ce4bc50 100644
--- a/dwio/nimble/velox/SchemaSerialization.h
+++ b/dwio/nimble/velox/SchemaSerialization.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/SchemaTypes.cpp b/dwio/nimble/velox/SchemaTypes.cpp
index 1bffdb6..41cb20c 100644
--- a/dwio/nimble/velox/SchemaTypes.cpp
+++ b/dwio/nimble/velox/SchemaTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/SchemaTypes.h b/dwio/nimble/velox/SchemaTypes.h
index 0220ce6..596c86f 100644
--- a/dwio/nimble/velox/SchemaTypes.h
+++ b/dwio/nimble/velox/SchemaTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/SchemaUtils.cpp b/dwio/nimble/velox/SchemaUtils.cpp
index 1fd78aa..7eef739 100644
--- a/dwio/nimble/velox/SchemaUtils.cpp
+++ b/dwio/nimble/velox/SchemaUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/SchemaUtils.h b/dwio/nimble/velox/SchemaUtils.h
index 523305e..555d62e 100644
--- a/dwio/nimble/velox/SchemaUtils.h
+++ b/dwio/nimble/velox/SchemaUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/Stats.fbs b/dwio/nimble/velox/Stats.fbs
index 901e8f9..a1220ed 100644
--- a/dwio/nimble/velox/Stats.fbs
+++ b/dwio/nimble/velox/Stats.fbs
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/StreamData.cpp b/dwio/nimble/velox/StreamData.cpp
index ac0ac53..451312c 100644
--- a/dwio/nimble/velox/StreamData.cpp
+++ b/dwio/nimble/velox/StreamData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/StreamData.h b/dwio/nimble/velox/StreamData.h
index ab809f0..fb15469 100644
--- a/dwio/nimble/velox/StreamData.h
+++ b/dwio/nimble/velox/StreamData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/StreamLabels.cpp b/dwio/nimble/velox/StreamLabels.cpp
index 70eec47..e54027e 100644
--- a/dwio/nimble/velox/StreamLabels.cpp
+++ b/dwio/nimble/velox/StreamLabels.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/StreamLabels.h b/dwio/nimble/velox/StreamLabels.h
index 00c1ef1..17f8a94 100644
--- a/dwio/nimble/velox/StreamLabels.h
+++ b/dwio/nimble/velox/StreamLabels.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/VeloxReader.cpp b/dwio/nimble/velox/VeloxReader.cpp
index cabe0e3..081b585 100644
--- a/dwio/nimble/velox/VeloxReader.cpp
+++ b/dwio/nimble/velox/VeloxReader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/VeloxReader.h b/dwio/nimble/velox/VeloxReader.h
index c87d3d5..d0675e2 100644
--- a/dwio/nimble/velox/VeloxReader.h
+++ b/dwio/nimble/velox/VeloxReader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/VeloxWriter.cpp b/dwio/nimble/velox/VeloxWriter.cpp
index 89d5a6a..0222178 100644
--- a/dwio/nimble/velox/VeloxWriter.cpp
+++ b/dwio/nimble/velox/VeloxWriter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/VeloxWriter.h b/dwio/nimble/velox/VeloxWriter.h
index adb1e5b..5ff5137 100644
--- a/dwio/nimble/velox/VeloxWriter.h
+++ b/dwio/nimble/velox/VeloxWriter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/VeloxWriterDefaultMetadataOSS.cpp b/dwio/nimble/velox/VeloxWriterDefaultMetadataOSS.cpp
index f5a47c4..56ddf07 100644
--- a/dwio/nimble/velox/VeloxWriterDefaultMetadataOSS.cpp
+++ b/dwio/nimble/velox/VeloxWriterDefaultMetadataOSS.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/VeloxWriterOptions.h b/dwio/nimble/velox/VeloxWriterOptions.h
index 62c6dce..2a1f202 100644
--- a/dwio/nimble/velox/VeloxWriterOptions.h
+++ b/dwio/nimble/velox/VeloxWriterOptions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dwio/nimble/velox/tests/DeduplicationUtilsTests.cpp b/dwio/nimble/velox/tests/DeduplicationUtilsTests.cpp
index 13abb85..9865788 100644
--- a/dwio/nimble/velox/tests/DeduplicationUtilsTests.cpp
+++ b/dwio/nimble/velox/tests/DeduplicationUtilsTests.cpp
@@ -1,4 +1,18 @@
-// (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #include <gtest/gtest.h>
 #include "dwio/nimble/velox/DeduplicationUtils.h"
diff --git a/license.header b/license.header
index 9e2a164..78af24e 100644
--- a/license.header
+++ b/license.header
@@ -1,4 +1,4 @@
- Copyright (c) Meta Platforms, Inc. and its affiliates.
+ Copyright (c) Meta Platforms, Inc. and affiliates.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/velox b/velox
index 9e48da6..3c73193 160000
--- a/velox
+++ b/velox
@@ -1 +1 @@
-Subproject commit 9e48da6787b531373b775f6a1c66e891834cd547
+Subproject commit 3c731934bbfeafb70ec4f58f13d861c2b3ce839b