diff --git a/bag2lanelet/scripts/bag2map.py b/bag2lanelet/scripts/bag2map.py
index f3e6300af..f6075b371 100755
--- a/bag2lanelet/scripts/bag2map.py
+++ b/bag2lanelet/scripts/bag2map.py
@@ -6,6 +6,7 @@
 
 from bag2way import bag2point_stamped
 import folium
+
 from tools.bag2lanelet.scripts.lanelet_xml import LaneletMap
 
 
diff --git a/common/tier4_automatic_goal_rviz_plugin/src/automatic_goal_panel.cpp b/common/tier4_automatic_goal_rviz_plugin/src/automatic_goal_panel.cpp
index 5f0879e35..5a9ebb8bc 100644
--- a/common/tier4_automatic_goal_rviz_plugin/src/automatic_goal_panel.cpp
+++ b/common/tier4_automatic_goal_rviz_plugin/src/automatic_goal_panel.cpp
@@ -16,7 +16,7 @@
 
 #include "automatic_goal_panel.hpp"
 
-#include <autoware_universe_utils/ros/marker_helper.hpp>
+#include <autoware/universe_utils/ros/marker_helper.hpp>
 
 namespace rviz_plugins
 {
diff --git a/control/stop_accel_evaluator/include/stop_accel_evaluator/stop_accel_evaluator_node.hpp b/control/stop_accel_evaluator/include/stop_accel_evaluator/stop_accel_evaluator_node.hpp
index 65c2daf8a..1867213ba 100644
--- a/control/stop_accel_evaluator/include/stop_accel_evaluator/stop_accel_evaluator_node.hpp
+++ b/control/stop_accel_evaluator/include/stop_accel_evaluator/stop_accel_evaluator_node.hpp
@@ -15,7 +15,7 @@
 #ifndef STOP_ACCEL_EVALUATOR__STOP_ACCEL_EVALUATOR_NODE_HPP_
 #define STOP_ACCEL_EVALUATOR__STOP_ACCEL_EVALUATOR_NODE_HPP_
 
-#include "autoware_universe_utils/ros/self_pose_listener.hpp"
+#include "autoware/universe_utils/ros/self_pose_listener.hpp"
 #include "rclcpp/rclcpp.hpp"
 #include "signal_processing/lowpass_filter_1d.hpp"
 
diff --git a/control/stop_accel_evaluator/src/stop_accel_evaluator_node.cpp b/control/stop_accel_evaluator/src/stop_accel_evaluator_node.cpp
index 79830de1a..aab9ecff7 100644
--- a/control/stop_accel_evaluator/src/stop_accel_evaluator_node.cpp
+++ b/control/stop_accel_evaluator/src/stop_accel_evaluator_node.cpp
@@ -14,7 +14,7 @@
 
 #include "stop_accel_evaluator/stop_accel_evaluator_node.hpp"
 
-#include "autoware_universe_utils/math/constants.hpp"
+#include "autoware/universe_utils/math/constants.hpp"
 
 #include <algorithm>
 #include <memory>
diff --git a/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/autoware_universe_utils.hpp b/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/autoware_universe_utils.hpp
index a478a0b48..cc339493e 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/autoware_universe_utils.hpp
+++ b/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/autoware_universe_utils.hpp
@@ -15,9 +15,9 @@
 #ifndef DEVIATION_ESTIMATOR__AUTOWARE_UNIVERSE_UTILS_HPP_
 #define DEVIATION_ESTIMATOR__AUTOWARE_UNIVERSE_UTILS_HPP_
 
-#include "autoware_universe_utils/geometry/geometry.hpp"
-#include "autoware_universe_utils/math/constants.hpp"
-#include "autoware_universe_utils/math/normalization.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/math/constants.hpp"
+#include "autoware/universe_utils/math/normalization.hpp"
 
 #include <tf2/utils.h>
 
diff --git a/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/deviation_estimator.hpp b/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/deviation_estimator.hpp
index 852faa081..a3a43155a 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/deviation_estimator.hpp
+++ b/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/deviation_estimator.hpp
@@ -15,7 +15,7 @@
 #ifndef DEVIATION_ESTIMATOR__DEVIATION_ESTIMATOR_HPP_
 #define DEVIATION_ESTIMATOR__DEVIATION_ESTIMATOR_HPP_
 
-#include "autoware_universe_utils/ros/transform_listener.hpp"
+#include "autoware/universe_utils/ros/transform_listener.hpp"
 #include "deviation_estimator/gyro_bias_module.hpp"
 #include "deviation_estimator/logger.hpp"
 #include "deviation_estimator/utils.hpp"
diff --git a/localization/deviation_estimation_tools/deviation_estimator/src/deviation_estimator.cpp b/localization/deviation_estimation_tools/deviation_estimator/src/deviation_estimator.cpp
index 016802384..73360f4a7 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/src/deviation_estimator.cpp
+++ b/localization/deviation_estimation_tools/deviation_estimator/src/deviation_estimator.cpp
@@ -14,7 +14,7 @@
 
 #include "deviation_estimator/deviation_estimator.hpp"
 
-#include "autoware_universe_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
 #include "deviation_estimator/logger.hpp"
 #include "deviation_estimator/utils.hpp"
 #include "rclcpp/logging.hpp"
diff --git a/localization/deviation_estimation_tools/deviation_estimator/src/gyro_bias_module.cpp b/localization/deviation_estimation_tools/deviation_estimator/src/gyro_bias_module.cpp
index 059f8f26e..9c87709ce 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/src/gyro_bias_module.cpp
+++ b/localization/deviation_estimation_tools/deviation_estimator/src/gyro_bias_module.cpp
@@ -14,7 +14,7 @@
 
 #include "deviation_estimator/gyro_bias_module.hpp"
 
-#include "autoware_universe_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
 #include "deviation_estimator/utils.hpp"
 
 /**
diff --git a/localization/deviation_estimation_tools/deviation_estimator/src/utils.cpp b/localization/deviation_estimation_tools/deviation_estimator/src/utils.cpp
index 54f6ff0ec..7629dd1f9 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/src/utils.cpp
+++ b/localization/deviation_estimation_tools/deviation_estimator/src/utils.cpp
@@ -14,7 +14,7 @@
 
 #include "deviation_estimator/utils.hpp"
 
-#include "autoware_universe_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
 #include "rclcpp/rclcpp.hpp"
 
 #include <tf2/LinearMath/Quaternion.h>
diff --git a/localization/deviation_estimation_tools/deviation_estimator/src/velocity_coef_module.cpp b/localization/deviation_estimation_tools/deviation_estimator/src/velocity_coef_module.cpp
index c630b9e13..a7e4c0c6f 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/src/velocity_coef_module.cpp
+++ b/localization/deviation_estimation_tools/deviation_estimator/src/velocity_coef_module.cpp
@@ -14,7 +14,7 @@
 
 #include "deviation_estimator/velocity_coef_module.hpp"
 
-#include "autoware_universe_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
 #include "deviation_estimator/utils.hpp"
 
 /**
diff --git a/localization/deviation_estimation_tools/deviation_estimator/test/test_gyro_bias.cpp b/localization/deviation_estimation_tools/deviation_estimator/test/test_gyro_bias.cpp
index 81f42c482..b5152fd2e 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/test/test_gyro_bias.cpp
+++ b/localization/deviation_estimation_tools/deviation_estimator/test/test_gyro_bias.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "autoware_universe_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
 #include "deviation_estimator/gyro_bias_module.hpp"
 
 #include <gtest/gtest.h>
diff --git a/localization/deviation_estimation_tools/deviation_estimator/test/test_gyro_stddev.cpp b/localization/deviation_estimation_tools/deviation_estimator/test/test_gyro_stddev.cpp
index 5049b5a75..4e1f494e2 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/test/test_gyro_stddev.cpp
+++ b/localization/deviation_estimation_tools/deviation_estimator/test/test_gyro_stddev.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "autoware_universe_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
 #include "deviation_estimator/deviation_estimator.hpp"
 
 #include <gtest/gtest.h>
diff --git a/localization/deviation_estimation_tools/deviation_evaluator/include/deviation_evaluator/autoware_universe_utils.hpp b/localization/deviation_estimation_tools/deviation_evaluator/include/deviation_evaluator/autoware_universe_utils.hpp
index 0263a903a..64d306542 100644
--- a/localization/deviation_estimation_tools/deviation_evaluator/include/deviation_evaluator/autoware_universe_utils.hpp
+++ b/localization/deviation_estimation_tools/deviation_evaluator/include/deviation_evaluator/autoware_universe_utils.hpp
@@ -15,9 +15,9 @@
 #ifndef DEVIATION_EVALUATOR__AUTOWARE_UNIVERSE_UTILS_HPP_
 #define DEVIATION_EVALUATOR__AUTOWARE_UNIVERSE_UTILS_HPP_
 
-#include "autoware_universe_utils/geometry/geometry.hpp"
-#include "autoware_universe_utils/math/constants.hpp"
-#include "autoware_universe_utils/math/normalization.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/math/constants.hpp"
+#include "autoware/universe_utils/math/normalization.hpp"
 
 #include <tf2/utils.h>
 
diff --git a/localization/deviation_estimation_tools/deviation_evaluator/include/deviation_evaluator/deviation_evaluator.hpp b/localization/deviation_estimation_tools/deviation_evaluator/include/deviation_evaluator/deviation_evaluator.hpp
index 376044470..3aeace1ef 100644
--- a/localization/deviation_estimation_tools/deviation_evaluator/include/deviation_evaluator/deviation_evaluator.hpp
+++ b/localization/deviation_estimation_tools/deviation_evaluator/include/deviation_evaluator/deviation_evaluator.hpp
@@ -15,7 +15,7 @@
 #ifndef DEVIATION_EVALUATOR__DEVIATION_EVALUATOR_HPP_
 #define DEVIATION_EVALUATOR__DEVIATION_EVALUATOR_HPP_
 
-#include "autoware_universe_utils/ros/transform_listener.hpp"
+#include "autoware/universe_utils/ros/transform_listener.hpp"
 #include "deviation_evaluator/autoware_universe_utils.hpp"
 #include "rclcpp/rclcpp.hpp"
 #include "tf2/LinearMath/Quaternion.h"
diff --git a/localization/deviation_estimation_tools/deviation_evaluator/src/deviation_evaluator.cpp b/localization/deviation_estimation_tools/deviation_evaluator/src/deviation_evaluator.cpp
index 16fcf2103..3ff5541d9 100644
--- a/localization/deviation_estimation_tools/deviation_evaluator/src/deviation_evaluator.cpp
+++ b/localization/deviation_estimation_tools/deviation_evaluator/src/deviation_evaluator.cpp
@@ -16,7 +16,7 @@
 
 #include "deviation_evaluator/deviation_evaluator.hpp"
 
-#include "autoware_universe_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
 #include "rclcpp/logging.hpp"
 
 #include <algorithm>
diff --git a/planning/planning_debug_tools/include/planning_debug_tools/trajectory_analyzer.hpp b/planning/planning_debug_tools/include/planning_debug_tools/trajectory_analyzer.hpp
index f42c741c9..362094f15 100644
--- a/planning/planning_debug_tools/include/planning_debug_tools/trajectory_analyzer.hpp
+++ b/planning/planning_debug_tools/include/planning_debug_tools/trajectory_analyzer.hpp
@@ -15,7 +15,7 @@
 #ifndef PLANNING_DEBUG_TOOLS__TRAJECTORY_ANALYZER_HPP_
 #define PLANNING_DEBUG_TOOLS__TRAJECTORY_ANALYZER_HPP_
 
-#include "autoware_universe_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
 #include "motion_utils/trajectory/trajectory.hpp"
 #include "planning_debug_tools/msg/trajectory_debug_info.hpp"
 #include "planning_debug_tools/util.hpp"
diff --git a/planning/planning_debug_tools/include/planning_debug_tools/util.hpp b/planning/planning_debug_tools/include/planning_debug_tools/util.hpp
index ff8c79527..05264645a 100644
--- a/planning/planning_debug_tools/include/planning_debug_tools/util.hpp
+++ b/planning/planning_debug_tools/include/planning_debug_tools/util.hpp
@@ -15,7 +15,7 @@
 #ifndef PLANNING_DEBUG_TOOLS__UTIL_HPP_
 #define PLANNING_DEBUG_TOOLS__UTIL_HPP_
 
-#include "autoware_universe_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
 #include "motion_utils/trajectory/trajectory.hpp"
 #include "rclcpp/rclcpp.hpp"
 
diff --git a/planning/planning_debug_tools/src/stop_reason_visualizer.cpp b/planning/planning_debug_tools/src/stop_reason_visualizer.cpp
index e0bda8c62..d59833de4 100644
--- a/planning/planning_debug_tools/src/stop_reason_visualizer.cpp
+++ b/planning/planning_debug_tools/src/stop_reason_visualizer.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <autoware_universe_utils/ros/marker_helper.hpp>
+#include <autoware/universe_utils/ros/marker_helper.hpp>
 #include <rclcpp/rclcpp.hpp>
 
 #include <std_msgs/msg/header.hpp>
diff --git a/vehicle/pitch_checker/include/pitch_checker/pitch_checker.hpp b/vehicle/pitch_checker/include/pitch_checker/pitch_checker.hpp
index 60726bd4e..6d27f1a4e 100644
--- a/vehicle/pitch_checker/include/pitch_checker/pitch_checker.hpp
+++ b/vehicle/pitch_checker/include/pitch_checker/pitch_checker.hpp
@@ -35,7 +35,7 @@
 #else
 #include "tf2_geometry_msgs/tf2_geometry_msgs.hpp"
 #endif
-#include "autoware_universe_utils/ros/transform_listener.hpp"
+#include "autoware/universe_utils/ros/transform_listener.hpp"
 
 struct TfInfo
 {