diff --git a/common/autoware_adapi_specs/include/autoware/adapi_specs/fail_safe.hpp b/common/autoware_adapi_specs/include/autoware/adapi_specs/fail_safe.hpp
index a665adef40973..d9366e567ed90 100644
--- a/common/autoware_adapi_specs/include/autoware/adapi_specs/fail_safe.hpp
+++ b/common/autoware_adapi_specs/include/autoware/adapi_specs/fail_safe.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE__AD_API_SPECS__FAIL_SAFE_HPP_
-#define AUTOWARE__AD_API_SPECS__FAIL_SAFE_HPP_
+#ifndef AUTOWARE__ADAPI_SPECS__FAIL_SAFE_HPP_
+#define AUTOWARE__ADAPI_SPECS__FAIL_SAFE_HPP_
 
 #include <rclcpp/qos.hpp>
 
@@ -33,4 +33,4 @@ struct MrmState
 
 }  // namespace autoware::adapi_specs::fail_safe
 
-#endif  // AUTOWARE__AD_API_SPECS__FAIL_SAFE_HPP_
+#endif  // AUTOWARE__ADAPI_SPECS__FAIL_SAFE_HPP_
diff --git a/common/autoware_adapi_specs/include/autoware/adapi_specs/interface.hpp b/common/autoware_adapi_specs/include/autoware/adapi_specs/interface.hpp
index 04cd86e69ca75..8c94569ab8063 100644
--- a/common/autoware_adapi_specs/include/autoware/adapi_specs/interface.hpp
+++ b/common/autoware_adapi_specs/include/autoware/adapi_specs/interface.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE__AD_API_SPECS__INTERFACE_HPP_
-#define AUTOWARE__AD_API_SPECS__INTERFACE_HPP_
+#ifndef AUTOWARE__ADAPI_SPECS__INTERFACE_HPP_
+#define AUTOWARE__ADAPI_SPECS__INTERFACE_HPP_
 
 #include <autoware_adapi_version_msgs/srv/interface_version.hpp>
 
@@ -28,4 +28,4 @@ struct Version
 
 }  // namespace autoware::adapi_specs::interface
 
-#endif  // AUTOWARE__AD_API_SPECS__INTERFACE_HPP_
+#endif  // AUTOWARE__ADAPI_SPECS__INTERFACE_HPP_
diff --git a/common/autoware_adapi_specs/include/autoware/adapi_specs/localization.hpp b/common/autoware_adapi_specs/include/autoware/adapi_specs/localization.hpp
index 18253aa440489..92198128c5d96 100644
--- a/common/autoware_adapi_specs/include/autoware/adapi_specs/localization.hpp
+++ b/common/autoware_adapi_specs/include/autoware/adapi_specs/localization.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE__AD_API_SPECS__LOCALIZATION_HPP_
-#define AUTOWARE__AD_API_SPECS__LOCALIZATION_HPP_
+#ifndef AUTOWARE__ADAPI_SPECS__LOCALIZATION_HPP_
+#define AUTOWARE__ADAPI_SPECS__LOCALIZATION_HPP_
 
 #include <rclcpp/qos.hpp>
 
@@ -40,4 +40,4 @@ struct InitializationState
 
 }  // namespace autoware::adapi_specs::localization
 
-#endif  // AUTOWARE__AD_API_SPECS__LOCALIZATION_HPP_
+#endif  // AUTOWARE__ADAPI_SPECS__LOCALIZATION_HPP_
diff --git a/common/autoware_adapi_specs/include/autoware/adapi_specs/motion.hpp b/common/autoware_adapi_specs/include/autoware/adapi_specs/motion.hpp
index e74877bdc51d3..5e40b7c5bda3a 100644
--- a/common/autoware_adapi_specs/include/autoware/adapi_specs/motion.hpp
+++ b/common/autoware_adapi_specs/include/autoware/adapi_specs/motion.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE__AD_API_SPECS__MOTION_HPP_
-#define AUTOWARE__AD_API_SPECS__MOTION_HPP_
+#ifndef AUTOWARE__ADAPI_SPECS__MOTION_HPP_
+#define AUTOWARE__ADAPI_SPECS__MOTION_HPP_
 
 #include <rclcpp/qos.hpp>
 
@@ -40,4 +40,4 @@ struct State
 
 }  // namespace autoware::adapi_specs::motion
 
-#endif  // AUTOWARE__AD_API_SPECS__MOTION_HPP_
+#endif  // AUTOWARE__ADAPI_SPECS__MOTION_HPP_
diff --git a/common/autoware_adapi_specs/include/autoware/adapi_specs/operation_mode.hpp b/common/autoware_adapi_specs/include/autoware/adapi_specs/operation_mode.hpp
index 86c30e3e49533..81f63ef63b5e0 100644
--- a/common/autoware_adapi_specs/include/autoware/adapi_specs/operation_mode.hpp
+++ b/common/autoware_adapi_specs/include/autoware/adapi_specs/operation_mode.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE__AD_API_SPECS__OPERATION_MODE_HPP_
-#define AUTOWARE__AD_API_SPECS__OPERATION_MODE_HPP_
+#ifndef AUTOWARE__ADAPI_SPECS__OPERATION_MODE_HPP_
+#define AUTOWARE__ADAPI_SPECS__OPERATION_MODE_HPP_
 
 #include <rclcpp/qos.hpp>
 
@@ -70,4 +70,4 @@ struct OperationModeState
 
 }  // namespace autoware::adapi_specs::operation_mode
 
