diff --git a/binaries/convert_caffe_image_db.cc b/binaries/convert_caffe_image_db.cc
index 942afedd76b3..1de036c5f615 100644
--- a/binaries/convert_caffe_image_db.cc
+++ b/binaries/convert_caffe_image_db.cc
@@ -16,7 +16,7 @@
 
 #include "caffe2/core/db.h"
 #include "caffe2/core/init.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/proto/caffe2_legacy.pb.h"
 #include "caffe2/core/logging.h"
 
diff --git a/binaries/convert_db.cc b/binaries/convert_db.cc
index cb0710a7b337..aef697e9fa94 100644
--- a/binaries/convert_db.cc
+++ b/binaries/convert_db.cc
@@ -16,7 +16,7 @@
 
 #include "caffe2/core/db.h"
 #include "caffe2/core/init.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/core/logging.h"
 
 CAFFE2_DEFINE_string(input_db, "", "The input db.");
diff --git a/binaries/convert_encoded_to_raw_leveldb.cc b/binaries/convert_encoded_to_raw_leveldb.cc
index 4e272fc2ec11..c8ad32015b43 100644
--- a/binaries/convert_encoded_to_raw_leveldb.cc
+++ b/binaries/convert_encoded_to_raw_leveldb.cc
@@ -30,7 +30,7 @@
 #include <string>
 
 #include "caffe2/core/init.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/core/logging.h"
 #include "leveldb/db.h"
 #include "leveldb/write_batch.h"
diff --git a/binaries/make_cifar_db.cc b/binaries/make_cifar_db.cc
index 9f9c0bc7440f..840f9086951d 100644
--- a/binaries/make_cifar_db.cc
+++ b/binaries/make_cifar_db.cc
@@ -30,7 +30,7 @@
 #include "caffe2/core/common.h"
 #include "caffe2/core/db.h"
 #include "caffe2/core/init.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/core/logging.h"
 
 CAFFE2_DEFINE_string(input_folder, "", "The input folder name.");
