diff --git a/action_context.cc b/action_context.cc
index db0c699..b05e60d 100644
--- a/action_context.cc
+++ b/action_context.cc
@@ -10,8 +10,8 @@
 #include "condition.h"
 #include "convert_proto.h"
 #include "daemon_context.h"
-#include "safepower_agent.proto.h"
-#include "state_persistence.proto.h"
+#include "safepower_agent.pb.h"
+#include "state_persistence.pb.h"
 #include "state_updater.h"
 #include "absl/base/nullability.h"
 #include "absl/functional/any_invocable.h"
diff --git a/action_context.h b/action_context.h
index 1ca773c..f0e37b2 100644
--- a/action_context.h
+++ b/action_context.h
@@ -9,8 +9,8 @@
 
 #include "action_hash.h"
 #include "condition.h"
-#include "safepower_agent.proto.h"
-#include "state_persistence.proto.h"
+#include "safepower_agent.pb.h"
+#include "state_persistence.pb.h"
 #include "state_updater.h"
 #include "absl/base/nullability.h"
 #include "absl/base/thread_annotations.h"
diff --git a/action_hash.h b/action_hash.h
index 21a2a1b..83edc07 100644
--- a/action_hash.h
+++ b/action_hash.h
@@ -4,7 +4,7 @@
 #include <cstddef>
 #include <tuple>
 
-#include "safepower_agent.proto.h"
+#include "safepower_agent.pb.h"
 #include "absl/hash/hash.h"
 namespace safepower_agent {
 
diff --git a/bmc/gpowerd.cc b/bmc/gpowerd.cc
index 21b3209..7d9eabe 100644
--- a/bmc/gpowerd.cc
+++ b/bmc/gpowerd.cc
@@ -12,7 +12,7 @@
 #include "bmc/daemon_context_bmc.h"
 #include "bmc/machine_configs/setup_configs.h"
 #include "bmc/state_monitor_bmc.h"
-#include "safepower_agent_config.proto.h"
+#include "safepower_agent_config.pb.h"
 #include "safepower_agent.h"
 #include "state_updater.h"
 #include "absl/flags/flag.h"
diff --git a/bmc/http_connection_test.cc b/bmc/http_connection_test.cc
index 5da160e..74486da 100644
--- a/bmc/http_connection_test.cc
+++ b/bmc/http_connection_test.cc
@@ -10,8 +10,8 @@
 #include "bmc/mock_server.h"
 #include "bmc/redfish.h"
 #include "bmc/state_monitor_bmc.h"
-#include "safepower_agent.proto.h"
-#include "safepower_agent_config.proto.h"
+#include "safepower_agent.pb.h"
+#include "safepower_agent_config.pb.h"
 #include "state_updater.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/bmc/machine_configs/setup_configs.cc b/bmc/machine_configs/setup_configs.cc
index d523d2f..93514df 100644
--- a/bmc/machine_configs/setup_configs.cc
+++ b/bmc/machine_configs/setup_configs.cc
@@ -8,7 +8,7 @@
 #include "bmc/state_monitor_bmc.h"
 #include "daemon_context.h"
 #include "parse_text_proto.h"
-#include "safepower_agent_config.proto.h"
+#include "safepower_agent_config.pb.h"
 #include "absl/flags/flag.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
diff --git a/bmc/machine_configs/setup_configs_test.cc b/bmc/machine_configs/setup_configs_test.cc
index 2cd949c..d2c1f44 100644
--- a/bmc/machine_configs/setup_configs_test.cc
+++ b/bmc/machine_configs/setup_configs_test.cc
@@ -10,8 +10,8 @@
 #include "bmc/daemon_context_bmc.h"
 #include "bmc/machine_configs/embedded_data.h"
 #include "bmc/state_monitor_bmc.h"
-#include "safepower_agent.proto.h"
-#include "safepower_agent_config.proto.h"
+#include "safepower_agent.pb.h"
+#include "safepower_agent_config.pb.h"
 #include "state_updater.h"
 #include "gtest/gtest.h"
 #include "absl/status/status.h"
diff --git a/bmc/persistent_storage_bmc.cc b/bmc/persistent_storage_bmc.cc
index 70e69c3..ffa298b 100644
--- a/bmc/persistent_storage_bmc.cc
+++ b/bmc/persistent_storage_bmc.cc
@@ -14,9 +14,9 @@
 #include "google/protobuf/timestamp.pb.h"
 #include "action_context.h"
 #include "bmc/proto_reader.h"
-#include "safepower_agent.proto.h"
-#include "safepower_agent_config.proto.h"
-#include "state_persistence.proto.h"
+#include "safepower_agent.pb.h"
+#include "safepower_agent_config.pb.h"
+#include "state_persistence.pb.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
diff --git a/bmc/persistent_storage_bmc.h b/bmc/persistent_storage_bmc.h
index 2bd42e4..1b1b7f4 100644
--- a/bmc/persistent_storage_bmc.h
+++ b/bmc/persistent_storage_bmc.h
@@ -6,8 +6,8 @@
 #include <vector>
 
 #include "persistent_storage.h"
-#include "safepower_agent_config.proto.h"
-#include "state_persistence.proto.h"
+#include "safepower_agent_config.pb.h"
+#include "state_persistence.pb.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
diff --git a/bmc/persistent_storage_bmc_test.cc b/bmc/persistent_storage_bmc_test.cc
index 83c73d2..94a5998 100644
--- a/bmc/persistent_storage_bmc_test.cc
+++ b/bmc/persistent_storage_bmc_test.cc
@@ -7,8 +7,8 @@
 #include <string>
 #include <vector>
 
-#include "safepower_agent.proto.h"
-#include "state_persistence.proto.h"
+#include "safepower_agent.pb.h"
+#include "state_persistence.pb.h"
 #include "gtest/gtest.h"
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
diff --git a/bmc/register_actions_bmc.cc b/bmc/register_actions_bmc.cc
index b26ca9d..7894562 100644
--- a/bmc/register_actions_bmc.cc
+++ b/bmc/register_actions_bmc.cc
@@ -12,8 +12,8 @@
 #include "bmc/http_connection.h"
 #include "daemon_context.h"
 #include "disruption_manager.h"
-#include "safepower_agent.proto.h"
-#include "safepower_agent_config.proto.h"
+#include "safepower_agent.pb.h"
+#include "safepower_agent_config.pb.h"
 #include "absl/functional/any_invocable.h"
 #include "absl/functional/bind_front.h"
 #include "absl/log/log.h"
diff --git a/bmc/register_actions_bmc.h b/bmc/register_actions_bmc.h
index 5f24f0e..eb5c124 100644
--- a/bmc/register_actions_bmc.h
+++ b/bmc/register_actions_bmc.h
@@ -2,7 +2,7 @@
 #define PRODUCTION_BORG_MGMT_NODE_PROXY_SAFEPOWER_SAFEPOWER_AGENT_BMC_REGISTER_ACTIONS_BMC_H_
 
 #include "action_context.h"
-#include "safepower_agent_config.proto.h"
+#include "safepower_agent_config.pb.h"
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 
diff --git a/bmc/register_actions_bmc_test.cc b/bmc/register_actions_bmc_test.cc
index 6afda99..f7fa00a 100644
--- a/bmc/register_actions_bmc_test.cc
+++ b/bmc/register_actions_bmc_test.cc
@@ -14,8 +14,8 @@
 #include "bmc/daemon_context_bmc.h"
 #include "disruption_manager.h"
 #include "parse_text_proto.h"
-#include "safepower_agent.proto.h"
-#include "safepower_agent_config.proto.h"
+#include "safepower_agent.pb.h"
+#include "safepower_agent_config.pb.h"
 #include "state_updater.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/bmc/state_monitor_bmc.cc b/bmc/state_monitor_bmc.cc
index 580beb8..5cc9182 100644
--- a/bmc/state_monitor_bmc.cc
+++ b/bmc/state_monitor_bmc.cc
@@ -6,8 +6,8 @@
 
 #include "bmc/daemon_context_bmc.h"
 #include "bmc/redfish.h"
-#include "safepower_agent.proto.h"
-#include "safepower_agent_config.proto.h"
+#include "safepower_agent.pb.h"
+#include "safepower_agent_config.pb.h"
 #include "state_updater.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
diff --git a/bmc/state_monitor_bmc.h b/bmc/state_monitor_bmc.h
index cc92783..78350f4 100644
--- a/bmc/state_monitor_bmc.h
+++ b/bmc/state_monitor_bmc.h
@@ -4,8 +4,8 @@
 #include <memory>
 #include <string>
 
-#include "safepower_agent.proto.h"
-#include "safepower_agent_config.proto.h"
+#include "safepower_agent.pb.h"
+#include "safepower_agent_config.pb.h"
 #include "state_updater.h"
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
diff --git a/condition.cc b/condition.cc
index cdfc992..d617185 100644
--- a/condition.cc
+++ b/condition.cc
@@ -10,7 +10,7 @@
 #include "google/protobuf/timestamp.pb.h"
 #include "convert_proto.h"
 #include "daemon_context.h"
-#include "safepower_agent.proto.h"
+#include "safepower_agent.pb.h"
 #include "state_fields.h"
 #include "state_merge.h"
 #include "state_updater.h"
diff --git a/condition.h b/condition.h
index c70630d..28ad604 100644
--- a/condition.h
+++ b/condition.h
@@ -6,7 +6,7 @@
 #include <tuple>
 #include <vector>
 
-#include "safepower_agent.proto.h"
+#include "safepower_agent.pb.h"
 #include "state_updater.h"
 #include "absl/base/nullability.h"
 #include "absl/functional/any_invocable.h"
diff --git a/convert_proto.cc b/convert_proto.cc
index 9ac3dbe..ef3e3df 100644
--- a/convert_proto.cc
+++ b/convert_proto.cc
@@ -2,7 +2,7 @@
 
 #include "google/protobuf/timestamp.pb.h"
 #include "daemon_context.h"
-#include "safepower_agent.proto.h"
+#include "safepower_agent.pb.h"
 #include "absl/status/status.h"
 #include "absl/time/time.h"
 
diff --git a/convert_proto.h b/convert_proto.h
index e21e09d..ae93de3 100644
--- a/convert_proto.h
+++ b/convert_proto.h
@@ -2,7 +2,7 @@
 #define PRODUCTION_BORG_MGMT_NODE_PROXY_SAFEPOWER_SAFEPOWER_AGENT_CONVERT_PROTO_H_
 
 #include "google/protobuf/timestamp.pb.h"
-#include "safepower_agent.proto.h"
+#include "safepower_agent.pb.h"
 #include "absl/status/status.h"
 #include "absl/time/time.h"
 namespace safepower_agent {
diff --git a/daemon_context.h b/daemon_context.h
index 38a2c78..a1bd274 100644
--- a/daemon_context.h
+++ b/daemon_context.h
@@ -6,7 +6,7 @@
 
 #include "disruption_manager.h"
 #include "persistent_storage.h"
-#include "safepower_agent_config.proto.h"
+#include "safepower_agent_config.pb.h"
 #include "scheduler_interface.h"
 #include "absl/base/nullability.h"
 #include "absl/time/clock.h"
diff --git a/safepower_agent.cc b/safepower_agent.cc
index 65d8419..e68a071 100644
--- a/safepower_agent.cc
+++ b/safepower_agent.cc
@@ -5,7 +5,7 @@
 
 #include "action_context.h"
 #include "daemon_context.h"
-#include "safepower_agent.proto.h"
+#include "safepower_agent.pb.h"
 #include "state_change_reactor.h"
 #include "bmc/convert_status.h"
 #include "absl/base/nullability.h"
diff --git a/safepower_agent.h b/safepower_agent.h
index 282d0ef..dc4b81c 100644
--- a/safepower_agent.h
+++ b/safepower_agent.h
@@ -6,7 +6,7 @@
 
 #include "action_context.h"
 #include "safepower_agent.grpc.pb.h"
-#include "safepower_agent.proto.h"
+#include "safepower_agent.pb.h"
 #include "state_updater.h"
 #include "absl/base/nullability.h"
 #include "grpcpp/server_context.h"
diff --git a/state_fields.h b/state_fields.h
index b0e4b2a..bffd02a 100644
--- a/state_fields.h
+++ b/state_fields.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <tuple>
 
-#include "safepower_agent.proto.h"
+#include "safepower_agent.pb.h"
 #include "absl/strings/string_view.h"
 
 namespace safepower_agent {
diff --git a/state_merge.cc b/state_merge.cc
index 152d53b..aa6ed73 100644
--- a/state_merge.cc
+++ b/state_merge.cc
@@ -2,7 +2,7 @@
 
 #include <tuple>
 
-#include "safepower_agent.proto.h"
+#include "safepower_agent.pb.h"
 #include "state_fields.h"
 #include "google/protobuf/map.h"
 
diff --git a/state_merge.h b/state_merge.h
index 62ab9a1..30e4476 100644
--- a/state_merge.h
+++ b/state_merge.h
@@ -1,7 +1,7 @@
 #ifndef PRODUCTION_BORG_MGMT_NODE_PROXY_SAFEPOWER_SAFEPOWER_AGENT_STATE_MERGE_H_
 #define PRODUCTION_BORG_MGMT_NODE_PROXY_SAFEPOWER_SAFEPOWER_AGENT_STATE_MERGE_H_
 
-#include "safepower_agent.proto.h"
+#include "safepower_agent.pb.h"
 namespace safepower_agent {