-#endif  // AUTOWARE__AD_API_SPECS__OPERATION_MODE_HPP_
+#endif  // AUTOWARE__ADAPI_SPECS__OPERATION_MODE_HPP_
diff --git a/common/autoware_adapi_specs/include/autoware/adapi_specs/perception.hpp b/common/autoware_adapi_specs/include/autoware/adapi_specs/perception.hpp
index 30817d217a793..80f876cdd588f 100644
--- a/common/autoware_adapi_specs/include/autoware/adapi_specs/perception.hpp
+++ b/common/autoware_adapi_specs/include/autoware/adapi_specs/perception.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE__AD_API_SPECS__PERCEPTION_HPP_
-#define AUTOWARE__AD_API_SPECS__PERCEPTION_HPP_
+#ifndef AUTOWARE__ADAPI_SPECS__PERCEPTION_HPP_
+#define AUTOWARE__ADAPI_SPECS__PERCEPTION_HPP_
 
 #include <rclcpp/qos.hpp>
 
@@ -33,4 +33,4 @@ struct DynamicObjectArray
 
 }  // namespace autoware::adapi_specs::perception
 
-#endif  // AUTOWARE__AD_API_SPECS__PERCEPTION_HPP_
+#endif  // AUTOWARE__ADAPI_SPECS__PERCEPTION_HPP_
diff --git a/common/autoware_adapi_specs/include/autoware/adapi_specs/planning.hpp b/common/autoware_adapi_specs/include/autoware/adapi_specs/planning.hpp
index 20fce56cc38c7..246cd92d94385 100644
--- a/common/autoware_adapi_specs/include/autoware/adapi_specs/planning.hpp
+++ b/common/autoware_adapi_specs/include/autoware/adapi_specs/planning.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE__AD_API_SPECS__PLANNING_HPP_
-#define AUTOWARE__AD_API_SPECS__PLANNING_HPP_
+#ifndef AUTOWARE__ADAPI_SPECS__PLANNING_HPP_
+#define AUTOWARE__ADAPI_SPECS__PLANNING_HPP_
 
 #include <rclcpp/qos.hpp>
 
@@ -43,4 +43,4 @@ struct SteeringFactors
 
 }  // namespace autoware::adapi_specs::planning
 
-#endif  // AUTOWARE__AD_API_SPECS__PLANNING_HPP_
+#endif  // AUTOWARE__ADAPI_SPECS__PLANNING_HPP_
diff --git a/common/autoware_adapi_specs/include/autoware/adapi_specs/routing.hpp b/common/autoware_adapi_specs/include/autoware/adapi_specs/routing.hpp
index b133bb20b65a9..4988a82bb9ad2 100644
--- a/common/autoware_adapi_specs/include/autoware/adapi_specs/routing.hpp
+++ b/common/autoware_adapi_specs/include/autoware/adapi_specs/routing.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE__AD_API_SPECS__ROUTING_HPP_
-#define AUTOWARE__AD_API_SPECS__ROUTING_HPP_
+#ifndef AUTOWARE__ADAPI_SPECS__ROUTING_HPP_
+#define AUTOWARE__ADAPI_SPECS__ROUTING_HPP_
 
 #include <rclcpp/qos.hpp>
 
@@ -76,4 +76,4 @@ struct Route
 
 }  // namespace autoware::adapi_specs::routing
 
-#endif  // AUTOWARE__AD_API_SPECS__ROUTING_HPP_
+#endif  // AUTOWARE__ADAPI_SPECS__ROUTING_HPP_
diff --git a/common/autoware_adapi_specs/include/autoware/adapi_specs/system.hpp b/common/autoware_adapi_specs/include/autoware/adapi_specs/system.hpp
index a22485e3dfa60..06e039174a3c5 100644
--- a/common/autoware_adapi_specs/include/autoware/adapi_specs/system.hpp
+++ b/common/autoware_adapi_specs/include/autoware/adapi_specs/system.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE__AD_API_SPECS__SYSTEM_HPP_
-#define AUTOWARE__AD_API_SPECS__SYSTEM_HPP_
+#ifndef AUTOWARE__ADAPI_SPECS__SYSTEM_HPP_
+#define AUTOWARE__ADAPI_SPECS__SYSTEM_HPP_
 
 #include <rclcpp/qos.hpp>
 
@@ -33,4 +33,4 @@ struct Heartbeat
 
 }  // namespace autoware::adapi_specs::system
 
-#endif  // AUTOWARE__AD_API_SPECS__SYSTEM_HPP_
+#endif  // AUTOWARE__ADAPI_SPECS__SYSTEM_HPP_
diff --git a/common/autoware_adapi_specs/include/autoware/adapi_specs/vehicle.hpp b/common/autoware_adapi_specs/include/autoware/adapi_specs/vehicle.hpp
index dcf43cfb2668c..a7568d54b5e1a 100644
--- a/common/autoware_adapi_specs/include/autoware/adapi_specs/vehicle.hpp
+++ b/common/autoware_adapi_specs/include/autoware/adapi_specs/vehicle.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE__AD_API_SPECS__VEHICLE_HPP_
-#define AUTOWARE__AD_API_SPECS__VEHICLE_HPP_
+#ifndef AUTOWARE__ADAPI_SPECS__VEHICLE_HPP_
+#define AUTOWARE__ADAPI_SPECS__VEHICLE_HPP_
 
 #include <rclcpp/qos.hpp>
 
@@ -74,4 +74,4 @@ struct DoorStatus
 
 }  // namespace autoware::adapi_specs::vehicle
 
-#endif  // AUTOWARE__AD_API_SPECS__VEHICLE_HPP_
+#endif  // AUTOWARE__ADAPI_SPECS__VEHICLE_HPP_