diff --git a/binaries/make_image_db.cc b/binaries/make_image_db.cc
index 2bdbb53d0734..1960003086ff 100644
--- a/binaries/make_image_db.cc
+++ b/binaries/make_image_db.cc
@@ -39,7 +39,7 @@
 #include "caffe2/core/common.h"
 #include "caffe2/core/db.h"
 #include "caffe2/core/init.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/core/logging.h"
 
 CAFFE2_DEFINE_bool(shuffle, false,
diff --git a/binaries/make_mnist_db.cc b/binaries/make_mnist_db.cc
index 8737d0e8531b..024f3944e1fa 100644
--- a/binaries/make_mnist_db.cc
+++ b/binaries/make_mnist_db.cc
@@ -24,7 +24,7 @@
 #include "caffe2/core/common.h"
 #include "caffe2/core/db.h"
 #include "caffe2/core/init.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/core/logging.h"
 
 CAFFE2_DEFINE_string(image_file, "", "The input image file name.");
diff --git a/binaries/print_core_object_sizes_gpu.cc b/binaries/print_core_object_sizes_gpu.cc
index f99ef09ca4e9..c93d073a0368 100644
--- a/binaries/print_core_object_sizes_gpu.cc
+++ b/binaries/print_core_object_sizes_gpu.cc
@@ -20,7 +20,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/core/context.h"
 #include "caffe2/core/context_gpu.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 #define PRINT_SIZE(cls) \
   std::cout << "Size of " #cls ": " << sizeof(cls) << " bytes." \
diff --git a/binaries/run_plan.cc b/binaries/run_plan.cc
index 5ad2c3a9b37f..54f8e8a1eb99 100644
--- a/binaries/run_plan.cc
+++ b/binaries/run_plan.cc
@@ -16,7 +16,7 @@
 
 #include "caffe2/core/init.h"
 #include "caffe2/core/operator.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 #include "caffe2/core/logging.h"
 
diff --git a/binaries/run_plan_mpi.cc b/binaries/run_plan_mpi.cc
index ee720fac2965..a16acc910848 100644
--- a/binaries/run_plan_mpi.cc
+++ b/binaries/run_plan_mpi.cc
@@ -18,7 +18,7 @@
 
 #include "caffe2/core/init.h"
 #include "caffe2/core/operator.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 #include "caffe2/core/logging.h"
 
diff --git a/binaries/speed_benchmark.cc b/binaries/speed_benchmark.cc
index cf6d400fe1e0..a392d2e672b5 100644
--- a/binaries/speed_benchmark.cc
+++ b/binaries/speed_benchmark.cc
@@ -22,7 +22,7 @@
 #ifdef CAFFE2_OPTIMIZER
 #include "caffe2/opt/optimizer.h"
 #endif
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 #include "caffe2/utils/string_utils.h"
 
diff --git a/binaries/split_db.cc b/binaries/split_db.cc
index 077afda997bc..0aa2bfeee61f 100644
--- a/binaries/split_db.cc
+++ b/binaries/split_db.cc
@@ -19,7 +19,7 @@
 
 #include "caffe2/core/db.h"
 #include "caffe2/core/init.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/core/logging.h"
 
 CAFFE2_DEFINE_string(input_db, "", "The input db.");
diff --git a/binaries/tsv_2_proto.cc b/binaries/tsv_2_proto.cc
index e9dba77bd3ec..4d4a03226170 100644
--- a/binaries/tsv_2_proto.cc
+++ b/binaries/tsv_2_proto.cc
@@ -21,7 +21,7 @@
 #include "caffe2/core/db.h"
 #include "caffe2/core/init.h"
 #include "caffe2/core/logging.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 CAFFE2_DEFINE_string(f_in, "", "The input data file name.");
diff --git a/caffe2/contrib/tensorrt/tensorrt_tranformer.h b/caffe2/contrib/tensorrt/tensorrt_tranformer.h
index 10750c068fc1..e6f28fda2656 100644
--- a/caffe2/contrib/tensorrt/tensorrt_tranformer.h
+++ b/caffe2/contrib/tensorrt/tensorrt_tranformer.h
@@ -9,7 +9,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/core/workspace.h"
 #include "caffe2/onnx/onnx_exporter.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "onnx/onnx_pb.h"
 
 namespace caffe2 {
diff --git a/caffe2/core/blob.h b/caffe2/core/blob.h
index fb1c1b30b754..d54fa5aa9819 100644
--- a/caffe2/core/blob.h
+++ b/caffe2/core/blob.h
@@ -12,7 +12,7 @@
 #include "caffe2/core/logging.h"
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/typeid.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/core/blob_gpu_test.cc b/caffe2/core/blob_gpu_test.cc
index 536ad02f4ea0..24ee596b5238 100644
--- a/caffe2/core/blob_gpu_test.cc
+++ b/caffe2/core/blob_gpu_test.cc
@@ -3,7 +3,7 @@
 #include "caffe2/core/blob.h"
 #include "caffe2/core/common_gpu.h"
 #include "caffe2/core/context_gpu.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include <gtest/gtest.h>
 
 namespace caffe2 {
diff --git a/caffe2/core/blob_serializer_base.h b/caffe2/core/blob_serializer_base.h
index f6590120d3df..b51f3da21a30 100644
--- a/caffe2/core/blob_serializer_base.h
+++ b/caffe2/core/blob_serializer_base.h
@@ -5,7 +5,7 @@
 
 #include "caffe2/core/common.h"
 #include "caffe2/core/registry.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/core/blob_test.cc b/caffe2/core/blob_test.cc
index d489369705fa..024ec836a0df 100644
--- a/caffe2/core/blob_test.cc
+++ b/caffe2/core/blob_test.cc
@@ -15,7 +15,7 @@
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/types.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 CAFFE2_DEFINE_int64(caffe2_test_big_tensor_size, 100000000, "");
diff --git a/caffe2/core/common_cudnn.h b/caffe2/core/common_cudnn.h
index fe54318133ac..a8f2808e30ee 100644
--- a/caffe2/core/common_cudnn.h
+++ b/caffe2/core/common_cudnn.h
@@ -10,7 +10,7 @@
 #include "caffe2/core/context.h"
 #include "caffe2/core/logging.h"
 #include "caffe2/core/types.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 #ifndef CAFFE2_USE_CUDNN
 #error("This Caffe2 install is not built with cudnn, so you should not include this file.");
diff --git a/caffe2/core/context.h b/caffe2/core/context.h
index 277294612933..657ad3db98dc 100644
--- a/caffe2/core/context.h
+++ b/caffe2/core/context.h
@@ -11,7 +11,7 @@
 #include "caffe2/core/event.h"
 #include "caffe2/core/logging.h"
 #include "caffe2/core/typeid.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 #include "ATen/core/ATenCoreTest.h"
 #include "ATen/core/ArrayRef.h"
diff --git a/caffe2/core/context_base.h b/caffe2/core/context_base.h
index 95d0dd60e143..4158a976368e 100644
--- a/caffe2/core/context_base.h
+++ b/caffe2/core/context_base.h
@@ -9,7 +9,7 @@
 #include "caffe2/core/event.h"
 #include "caffe2/core/logging.h"
 #include "caffe2/core/typeid.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/core/context_gpu.h b/caffe2/core/context_gpu.h
index 828861a87fa3..eb9238073012 100644
--- a/caffe2/core/context_gpu.h
+++ b/caffe2/core/context_gpu.h
@@ -12,7 +12,7 @@
 #include "caffe2/core/numa.h"
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/types.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 // Since we are using the macro CAFFE2_USE_CUDNN, we will need to include this
 // file after common.h is included.
diff --git a/caffe2/core/context_test.cc b/caffe2/core/context_test.cc
index 8924a9dc931b..a01f967b536a 100644
--- a/caffe2/core/context_test.cc
+++ b/caffe2/core/context_test.cc
@@ -2,7 +2,7 @@
 
 #include <gtest/gtest.h>
 #include "caffe2/core/context.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/core/db.h b/caffe2/core/db.h
index 47865fe076f7..33e674d4a925 100644
--- a/caffe2/core/db.h
+++ b/caffe2/core/db.h
@@ -5,7 +5,7 @@
 
 #include "caffe2/core/blob_serialization.h"
 #include "caffe2/core/registry.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 namespace db {
diff --git a/caffe2/core/dispatch/OpSchema.h b/caffe2/core/dispatch/OpSchema.h
index bd414bb7a76e..1f49c76d5bbc 100644
--- a/caffe2/core/dispatch/OpSchema.h
+++ b/caffe2/core/dispatch/OpSchema.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/dispatch/DispatchKey.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/Array.h"
 #include "caffe2/utils/Metaprogramming.h"
 
diff --git a/caffe2/core/event.h b/caffe2/core/event.h
index d6bbc126760b..a753871cfc4a 100644
--- a/caffe2/core/event.h
+++ b/caffe2/core/event.h
@@ -3,7 +3,7 @@
 
 #include "caffe2/core/common.h"
 #include "caffe2/core/logging.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/core/graph.cc b/caffe2/core/graph.cc
index ba5a3a136404..c73dc2d86b56 100644
--- a/caffe2/core/graph.cc
+++ b/caffe2/core/graph.cc
@@ -3,7 +3,7 @@
 #include "caffe2/core/common.h"
 #include "caffe2/core/logging.h"
 #include "caffe2/core/net.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/core/graph.h b/caffe2/core/graph.h
index ac037d5f0867..6162b089ace1 100644
--- a/caffe2/core/graph.h
+++ b/caffe2/core/graph.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/common.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 #include "caffe2/utils/string_utils.h"
 
diff --git a/caffe2/core/hip/common_miopen.h b/caffe2/core/hip/common_miopen.h
index aa9333f8bdfa..c5baf0aeb09a 100644
--- a/caffe2/core/hip/common_miopen.h
+++ b/caffe2/core/hip/common_miopen.h
@@ -23,7 +23,7 @@
 #include "caffe2/core/context.h"
 #include "caffe2/core/logging.h"
 #include "caffe2/core/types.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 #define MIOPEN_VERSION 1399
 
diff --git a/caffe2/core/hip/context_hip.h b/caffe2/core/hip/context_hip.h
index 0e506c2e2fef..e62c26b86b04 100644
--- a/caffe2/core/hip/context_hip.h
+++ b/caffe2/core/hip/context_hip.h
@@ -12,7 +12,7 @@
 #include "caffe2/core/numa.h"
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/types.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/core/hip/net_async_dag_hip.cc b/caffe2/core/hip/net_async_dag_hip.cc
index 7d10b29e965d..be50c4078c84 100644
--- a/caffe2/core/hip/net_async_dag_hip.cc
+++ b/caffe2/core/hip/net_async_dag_hip.cc
@@ -24,7 +24,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/core/static_tracepoint.h"
 #include "caffe2/core/timer.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 #include "caffe2/core/hip/context_hip.h"
diff --git a/caffe2/core/logging.h b/caffe2/core/logging.h
index dd2d3e84d91f..2392c4cbcfc4 100644
--- a/caffe2/core/logging.h
+++ b/caffe2/core/logging.h
@@ -9,7 +9,7 @@
 
 #include <ATen/core/Error.h>
 #include "caffe2/core/flags.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 // CAFFE2_LOG_THRESHOLD is a compile time flag that would allow us to turn off
 // logging at compile time so no logging message below that level is produced
diff --git a/caffe2/core/memonger.h b/caffe2/core/memonger.h
index e34f35bab25d..83270fa26cb8 100644
--- a/caffe2/core/memonger.h
+++ b/caffe2/core/memonger.h
@@ -5,7 +5,7 @@
 
 #include "caffe2/core/common.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 namespace memonger {
diff --git a/caffe2/core/net.cc b/caffe2/core/net.cc
index dfca11318669..77934f6be12d 100644
--- a/caffe2/core/net.cc
+++ b/caffe2/core/net.cc
@@ -8,7 +8,7 @@
 #include "caffe2/core/init.h"
 #include "caffe2/core/operator.h"
 #include "caffe2/core/timer.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 #include "caffe2/utils/string_utils.h"
 
diff --git a/caffe2/core/net.h b/caffe2/core/net.h
index 14f3fb833349..962363ad0270 100644
--- a/caffe2/core/net.h
+++ b/caffe2/core/net.h
@@ -17,7 +17,7 @@
 #include "caffe2/core/registry.h"
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/simple_queue.h"
 #include "caffe2/utils/thread_pool.h"
 
diff --git a/caffe2/core/net_async_base.h b/caffe2/core/net_async_base.h
index df55e2ee07a2..b70a6a025401 100644
--- a/caffe2/core/net_async_base.h
+++ b/caffe2/core/net_async_base.h
@@ -9,7 +9,7 @@
 #include "caffe2/core/stats.h"
 #include "caffe2/core/timer.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 #include "caffe2/utils/thread_pool.h"
 
diff --git a/caffe2/core/net_async_dag_gpu.cc b/caffe2/core/net_async_dag_gpu.cc
index 867def700863..a6e6ad79a362 100644
--- a/caffe2/core/net_async_dag_gpu.cc
+++ b/caffe2/core/net_async_dag_gpu.cc
@@ -8,7 +8,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/core/static_tracepoint.h"
 #include "caffe2/core/timer.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 #include "caffe2/core/context_gpu.h"
diff --git a/caffe2/core/net_async_dag_gpu.h b/caffe2/core/net_async_dag_gpu.h
index 8dcd812a1fc8..62ae301e4cbf 100644
--- a/caffe2/core/net_async_dag_gpu.h
+++ b/caffe2/core/net_async_dag_gpu.h
@@ -4,7 +4,7 @@
 #include "caffe2/core/common.h"
 #include "caffe2/core/net_dag.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/core/net_dag.cc b/caffe2/core/net_dag.cc
index e256362d409e..6234edd02644 100644
--- a/caffe2/core/net_dag.cc
+++ b/caffe2/core/net_dag.cc
@@ -9,7 +9,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/core/static_tracepoint.h"
 #include "caffe2/core/timer.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 #include "caffe2/utils/thread_name.h"
 
diff --git a/caffe2/core/net_dag.h b/caffe2/core/net_dag.h
index f5078eec872f..078fa63a4238 100644
--- a/caffe2/core/net_dag.h
+++ b/caffe2/core/net_dag.h
@@ -21,7 +21,7 @@
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/timer.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/simple_queue.h"
 
 namespace caffe2 {
diff --git a/caffe2/core/net_dag_utils.cc b/caffe2/core/net_dag_utils.cc
index 6c24a3fdba06..94a70478c4af 100644
--- a/caffe2/core/net_dag_utils.cc
+++ b/caffe2/core/net_dag_utils.cc
@@ -8,7 +8,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/core/static_tracepoint.h"
 #include "caffe2/core/timer.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 namespace caffe2 {
diff --git a/caffe2/core/net_dag_utils.h b/caffe2/core/net_dag_utils.h
index 419c26c03693..6debfbf7bd80 100644
--- a/caffe2/core/net_dag_utils.h
+++ b/caffe2/core/net_dag_utils.h
@@ -19,7 +19,7 @@
 #include "caffe2/core/registry.h"
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/simple_queue.h"
 
 namespace caffe2 {
diff --git a/caffe2/core/net_simple.cc b/caffe2/core/net_simple.cc
index d91a44b090c1..bb80da7e273a 100644
--- a/caffe2/core/net_simple.cc
+++ b/caffe2/core/net_simple.cc
@@ -9,7 +9,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/core/static_tracepoint.h"
 #include "caffe2/core/timer.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 CAFFE2_DEFINE_bool(
diff --git a/caffe2/core/net_simple.h b/caffe2/core/net_simple.h
index 550326d700f0..a8ac751dbb5e 100644
--- a/caffe2/core/net_simple.h
+++ b/caffe2/core/net_simple.h
@@ -9,7 +9,7 @@
 #include "caffe2/core/registry.h"
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/core/net_simple_async.cc b/caffe2/core/net_simple_async.cc
index 81e09033d668..c9bb4d5cabb6 100644
--- a/caffe2/core/net_simple_async.cc
+++ b/caffe2/core/net_simple_async.cc
@@ -9,7 +9,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/core/static_tracepoint.h"
 #include "caffe2/core/timer.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 namespace caffe2 {
diff --git a/caffe2/core/net_simple_async.h b/caffe2/core/net_simple_async.h
index b29ae217cdae..38c3255bf4df 100644
--- a/caffe2/core/net_simple_async.h
+++ b/caffe2/core/net_simple_async.h
@@ -9,7 +9,7 @@
 #include "caffe2/core/registry.h"
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/core/operator.cc b/caffe2/core/operator.cc
index 80a585698d35..06e05ee3dca1 100644
--- a/caffe2/core/operator.cc
+++ b/caffe2/core/operator.cc
@@ -10,7 +10,7 @@
 #include "caffe2/core/types.h"
 #include "caffe2/core/workspace.h"
 
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 #include "caffe2/utils/string_utils.h"
 
diff --git a/caffe2/core/operator.h b/caffe2/core/operator.h
index 28f3df0386f2..9489abd802ab 100644
--- a/caffe2/core/operator.h
+++ b/caffe2/core/operator.h
@@ -19,7 +19,7 @@
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/types.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 namespace caffe2 {
diff --git a/caffe2/core/operator_gradient.h b/caffe2/core/operator_gradient.h
index f08778fd22ea..3eea164c21b8 100644
--- a/caffe2/core/operator_gradient.h
+++ b/caffe2/core/operator_gradient.h
@@ -3,7 +3,7 @@
 
 #include "caffe2/core/operator_schema.h"
 #include "caffe2/core/registry.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 namespace caffe2 {
diff --git a/caffe2/core/operator_schema.h b/caffe2/core/operator_schema.h
index be464325d423..9708eda8917a 100644
--- a/caffe2/core/operator_schema.h
+++ b/caffe2/core/operator_schema.h
@@ -12,7 +12,7 @@
 #include "caffe2/core/common.h"
 #include "caffe2/core/logging.h"
 #include "caffe2/core/registry.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/filler.h"
 
 namespace caffe2 {
diff --git a/caffe2/core/plan_executor.cc b/caffe2/core/plan_executor.cc
index 7e8490d700a6..32b9137b39cd 100644
--- a/caffe2/core/plan_executor.cc
+++ b/caffe2/core/plan_executor.cc
@@ -9,7 +9,7 @@
 
 #include "caffe2/core/timer.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 CAFFE2_DEFINE_bool(
     caffe2_handle_executor_threads_exceptions,
diff --git a/caffe2/core/tensor_int8.h b/caffe2/core/tensor_int8.h
index ec7d2aaa618a..b95b7b8d10e5 100644
--- a/caffe2/core/tensor_int8.h
+++ b/caffe2/core/tensor_int8.h
@@ -3,7 +3,7 @@
 
 #include "caffe2/core/context.h"
 #include "caffe2/core/tensor.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 namespace int8 {
diff --git a/caffe2/core/transform.cc b/caffe2/core/transform.cc
index 5ea42fe83b9b..5b3f80fbe3fc 100644
--- a/caffe2/core/transform.cc
+++ b/caffe2/core/transform.cc
@@ -4,7 +4,7 @@
 #include "caffe2/core/logging.h"
 #include "caffe2/core/net.h"
 #include "caffe2/core/timer.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/core/transform.h b/caffe2/core/transform.h
index 9c10ca58c0d9..c6aaf1195138 100644
--- a/caffe2/core/transform.h
+++ b/caffe2/core/transform.h
@@ -3,7 +3,7 @@
 #include "caffe2/core/common.h"
 #include "caffe2/core/graph.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 namespace caffe2 {
diff --git a/caffe2/core/types.h b/caffe2/core/types.h
index 532f3a05c1c5..305eec602a51 100644
--- a/caffe2/core/types.h
+++ b/caffe2/core/types.h
@@ -8,7 +8,7 @@
 #include "caffe2/core/common.h"
 #include "caffe2/core/logging.h"
 #include "caffe2/core/typeid.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/core/workspace.cc b/caffe2/core/workspace.cc
index 4a2cdafe2112..6e14c8026ce1 100644
--- a/caffe2/core/workspace.cc
+++ b/caffe2/core/workspace.cc
@@ -9,7 +9,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/core/plan_executor.h"
 #include "caffe2/core/tensor.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 CAFFE2_DEFINE_bool(
     caffe2_print_blob_sizes_at_exit,
diff --git a/caffe2/core/workspace.h b/caffe2/core/workspace.h
index 16017fa1e417..11bf9c413c59 100644
--- a/caffe2/core/workspace.h
+++ b/caffe2/core/workspace.h
@@ -14,7 +14,7 @@
 #include "caffe2/core/blob.h"
 #include "caffe2/core/registry.h"
 #include "caffe2/core/net.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/signal_handler.h"
 #include "caffe2/utils/threadpool/ThreadPool.h"
 
diff --git a/caffe2/db/db_test.cc b/caffe2/db/db_test.cc
index 7bbe253dc7b3..da9bc529047d 100644
--- a/caffe2/db/db_test.cc
+++ b/caffe2/db/db_test.cc
@@ -6,7 +6,7 @@
 #include "caffe2/core/blob_serialization.h"
 #include "caffe2/core/db.h"
 #include "caffe2/core/logging.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include <gtest/gtest.h>
 
 namespace caffe2 {
diff --git a/caffe2/ideep/operators/operator_fallback_ideep.h b/caffe2/ideep/operators/operator_fallback_ideep.h
index 88d85ad183e8..ae4f903c23c2 100644
--- a/caffe2/ideep/operators/operator_fallback_ideep.h
+++ b/caffe2/ideep/operators/operator_fallback_ideep.h
@@ -4,7 +4,7 @@
 #include <caffe2/core/context.h>
 #include <caffe2/core/operator.h>
 #include <caffe2/ideep/ideep_utils.h>
-#include <caffe2/proto/caffe2.pb.h>
+#include <caffe2/proto/caffe2_pb.h>
 
 namespace caffe2 {
 
diff --git a/caffe2/ideep/utils/ideep_operator.h b/caffe2/ideep/utils/ideep_operator.h
index e4c904a4dba3..5cccbb509725 100644
--- a/caffe2/ideep/utils/ideep_operator.h
+++ b/caffe2/ideep/utils/ideep_operator.h
@@ -2,7 +2,7 @@
 
 #include <ideep.hpp>
 #include <caffe2/core/operator.h>
-#include <caffe2/proto/caffe2.pb.h>
+#include <caffe2/proto/caffe2_pb.h>
 
 namespace caffe2 {
 
diff --git a/caffe2/ideep/utils/ideep_register.cc b/caffe2/ideep/utils/ideep_register.cc
index c9c22387de4a..020e22fa6143 100644
--- a/caffe2/ideep/utils/ideep_register.cc
+++ b/caffe2/ideep/utils/ideep_register.cc
@@ -1,6 +1,6 @@
 #include <caffe2/core/event_cpu.h>
 #include <caffe2/core/operator.h>
-#include <caffe2/proto/caffe2.pb.h>
+#include <caffe2/proto/caffe2_pb.h>
 #include <ideep_pin_singletons.hpp>
 #include "ideep_context.h"
 
diff --git a/caffe2/mkl/mkl_operator.cc b/caffe2/mkl/mkl_operator.cc
index fb032051f34a..bf5b460d0920 100644
--- a/caffe2/mkl/mkl_operator.cc
+++ b/caffe2/mkl/mkl_operator.cc
@@ -1,5 +1,5 @@
 #include "caffe2/core/operator.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 CAFFE2_DEFINE_bool(
     caffe2_mkl_memonger_in_use,
diff --git a/caffe2/mkl/mkl_utils_test.cc b/caffe2/mkl/mkl_utils_test.cc
index 72dcda2c8f6b..a16224bbe270 100644
--- a/caffe2/mkl/mkl_utils_test.cc
+++ b/caffe2/mkl/mkl_utils_test.cc
@@ -2,7 +2,7 @@
 #include "caffe2/core/context.h"
 #include "caffe2/core/tensor.h"
 #include "caffe2/mkl/mkl_utils.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/math.h"
 
 #include <gtest/gtest.h>
diff --git a/caffe2/mkl/operators/operator_fallback_mkl.h b/caffe2/mkl/operators/operator_fallback_mkl.h
index 2c001dfbb83d..4a7cf3845fee 100644
--- a/caffe2/mkl/operators/operator_fallback_mkl.h
+++ b/caffe2/mkl/operators/operator_fallback_mkl.h
@@ -5,7 +5,7 @@
 #include "caffe2/core/context.h"
 #include "caffe2/core/operator.h"
 #include "caffe2/mkl/mkl_utils.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 #ifdef CAFFE2_HAS_MKL_DNN
 namespace caffe2 {
diff --git a/caffe2/mkl/utils/mkl_operator.h b/caffe2/mkl/utils/mkl_operator.h
index 5e7b87101599..1b91788c89c0 100644
--- a/caffe2/mkl/utils/mkl_operator.h
+++ b/caffe2/mkl/utils/mkl_operator.h
@@ -4,7 +4,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/mkl/utils/mkl_dnn_cppwrapper.h"
 #include "caffe2/mkl/utils/mkl_memory.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 CAFFE2_DECLARE_bool(caffe2_mkl_memonger_in_use);
 
diff --git a/caffe2/mobile/contrib/arm-compute/core/net_gl.cc b/caffe2/mobile/contrib/arm-compute/core/net_gl.cc
index 78452d9b5a5b..8647a51edc6b 100644
--- a/caffe2/mobile/contrib/arm-compute/core/net_gl.cc
+++ b/caffe2/mobile/contrib/arm-compute/core/net_gl.cc
@@ -10,7 +10,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/core/static_tracepoint.h"
 #include "caffe2/core/timer.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 namespace caffe2 {
diff --git a/caffe2/mobile/contrib/arm-compute/core/net_gl.h b/caffe2/mobile/contrib/arm-compute/core/net_gl.h
index 3b83d3120a56..029d888b1ebf 100644
--- a/caffe2/mobile/contrib/arm-compute/core/net_gl.h
+++ b/caffe2/mobile/contrib/arm-compute/core/net_gl.h
@@ -9,7 +9,7 @@
 #include "caffe2/core/registry.h"
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/mobile/contrib/opengl/test/opengl_test.h b/caffe2/mobile/contrib/opengl/test/opengl_test.h
index 5de80b4a3de4..5938d009b930 100644
--- a/caffe2/mobile/contrib/opengl/test/opengl_test.h
+++ b/caffe2/mobile/contrib/opengl/test/opengl_test.h
@@ -1,5 +1,5 @@
 
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 void testOpenGL();
diff --git a/caffe2/onnx/backend.h b/caffe2/onnx/backend.h
index 6ea4fcd944f9..eab0e2f7e1f1 100644
--- a/caffe2/onnx/backend.h
+++ b/caffe2/onnx/backend.h
@@ -3,7 +3,7 @@
 #include "caffe2/onnx/backend_rep.h"
 #include "caffe2/onnx/device.h"
 #include "caffe2/onnx/helper.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "onnx/onnx_pb.h"
 
 #include <functional>
diff --git a/caffe2/onnx/backend_rep.h b/caffe2/onnx/backend_rep.h
index 395394091fc3..037af096d660 100644
--- a/caffe2/onnx/backend_rep.h
+++ b/caffe2/onnx/backend_rep.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/predictor/predictor.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 #include <memory>
 #include <string>
diff --git a/caffe2/onnx/onnx_exporter.h b/caffe2/onnx/onnx_exporter.h
index 62537d31e847..158638de7f60 100644
--- a/caffe2/onnx/onnx_exporter.h
+++ b/caffe2/onnx/onnx_exporter.h
@@ -2,7 +2,7 @@
 
 #include "caffe2/core/common.h"
 #include "caffe2/onnx/helper.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "onnx/onnx_pb.h"
 
 #include <string>
diff --git a/caffe2/operators/create_scope_op.h b/caffe2/operators/create_scope_op.h
index cf2e64d085fb..37c58984ee0b 100644
--- a/caffe2/operators/create_scope_op.h
+++ b/caffe2/operators/create_scope_op.h
@@ -9,7 +9,7 @@
 #include "caffe2/core/context.h"
 #include "caffe2/core/logging.h"
 #include "caffe2/core/operator.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 CAFFE2_DECLARE_bool(caffe2_workspace_stack_debug);
 
diff --git a/caffe2/operators/do_op.h b/caffe2/operators/do_op.h
index 70c9f90c547e..50167fa5fa1b 100644
--- a/caffe2/operators/do_op.h
+++ b/caffe2/operators/do_op.h
@@ -10,7 +10,7 @@
 #include "caffe2/core/logging.h"
 #include "caffe2/core/operator.h"
 #include "caffe2/operators/create_scope_op.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/operators/flexible_top_k.cc b/caffe2/operators/flexible_top_k.cc
index b8b68f266c54..aff0a27842ab 100644
--- a/caffe2/operators/flexible_top_k.cc
+++ b/caffe2/operators/flexible_top_k.cc
@@ -1,6 +1,6 @@
 #include "caffe2/operators/flexible_top_k.h"
 
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/operators/operator_fallback_gpu.h b/caffe2/operators/operator_fallback_gpu.h
index 728dba3d776c..4af9bcde1ad9 100644
--- a/caffe2/operators/operator_fallback_gpu.h
+++ b/caffe2/operators/operator_fallback_gpu.h
@@ -5,7 +5,7 @@
 #include "caffe2/core/context.h"
 #include "caffe2/core/context_gpu.h"
 #include "caffe2/core/operator.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/operators/text_file_reader_utils_test.cc b/caffe2/operators/text_file_reader_utils_test.cc
index c0114e65d228..43d8d1466add 100644
--- a/caffe2/operators/text_file_reader_utils_test.cc
+++ b/caffe2/operators/text_file_reader_utils_test.cc
@@ -2,7 +2,7 @@
 #include "caffe2/core/blob.h"
 #include "caffe2/core/context.h"
 #include "caffe2/core/tensor.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/math.h"
 #include <gtest/gtest.h>
 
diff --git a/caffe2/operators/top_k.cc b/caffe2/operators/top_k.cc
index 7c111ead7156..7ebe9966a504 100644
--- a/caffe2/operators/top_k.cc
+++ b/caffe2/operators/top_k.cc
@@ -6,7 +6,7 @@
 #include <utility>
 #include <vector>
 
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/math.h"
 
 namespace caffe2 {
diff --git a/caffe2/opt/backend_cutting.h b/caffe2/opt/backend_cutting.h
index cc3ed14c3dc8..8ea1413dc193 100644
--- a/caffe2/opt/backend_cutting.h
+++ b/caffe2/opt/backend_cutting.h
@@ -2,7 +2,7 @@
 
 
 #include "caffe2/core/common.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 #include <functional>
 
diff --git a/caffe2/opt/converter.h b/caffe2/opt/converter.h
index ec90507664fa..0eff0776374c 100644
--- a/caffe2/opt/converter.h
+++ b/caffe2/opt/converter.h
@@ -3,7 +3,7 @@
 
 #include "caffe2/core/common.h"
 #include "caffe2/core/logging.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "nomnigraph/Graph/Graph.h"
 #include "nomnigraph/Representations/ControlFlow.h"
 #include "nomnigraph/Representations/NeuralNet.h"
diff --git a/caffe2/opt/onnxifi_transformer.h b/caffe2/opt/onnxifi_transformer.h
index f405577b2462..19ab54346cfc 100644
--- a/caffe2/opt/onnxifi_transformer.h
+++ b/caffe2/opt/onnxifi_transformer.h
@@ -11,7 +11,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/core/workspace.h"
 #include "caffe2/onnx/onnxifi_init.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 namespace onnx {
diff --git a/caffe2/opt/optimize_ideep.h b/caffe2/opt/optimize_ideep.h
index edfd1fac0276..d23fb546deb3 100644
--- a/caffe2/opt/optimize_ideep.h
+++ b/caffe2/opt/optimize_ideep.h
@@ -2,7 +2,7 @@
 
 #include "caffe2/core/common.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "nomnigraph/Representations/NeuralNet.h"
 
 namespace caffe2 {
diff --git a/caffe2/opt/optimizer.h b/caffe2/opt/optimizer.h
index a83232e0843d..326f371b5725 100644
--- a/caffe2/opt/optimizer.h
+++ b/caffe2/opt/optimizer.h
@@ -2,7 +2,7 @@
 #define CAFFE2_OPT_OPTIMIZER_H
 
 #include "caffe2/core/common.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/core/workspace.h"
 
 namespace caffe2 {
diff --git a/caffe2/opt/passes.h b/caffe2/opt/passes.h
index a0cda390ca83..81bd9078a652 100644
--- a/caffe2/opt/passes.h
+++ b/caffe2/opt/passes.h
@@ -3,7 +3,7 @@
 
 #include "caffe2/core/common.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 #include "nomnigraph/Representations/NeuralNet.h"
 
diff --git a/caffe2/opt/sink.h b/caffe2/opt/sink.h
index 53f082c47598..54992f7c08de 100644
--- a/caffe2/opt/sink.h
+++ b/caffe2/opt/sink.h
@@ -2,7 +2,7 @@
 #define CAFFE2_OPT_SINK_H_
 
 #include "caffe2/core/common.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "nomnigraph/Representations/NeuralNet.h"
 
 namespace caffe2 {
diff --git a/caffe2/predictor/predictor_utils.cc b/caffe2/predictor/predictor_utils.cc
index e7e19c7fde04..4af83d0bea8c 100644
--- a/caffe2/predictor/predictor_utils.cc
+++ b/caffe2/predictor/predictor_utils.cc
@@ -2,7 +2,7 @@
 
 #include "caffe2/core/blob.h"
 #include "caffe2/core/logging.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/proto/predictor_consts.pb.h"
 #include "caffe2/utils/proto_utils.h"
 
diff --git a/caffe2/proto/caffe2_pb.h b/caffe2/proto/caffe2_pb.h
new file mode 100644
index 000000000000..80f3825f619b
--- /dev/null
+++ b/caffe2/proto/caffe2_pb.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <caffe2/proto/caffe2.pb.h>
diff --git a/caffe2/python/pybind_state.h b/caffe2/python/pybind_state.h
index cb4d32700361..967331a19c5a 100644
--- a/caffe2/python/pybind_state.h
+++ b/caffe2/python/pybind_state.h
@@ -12,7 +12,7 @@
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/types.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/python/pybind_state_dlpack.h"
 
 #include <pybind11/pybind11.h>
diff --git a/caffe2/python/pybind_state_dlpack.h b/caffe2/python/pybind_state_dlpack.h
index 45c074f929f4..8b6f5e1a5c30 100644
--- a/caffe2/python/pybind_state_dlpack.h
+++ b/caffe2/python/pybind_state_dlpack.h
@@ -3,7 +3,7 @@
 #include "caffe2/core/context.h"
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/types.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/python/dlpack.h"
 
 #include <pybind11/pybind11.h>
diff --git a/caffe2/share/contrib/zstd/quant_decomp_zstd_op.cc b/caffe2/share/contrib/zstd/quant_decomp_zstd_op.cc
index d2c0ff623894..9bc5200750f3 100644
--- a/caffe2/share/contrib/zstd/quant_decomp_zstd_op.cc
+++ b/caffe2/share/contrib/zstd/quant_decomp_zstd_op.cc
@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include <zstd.h>
 #include "caffe2/core/tensor.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/transforms/common_subexpression_elimination.cc b/caffe2/transforms/common_subexpression_elimination.cc
index 9274491c157b..4815d34fbaf7 100644
--- a/caffe2/transforms/common_subexpression_elimination.cc
+++ b/caffe2/transforms/common_subexpression_elimination.cc
@@ -2,7 +2,7 @@
 
 #include "caffe2/core/common.h"
 #include "caffe2/core/net.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/transforms/common_subexpression_elimination.h b/caffe2/transforms/common_subexpression_elimination.h
index 2a2f6b882c74..513765a76b7c 100644
--- a/caffe2/transforms/common_subexpression_elimination.h
+++ b/caffe2/transforms/common_subexpression_elimination.h
@@ -3,7 +3,7 @@
 
 #include "caffe2/core/common.h"
 #include "caffe2/core/transform.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 namespace caffe2 {
diff --git a/caffe2/transforms/conv_to_nnpack_transform.h b/caffe2/transforms/conv_to_nnpack_transform.h
index 83f91c364c5b..5d61be232c2d 100644
--- a/caffe2/transforms/conv_to_nnpack_transform.h
+++ b/caffe2/transforms/conv_to_nnpack_transform.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/common.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/transforms/single_op_transform.h"
 #include "caffe2/utils/proto_utils.h"
 
diff --git a/caffe2/transforms/pattern_net_transform.cc b/caffe2/transforms/pattern_net_transform.cc
index d8546c527dee..ca03462aa483 100644
--- a/caffe2/transforms/pattern_net_transform.cc
+++ b/caffe2/transforms/pattern_net_transform.cc
@@ -3,7 +3,7 @@
 #include "caffe2/core/common.h"
 #include "caffe2/core/logging.h"
 #include "caffe2/core/net.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/transforms/pattern_net_transform.h b/caffe2/transforms/pattern_net_transform.h
index c22b42d9deb1..6ca1cf6f8550 100644
--- a/caffe2/transforms/pattern_net_transform.h
+++ b/caffe2/transforms/pattern_net_transform.h
@@ -2,7 +2,7 @@
 
 #include "caffe2/core/common.h"
 #include "caffe2/core/transform.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 namespace caffe2 {
diff --git a/caffe2/transforms/single_op_transform.cc b/caffe2/transforms/single_op_transform.cc
index 4527550ce159..c5a4d55fbf7f 100644
--- a/caffe2/transforms/single_op_transform.cc
+++ b/caffe2/transforms/single_op_transform.cc
@@ -3,7 +3,7 @@
 #include "caffe2/core/common.h"
 #include "caffe2/core/logging.h"
 #include "caffe2/core/net.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 
diff --git a/caffe2/transforms/single_op_transform.h b/caffe2/transforms/single_op_transform.h
index ae21f9aaa8d3..45f93cbbd8b9 100644
--- a/caffe2/transforms/single_op_transform.h
+++ b/caffe2/transforms/single_op_transform.h
@@ -2,7 +2,7 @@
 
 #include "caffe2/core/common.h"
 #include "caffe2/core/transform.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 namespace caffe2 {
diff --git a/caffe2/utils/hip/math_blas_hip_test.cc b/caffe2/utils/hip/math_blas_hip_test.cc
index f962c20b5812..6aed0273f677 100644
--- a/caffe2/utils/hip/math_blas_hip_test.cc
+++ b/caffe2/utils/hip/math_blas_hip_test.cc
@@ -4,7 +4,7 @@
 #include "caffe2/core/hip/context_hip.h"
 #include "caffe2/core/tensor.h"
 #include "caffe2/operators/utility_ops.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/conversions.h"
 #include "caffe2/utils/math.h"
 
diff --git a/caffe2/utils/math_test.cc b/caffe2/utils/math_test.cc
index ae40f1630826..b7da5bfce777 100644
--- a/caffe2/utils/math_test.cc
+++ b/caffe2/utils/math_test.cc
@@ -7,7 +7,7 @@
 #include "caffe2/core/blob.h"
 #include "caffe2/core/context.h"
 #include "caffe2/core/tensor.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/conversions.h"
 #include "caffe2/utils/math.h"
 
diff --git a/caffe2/utils/proto_utils.h b/caffe2/utils/proto_utils.h
index 5ba83ad0e216..0230d4d3ab87 100644
--- a/caffe2/utils/proto_utils.h
+++ b/caffe2/utils/proto_utils.h
@@ -9,7 +9,7 @@
 
 #include "caffe2/core/logging.h"
 #include "caffe2/utils/proto_wrap.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {