diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e24ee56c4165d..0a3204bd8e63e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -164,7 +164,7 @@ planning/autoware_remaining_distance_time_calculator/** ahmed.ebrahim@leodrive.a
planning/autoware_static_centerline_generator/** kosuke.takeuchi@tier4.jp takayuki.murooka@tier4.jp
planning/autoware_velocity_smoother/** fumiya.watanabe@tier4.jp makoto.kurihara@tier4.jp satoshi.ota@tier4.jp takamasa.horibe@tier4.jp
planning/behavior_path_goal_planner_module/** daniel.sanchez@tier4.jp kosuke.takeuchi@tier4.jp kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp
-planning/behavior_path_lane_change_module/** fumiya.watanabe@tier4.jp kosuke.takeuchi@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp
+planning/autoware_behavior_path_lane_change_module/** fumiya.watanabe@tier4.jp kosuke.takeuchi@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp
planning/behavior_path_planner/** fumiya.watanabe@tier4.jp go.sakayori@tier4.jp kosuke.takeuchi@tier4.jp kyoichi.sugahara@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp
planning/behavior_path_sampling_planner_module/** daniel.sanchez@tier4.jp maxime.clement@tier4.jp
planning/autoware_behavior_path_side_shift_module/** fumiya.watanabe@tier4.jp kyoichi.sugahara@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp
diff --git a/planning/.pages b/planning/.pages
index 48267f0e4ce6c..727bed582532c 100644
--- a/planning/.pages
+++ b/planning/.pages
@@ -13,7 +13,7 @@ nav:
- 'Avoidance by Lane Change': planning/autoware_behavior_path_avoidance_by_lane_change_module
- 'Dynamic Obstacle Avoidance': planning/autoware_behavior_path_dynamic_obstacle_avoidance_module
- 'Goal Planner': planning/behavior_path_goal_planner_module
- - 'Lane Change': planning/behavior_path_lane_change_module
+ - 'Lane Change': planning/autoware_behavior_path_lane_change_module
- 'Side Shift': planning/autoware_behavior_path_side_shift_module
- 'Start Planner': planning/autoware_behavior_path_start_planner_module
- 'Static Obstacle Avoidance': planning/autoware_behavior_path_static_obstacle_avoidance_module
diff --git a/planning/autoware_behavior_path_avoidance_by_lane_change_module/README.md b/planning/autoware_behavior_path_avoidance_by_lane_change_module/README.md
index 036de718ccde8..b7869fd4911a6 100644
--- a/planning/autoware_behavior_path_avoidance_by_lane_change_module/README.md
+++ b/planning/autoware_behavior_path_avoidance_by_lane_change_module/README.md
@@ -13,7 +13,7 @@ This module is designed as one of the obstacle avoidance features and generates
## Inner-workings / Algorithms
-Basically, this module is implemented by reusing the avoidance target filtering logic of the existing [Static Object Avoidance Module](../autoware_behavior_path_static_obstacle_avoidance_module/README.md) and the path generation logic of the [Normal Lane Change Module](../behavior_path_lane_change_module/README.md). On the other hand, the conditions under which the module is activated differ from those of a normal avoidance module.
+Basically, this module is implemented by reusing the avoidance target filtering logic of the existing [Static Object Avoidance Module](../autoware_behavior_path_static_obstacle_avoidance_module/README.md) and the path generation logic of the [Normal Lane Change Module](../autoware_behavior_path_lane_change_module/README.md). On the other hand, the conditions under which the module is activated differ from those of a normal avoidance module.
Check that the following conditions are satisfied after the filtering process for the avoidance target.
diff --git a/planning/autoware_behavior_path_avoidance_by_lane_change_module/package.xml b/planning/autoware_behavior_path_avoidance_by_lane_change_module/package.xml
index 3a75849931228..8b31637776ff0 100644
--- a/planning/autoware_behavior_path_avoidance_by_lane_change_module/package.xml
+++ b/planning/autoware_behavior_path_avoidance_by_lane_change_module/package.xml
@@ -18,10 +18,10 @@
autoware_cmake
eigen3_cmake_module
+ autoware_behavior_path_lane_change_module
autoware_behavior_path_planner_common
autoware_behavior_path_static_obstacle_avoidance_module
autoware_rtc_interface
- behavior_path_lane_change_module
behavior_path_planner
lanelet2_extension
motion_utils
diff --git a/planning/autoware_behavior_path_avoidance_by_lane_change_module/src/interface.hpp b/planning/autoware_behavior_path_avoidance_by_lane_change_module/src/interface.hpp
index 75413c4dccfa6..1c0ec2f5dd4ea 100644
--- a/planning/autoware_behavior_path_avoidance_by_lane_change_module/src/interface.hpp
+++ b/planning/autoware_behavior_path_avoidance_by_lane_change_module/src/interface.hpp
@@ -15,7 +15,7 @@
#ifndef INTERFACE_HPP_
#define INTERFACE_HPP_
-#include "behavior_path_lane_change_module/interface.hpp"
+#include "autoware_behavior_path_lane_change_module/interface.hpp"
#include "data_structs.hpp"
#include "scene.hpp"
diff --git a/planning/autoware_behavior_path_avoidance_by_lane_change_module/src/manager.hpp b/planning/autoware_behavior_path_avoidance_by_lane_change_module/src/manager.hpp
index f921aa4d7e31c..fc74eae5421b5 100644
--- a/planning/autoware_behavior_path_avoidance_by_lane_change_module/src/manager.hpp
+++ b/planning/autoware_behavior_path_avoidance_by_lane_change_module/src/manager.hpp
@@ -15,7 +15,7 @@
#ifndef MANAGER_HPP_
#define MANAGER_HPP_
-#include "behavior_path_lane_change_module/manager.hpp"
+#include "autoware_behavior_path_lane_change_module/manager.hpp"
#include "data_structs.hpp"
#include "interface.hpp"
diff --git a/planning/autoware_behavior_path_avoidance_by_lane_change_module/src/scene.cpp b/planning/autoware_behavior_path_avoidance_by_lane_change_module/src/scene.cpp
index 0647147dff0d0..ce4dab3c40309 100644
--- a/planning/autoware_behavior_path_avoidance_by_lane_change_module/src/scene.cpp
+++ b/planning/autoware_behavior_path_avoidance_by_lane_change_module/src/scene.cpp
@@ -20,8 +20,8 @@
#include "autoware_behavior_path_planner_common/utils/utils.hpp"
#include "autoware_behavior_path_static_obstacle_avoidance_module/utils.hpp"
+#include
#include
-#include
#include
#include
diff --git a/planning/autoware_behavior_path_avoidance_by_lane_change_module/src/scene.hpp b/planning/autoware_behavior_path_avoidance_by_lane_change_module/src/scene.hpp
index 6b39340da172a..540f3c5d0a68b 100644
--- a/planning/autoware_behavior_path_avoidance_by_lane_change_module/src/scene.hpp
+++ b/planning/autoware_behavior_path_avoidance_by_lane_change_module/src/scene.hpp
@@ -15,8 +15,8 @@
#ifndef SCENE_HPP_
#define SCENE_HPP_
+#include "autoware_behavior_path_lane_change_module/scene.hpp"
#include "autoware_behavior_path_static_obstacle_avoidance_module/helper.hpp"
-#include "behavior_path_lane_change_module/scene.hpp"
#include "data_structs.hpp"
#include
diff --git a/planning/autoware_behavior_path_avoidance_by_lane_change_module/test/test_behavior_path_planner_node_interface.cpp b/planning/autoware_behavior_path_avoidance_by_lane_change_module/test/test_behavior_path_planner_node_interface.cpp
index ea7979958e49e..1f2c2208a8719 100644
--- a/planning/autoware_behavior_path_avoidance_by_lane_change_module/test/test_behavior_path_planner_node_interface.cpp
+++ b/planning/autoware_behavior_path_avoidance_by_lane_change_module/test/test_behavior_path_planner_node_interface.cpp
@@ -49,7 +49,7 @@ std::shared_ptr generateNode()
const auto behavior_path_planner_dir =
ament_index_cpp::get_package_share_directory("behavior_path_planner");
const auto behavior_path_lane_change_module_dir =
- ament_index_cpp::get_package_share_directory("behavior_path_lane_change_module");
+ ament_index_cpp::get_package_share_directory("autoware_behavior_path_lane_change_module");
std::vector module_names;
module_names.emplace_back("autoware::behavior_path_planner::AvoidanceByLaneChangeModuleManager");
diff --git a/planning/autoware_behavior_path_external_request_lane_change_module/package.xml b/planning/autoware_behavior_path_external_request_lane_change_module/package.xml
index 9410be5a0011c..42b7c76387dea 100644
--- a/planning/autoware_behavior_path_external_request_lane_change_module/package.xml
+++ b/planning/autoware_behavior_path_external_request_lane_change_module/package.xml
@@ -18,9 +18,9 @@
autoware_cmake
eigen3_cmake_module
+ autoware_behavior_path_lane_change_module
autoware_behavior_path_planner_common
autoware_rtc_interface
- behavior_path_lane_change_module
behavior_path_planner
motion_utils
pluginlib
diff --git a/planning/autoware_behavior_path_external_request_lane_change_module/src/manager.cpp b/planning/autoware_behavior_path_external_request_lane_change_module/src/manager.cpp
index 130cbff29bcf3..baa26cbb38389 100644
--- a/planning/autoware_behavior_path_external_request_lane_change_module/src/manager.cpp
+++ b/planning/autoware_behavior_path_external_request_lane_change_module/src/manager.cpp
@@ -14,7 +14,7 @@
#include "manager.hpp"
-#include "behavior_path_lane_change_module/interface.hpp"
+#include "autoware_behavior_path_lane_change_module/interface.hpp"
#include "scene.hpp"
namespace autoware::behavior_path_planner
diff --git a/planning/autoware_behavior_path_external_request_lane_change_module/src/manager.hpp b/planning/autoware_behavior_path_external_request_lane_change_module/src/manager.hpp
index a4f3dce188c73..9a708a1573c78 100644
--- a/planning/autoware_behavior_path_external_request_lane_change_module/src/manager.hpp
+++ b/planning/autoware_behavior_path_external_request_lane_change_module/src/manager.hpp
@@ -15,7 +15,7 @@
#ifndef MANAGER_HPP_
#define MANAGER_HPP_
-#include "behavior_path_lane_change_module/manager.hpp"
+#include "autoware_behavior_path_lane_change_module/manager.hpp"
#include "route_handler/route_handler.hpp"
#include
diff --git a/planning/autoware_behavior_path_external_request_lane_change_module/src/scene.hpp b/planning/autoware_behavior_path_external_request_lane_change_module/src/scene.hpp
index d2eb20b048a5d..006482558ffa8 100644
--- a/planning/autoware_behavior_path_external_request_lane_change_module/src/scene.hpp
+++ b/planning/autoware_behavior_path_external_request_lane_change_module/src/scene.hpp
@@ -15,7 +15,7 @@
#ifndef SCENE_HPP_
#define SCENE_HPP_
-#include "behavior_path_lane_change_module/scene.hpp"
+#include "autoware_behavior_path_lane_change_module/scene.hpp"
#include
diff --git a/planning/autoware_behavior_path_external_request_lane_change_module/test/test_behavior_path_planner_node_interface.cpp b/planning/autoware_behavior_path_external_request_lane_change_module/test/test_behavior_path_planner_node_interface.cpp
index 201d01e9b7fa0..8e94ebeb61298 100644
--- a/planning/autoware_behavior_path_external_request_lane_change_module/test/test_behavior_path_planner_node_interface.cpp
+++ b/planning/autoware_behavior_path_external_request_lane_change_module/test/test_behavior_path_planner_node_interface.cpp
@@ -48,7 +48,7 @@ std::shared_ptr generateNode()
const auto behavior_path_planner_dir =
ament_index_cpp::get_package_share_directory("behavior_path_planner");
const auto behavior_path_lane_change_module_dir =
- ament_index_cpp::get_package_share_directory("behavior_path_lane_change_module");
+ ament_index_cpp::get_package_share_directory("autoware_behavior_path_lane_change_module");
std::vector module_names;
module_names.emplace_back(
diff --git a/planning/behavior_path_lane_change_module/CMakeLists.txt b/planning/autoware_behavior_path_lane_change_module/CMakeLists.txt
similarity index 92%
rename from planning/behavior_path_lane_change_module/CMakeLists.txt
rename to planning/autoware_behavior_path_lane_change_module/CMakeLists.txt
index e5bce68ebfa44..ac094dfe862fb 100644
--- a/planning/behavior_path_lane_change_module/CMakeLists.txt
+++ b/planning/autoware_behavior_path_lane_change_module/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
-project(behavior_path_lane_change_module)
+project(autoware_behavior_path_lane_change_module)
find_package(autoware_cmake REQUIRED)
autoware_package()
diff --git a/planning/behavior_path_lane_change_module/README.md b/planning/autoware_behavior_path_lane_change_module/README.md
similarity index 100%
rename from planning/behavior_path_lane_change_module/README.md
rename to planning/autoware_behavior_path_lane_change_module/README.md
diff --git a/planning/behavior_path_lane_change_module/config/lane_change.param.yaml b/planning/autoware_behavior_path_lane_change_module/config/lane_change.param.yaml
similarity index 100%
rename from planning/behavior_path_lane_change_module/config/lane_change.param.yaml
rename to planning/autoware_behavior_path_lane_change_module/config/lane_change.param.yaml
diff --git a/planning/behavior_path_lane_change_module/images/lane_change-abort.png b/planning/autoware_behavior_path_lane_change_module/images/lane_change-abort.png
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_change-abort.png
rename to planning/autoware_behavior_path_lane_change_module/images/lane_change-abort.png
diff --git a/planning/behavior_path_lane_change_module/images/lane_change-cancel.png b/planning/autoware_behavior_path_lane_change_module/images/lane_change-cancel.png
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_change-cancel.png
rename to planning/autoware_behavior_path_lane_change_module/images/lane_change-cancel.png
diff --git a/planning/behavior_path_lane_change_module/images/lane_change-candidate_path_samples.png b/planning/autoware_behavior_path_lane_change_module/images/lane_change-candidate_path_samples.png
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_change-candidate_path_samples.png
rename to planning/autoware_behavior_path_lane_change_module/images/lane_change-candidate_path_samples.png
diff --git a/planning/behavior_path_lane_change_module/images/lane_change-cant_cancel_no_abort.png b/planning/autoware_behavior_path_lane_change_module/images/lane_change-cant_cancel_no_abort.png
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_change-cant_cancel_no_abort.png
rename to planning/autoware_behavior_path_lane_change_module/images/lane_change-cant_cancel_no_abort.png
diff --git a/planning/behavior_path_lane_change_module/images/lane_change-debug-1.png b/planning/autoware_behavior_path_lane_change_module/images/lane_change-debug-1.png
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_change-debug-1.png
rename to planning/autoware_behavior_path_lane_change_module/images/lane_change-debug-1.png
diff --git a/planning/behavior_path_lane_change_module/images/lane_change-debug-2.png b/planning/autoware_behavior_path_lane_change_module/images/lane_change-debug-2.png
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_change-debug-2.png
rename to planning/autoware_behavior_path_lane_change_module/images/lane_change-debug-2.png
diff --git a/planning/behavior_path_lane_change_module/images/lane_change-debug-3.png b/planning/autoware_behavior_path_lane_change_module/images/lane_change-debug-3.png
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_change-debug-3.png
rename to planning/autoware_behavior_path_lane_change_module/images/lane_change-debug-3.png
diff --git a/planning/behavior_path_lane_change_module/images/lane_change-enable_collision_check_at_prepare_phase.png b/planning/autoware_behavior_path_lane_change_module/images/lane_change-enable_collision_check_at_prepare_phase.png
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_change-enable_collision_check_at_prepare_phase.png
rename to planning/autoware_behavior_path_lane_change_module/images/lane_change-enable_collision_check_at_prepare_phase.png
diff --git a/planning/behavior_path_lane_change_module/images/lane_change-intersection_case.png b/planning/autoware_behavior_path_lane_change_module/images/lane_change-intersection_case.png
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_change-intersection_case.png
rename to planning/autoware_behavior_path_lane_change_module/images/lane_change-intersection_case.png
diff --git a/planning/behavior_path_lane_change_module/images/lane_change-lane_change_phases.png b/planning/autoware_behavior_path_lane_change_module/images/lane_change-lane_change_phases.png
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_change-lane_change_phases.png
rename to planning/autoware_behavior_path_lane_change_module/images/lane_change-lane_change_phases.png
diff --git a/planning/behavior_path_lane_change_module/images/lane_change-lane_expansion-with.png b/planning/autoware_behavior_path_lane_change_module/images/lane_change-lane_expansion-with.png
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_change-lane_expansion-with.png
rename to planning/autoware_behavior_path_lane_change_module/images/lane_change-lane_expansion-with.png
diff --git a/planning/behavior_path_lane_change_module/images/lane_change-lane_expansion-without.png b/planning/autoware_behavior_path_lane_change_module/images/lane_change-lane_expansion-without.png
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_change-lane_expansion-without.png
rename to planning/autoware_behavior_path_lane_change_module/images/lane_change-lane_expansion-without.png
diff --git a/planning/behavior_path_lane_change_module/images/lane_change-stop_at_terminal.drawio.svg b/planning/autoware_behavior_path_lane_change_module/images/lane_change-stop_at_terminal.drawio.svg
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_change-stop_at_terminal.drawio.svg
rename to planning/autoware_behavior_path_lane_change_module/images/lane_change-stop_at_terminal.drawio.svg
diff --git a/planning/behavior_path_lane_change_module/images/lane_change-stop_at_terminal_no_block.drawio.svg b/planning/autoware_behavior_path_lane_change_module/images/lane_change-stop_at_terminal_no_block.drawio.svg
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_change-stop_at_terminal_no_block.drawio.svg
rename to planning/autoware_behavior_path_lane_change_module/images/lane_change-stop_at_terminal_no_block.drawio.svg
diff --git a/planning/behavior_path_lane_change_module/images/lane_change-stop_far_from_target_lane.drawio.svg b/planning/autoware_behavior_path_lane_change_module/images/lane_change-stop_far_from_target_lane.drawio.svg
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_change-stop_far_from_target_lane.drawio.svg
rename to planning/autoware_behavior_path_lane_change_module/images/lane_change-stop_far_from_target_lane.drawio.svg
diff --git a/planning/behavior_path_lane_change_module/images/lane_change-stop_not_at_terminal.drawio.svg b/planning/autoware_behavior_path_lane_change_module/images/lane_change-stop_not_at_terminal.drawio.svg
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_change-stop_not_at_terminal.drawio.svg
rename to planning/autoware_behavior_path_lane_change_module/images/lane_change-stop_not_at_terminal.drawio.svg
diff --git a/planning/behavior_path_lane_change_module/images/lane_change-stop_not_at_terminal_no_blocking_object.drawio.svg b/planning/autoware_behavior_path_lane_change_module/images/lane_change-stop_not_at_terminal_no_blocking_object.drawio.svg
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_change-stop_not_at_terminal_no_blocking_object.drawio.svg
rename to planning/autoware_behavior_path_lane_change_module/images/lane_change-stop_not_at_terminal_no_blocking_object.drawio.svg
diff --git a/planning/behavior_path_lane_change_module/images/lane_change-when_cannot_change_lanes.png b/planning/autoware_behavior_path_lane_change_module/images/lane_change-when_cannot_change_lanes.png
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_change-when_cannot_change_lanes.png
rename to planning/autoware_behavior_path_lane_change_module/images/lane_change-when_cannot_change_lanes.png
diff --git a/planning/behavior_path_lane_change_module/images/lane_change.drawio.svg b/planning/autoware_behavior_path_lane_change_module/images/lane_change.drawio.svg
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_change.drawio.svg
rename to planning/autoware_behavior_path_lane_change_module/images/lane_change.drawio.svg
diff --git a/planning/behavior_path_lane_change_module/images/lane_objects.drawio.svg b/planning/autoware_behavior_path_lane_change_module/images/lane_objects.drawio.svg
similarity index 100%
rename from planning/behavior_path_lane_change_module/images/lane_objects.drawio.svg
rename to planning/autoware_behavior_path_lane_change_module/images/lane_objects.drawio.svg
diff --git a/planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/interface.hpp b/planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/interface.hpp
similarity index 90%
rename from planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/interface.hpp
rename to planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/interface.hpp
index cb23d82f2d60a..d2ad97d51744a 100644
--- a/planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/interface.hpp
+++ b/planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/interface.hpp
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef BEHAVIOR_PATH_LANE_CHANGE_MODULE__INTERFACE_HPP_
-#define BEHAVIOR_PATH_LANE_CHANGE_MODULE__INTERFACE_HPP_
+#ifndef AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__INTERFACE_HPP_
+#define AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__INTERFACE_HPP_
+#include "autoware_behavior_path_lane_change_module/scene.hpp"
+#include "autoware_behavior_path_lane_change_module/utils/base_class.hpp"
+#include "autoware_behavior_path_lane_change_module/utils/data_structs.hpp"
+#include "autoware_behavior_path_lane_change_module/utils/path.hpp"
#include "autoware_behavior_path_planner_common/interface/scene_module_interface.hpp"
#include "autoware_behavior_path_planner_common/turn_signal_decider.hpp"
#include "autoware_behavior_path_planner_common/utils/path_shifter/path_shifter.hpp"
-#include "behavior_path_lane_change_module/scene.hpp"
-#include "behavior_path_lane_change_module/utils/base_class.hpp"
-#include "behavior_path_lane_change_module/utils/data_structs.hpp"
-#include "behavior_path_lane_change_module/utils/path.hpp"
#include
@@ -156,4 +156,4 @@ class LaneChangeInterface : public SceneModuleInterface
};
} // namespace behavior_path_planner
-#endif // BEHAVIOR_PATH_LANE_CHANGE_MODULE__INTERFACE_HPP_
+#endif // AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__INTERFACE_HPP_
diff --git a/planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/manager.hpp b/planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/manager.hpp
similarity index 88%
rename from planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/manager.hpp
rename to planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/manager.hpp
index 0430d5a8ad89d..42ea99e705f9a 100644
--- a/planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/manager.hpp
+++ b/planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/manager.hpp
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef BEHAVIOR_PATH_LANE_CHANGE_MODULE__MANAGER_HPP_
-#define BEHAVIOR_PATH_LANE_CHANGE_MODULE__MANAGER_HPP_
+#ifndef AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__MANAGER_HPP_
+#define AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__MANAGER_HPP_
+#include "autoware_behavior_path_lane_change_module/utils/data_structs.hpp"
#include "autoware_behavior_path_planner_common/interface/scene_module_manager_interface.hpp"
-#include "behavior_path_lane_change_module/utils/data_structs.hpp"
#include "route_handler/route_handler.hpp"
#include
@@ -75,4 +75,4 @@ class LaneChangeLeftModuleManager : public LaneChangeModuleManager
};
} // namespace behavior_path_planner
-#endif // BEHAVIOR_PATH_LANE_CHANGE_MODULE__MANAGER_HPP_
+#endif // AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__MANAGER_HPP_
diff --git a/planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/scene.hpp b/planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/scene.hpp
similarity index 95%
rename from planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/scene.hpp
rename to planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/scene.hpp
index b66437f4cff0e..3c104b53b8232 100644
--- a/planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/scene.hpp
+++ b/planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/scene.hpp
@@ -11,11 +11,11 @@
// 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.
-#ifndef BEHAVIOR_PATH_LANE_CHANGE_MODULE__SCENE_HPP_
-#define BEHAVIOR_PATH_LANE_CHANGE_MODULE__SCENE_HPP_
+#ifndef AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__SCENE_HPP_
+#define AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__SCENE_HPP_
-#include "behavior_path_lane_change_module/utils/base_class.hpp"
-#include "behavior_path_lane_change_module/utils/data_structs.hpp"
+#include "autoware_behavior_path_lane_change_module/utils/base_class.hpp"
+#include "autoware_behavior_path_lane_change_module/utils/data_structs.hpp"
#include
#include
@@ -205,4 +205,4 @@ class NormalLaneChange : public LaneChangeBase
double stop_time_{0.0};
};
} // namespace behavior_path_planner
-#endif // BEHAVIOR_PATH_LANE_CHANGE_MODULE__SCENE_HPP_
+#endif // AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__SCENE_HPP_
diff --git a/planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/base_class.hpp b/planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/base_class.hpp
similarity index 94%
rename from planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/base_class.hpp
rename to planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/base_class.hpp
index f34d8a867e4ca..e5710c197d1fd 100644
--- a/planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/base_class.hpp
+++ b/planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/base_class.hpp
@@ -11,16 +11,16 @@
// 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.
-#ifndef BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__BASE_CLASS_HPP_
-#define BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__BASE_CLASS_HPP_
+#ifndef AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__BASE_CLASS_HPP_
+#define AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__BASE_CLASS_HPP_
+#include "autoware_behavior_path_lane_change_module/utils/data_structs.hpp"
+#include "autoware_behavior_path_lane_change_module/utils/debug_structs.hpp"
+#include "autoware_behavior_path_lane_change_module/utils/path.hpp"
+#include "autoware_behavior_path_lane_change_module/utils/utils.hpp"
#include "autoware_behavior_path_planner_common/interface/scene_module_interface.hpp"
#include "autoware_behavior_path_planner_common/turn_signal_decider.hpp"
#include "autoware_behavior_path_planner_common/utils/path_shifter/path_shifter.hpp"
-#include "behavior_path_lane_change_module/utils/data_structs.hpp"
-#include "behavior_path_lane_change_module/utils/debug_structs.hpp"
-#include "behavior_path_lane_change_module/utils/path.hpp"
-#include "behavior_path_lane_change_module/utils/utils.hpp"
#include "tier4_autoware_utils/system/stop_watch.hpp"
#include
@@ -239,4 +239,4 @@ class LaneChangeBase
mutable rclcpp::Clock clock_{RCL_ROS_TIME};
};
} // namespace behavior_path_planner
-#endif // BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__BASE_CLASS_HPP_
+#endif // AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__BASE_CLASS_HPP_
diff --git a/planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/data_structs.hpp b/planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/data_structs.hpp
similarity index 96%
rename from planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/data_structs.hpp
rename to planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/data_structs.hpp
index 43a2a3b5836e6..9e5b45cf79e3f 100644
--- a/planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/data_structs.hpp
+++ b/planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/data_structs.hpp
@@ -11,8 +11,8 @@
// 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.
-#ifndef BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DATA_STRUCTS_HPP_
-#define BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DATA_STRUCTS_HPP_
+#ifndef AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DATA_STRUCTS_HPP_
+#define AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DATA_STRUCTS_HPP_
#include "autoware_behavior_path_planner_common/utils/path_safety_checker/path_safety_checker_parameters.hpp"
#include "autoware_behavior_path_planner_common/utils/path_shifter/path_shifter.hpp"
@@ -226,4 +226,4 @@ struct LanesPolygon
};
} // namespace behavior_path_planner::data::lane_change
-#endif // BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DATA_STRUCTS_HPP_
+#endif // AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DATA_STRUCTS_HPP_
diff --git a/planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/debug_structs.hpp b/planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/debug_structs.hpp
similarity index 87%
rename from planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/debug_structs.hpp
rename to planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/debug_structs.hpp
index 93e45888005a6..3fe1a6c7de9ee 100644
--- a/planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/debug_structs.hpp
+++ b/planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/debug_structs.hpp
@@ -11,11 +11,11 @@
// 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.
-#ifndef BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DEBUG_STRUCTS_HPP_
-#define BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DEBUG_STRUCTS_HPP_
+#ifndef AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DEBUG_STRUCTS_HPP_
+#define AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DEBUG_STRUCTS_HPP_
-#include "behavior_path_lane_change_module/utils/data_structs.hpp"
-#include "behavior_path_lane_change_module/utils/path.hpp"
+#include "autoware_behavior_path_lane_change_module/utils/data_structs.hpp"
+#include "autoware_behavior_path_lane_change_module/utils/path.hpp"
#include
@@ -73,4 +73,4 @@ struct Debug
};
} // namespace behavior_path_planner::data::lane_change
-#endif // BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DEBUG_STRUCTS_HPP_
+#endif // AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DEBUG_STRUCTS_HPP_
diff --git a/planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/markers.hpp b/planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/markers.hpp
similarity index 85%
rename from planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/markers.hpp
rename to planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/markers.hpp
index 2b1b226e30779..87961e5a06aa5 100644
--- a/planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/markers.hpp
+++ b/planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/markers.hpp
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__MARKERS_HPP_
-#define BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__MARKERS_HPP_
+#ifndef AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__MARKERS_HPP_
+#define AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__MARKERS_HPP_
+#include "autoware_behavior_path_lane_change_module/utils/debug_structs.hpp"
+#include "autoware_behavior_path_lane_change_module/utils/path.hpp"
#include "autoware_behavior_path_planner_common/utils/path_safety_checker/path_safety_checker_parameters.hpp"
-#include "behavior_path_lane_change_module/utils/debug_structs.hpp"
-#include "behavior_path_lane_change_module/utils/path.hpp"
#include
#include
@@ -48,4 +48,4 @@ MarkerArray createDebugMarkerArray(
const Debug & debug_data, const geometry_msgs::msg::Pose & ego_pose);
} // namespace marker_utils::lane_change_markers
-#endif // BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__MARKERS_HPP_
+#endif // AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__MARKERS_HPP_
diff --git a/planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/path.hpp b/planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/path.hpp
similarity index 84%
rename from planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/path.hpp
rename to planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/path.hpp
index 1c43559601e19..1b961f1f5a21b 100644
--- a/planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/path.hpp
+++ b/planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/path.hpp
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__PATH_HPP_
-#define BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__PATH_HPP_
+#ifndef AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__PATH_HPP_
+#define AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__PATH_HPP_
+#include "autoware_behavior_path_lane_change_module/utils/data_structs.hpp"
#include "autoware_behavior_path_planner_common/turn_signal_decider.hpp"
#include "autoware_behavior_path_planner_common/utils/path_shifter/path_shifter.hpp"
-#include "behavior_path_lane_change_module/utils/data_structs.hpp"
#include
@@ -50,4 +50,4 @@ struct LaneChangeStatus
};
} // namespace behavior_path_planner
-#endif // BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__PATH_HPP_
+#endif // AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__PATH_HPP_
diff --git a/planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/utils.hpp b/planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/utils.hpp
similarity index 97%
rename from planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/utils.hpp
rename to planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/utils.hpp
index a7f65f82f4e9e..ee4a7833314d4 100644
--- a/planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/utils.hpp
+++ b/planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/utils.hpp
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__UTILS_HPP_
-#define BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__UTILS_HPP_
+#ifndef AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__UTILS_HPP_
+#define AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__UTILS_HPP_
+#include "autoware_behavior_path_lane_change_module/utils/data_structs.hpp"
+#include "autoware_behavior_path_lane_change_module/utils/path.hpp"
#include "autoware_behavior_path_planner_common/parameters.hpp"
#include "autoware_behavior_path_planner_common/utils/path_safety_checker/path_safety_checker_parameters.hpp"
#include "autoware_behavior_path_planner_common/utils/utils.hpp"
-#include "behavior_path_lane_change_module/utils/data_structs.hpp"
-#include "behavior_path_lane_change_module/utils/path.hpp"
#include "rclcpp/logger.hpp"
#include
@@ -308,4 +308,4 @@ geometry_msgs::msg::Polygon createExecutionArea(
double additional_lon_offset, double additional_lat_offset);
} // namespace behavior_path_planner::utils::lane_change::debug
-#endif // BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__UTILS_HPP_
+#endif // AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__UTILS_HPP_
diff --git a/planning/behavior_path_lane_change_module/package.xml b/planning/autoware_behavior_path_lane_change_module/package.xml
similarity index 91%
rename from planning/behavior_path_lane_change_module/package.xml
rename to planning/autoware_behavior_path_lane_change_module/package.xml
index 23fc8f61af2f3..7ccdf804945bd 100644
--- a/planning/behavior_path_lane_change_module/package.xml
+++ b/planning/autoware_behavior_path_lane_change_module/package.xml
@@ -1,9 +1,9 @@
- behavior_path_lane_change_module
+ autoware_behavior_path_lane_change_module
0.1.0
- The behavior_path_lane_change_module package
+ The autoware_behavior_path_lane_change_module package
Fumiya Watanabe
Satoshi Ota
diff --git a/planning/autoware_behavior_path_lane_change_module/plugins.xml b/planning/autoware_behavior_path_lane_change_module/plugins.xml
new file mode 100644
index 0000000000000..d0452897e6f94
--- /dev/null
+++ b/planning/autoware_behavior_path_lane_change_module/plugins.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/planning/behavior_path_lane_change_module/src/interface.cpp b/planning/autoware_behavior_path_lane_change_module/src/interface.cpp
similarity index 98%
rename from planning/behavior_path_lane_change_module/src/interface.cpp
rename to planning/autoware_behavior_path_lane_change_module/src/interface.cpp
index 92d7a29f1983b..644368eaa970b 100644
--- a/planning/behavior_path_lane_change_module/src/interface.cpp
+++ b/planning/autoware_behavior_path_lane_change_module/src/interface.cpp
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "behavior_path_lane_change_module/interface.hpp"
+#include "autoware_behavior_path_lane_change_module/interface.hpp"
+#include "autoware_behavior_path_lane_change_module/utils/markers.hpp"
+#include "autoware_behavior_path_lane_change_module/utils/utils.hpp"
#include "autoware_behavior_path_planner_common/interface/scene_module_interface.hpp"
#include "autoware_behavior_path_planner_common/interface/scene_module_visitor.hpp"
#include "autoware_behavior_path_planner_common/marker_utils/utils.hpp"
-#include "behavior_path_lane_change_module/utils/markers.hpp"
-#include "behavior_path_lane_change_module/utils/utils.hpp"
#include
diff --git a/planning/behavior_path_lane_change_module/src/manager.cpp b/planning/autoware_behavior_path_lane_change_module/src/manager.cpp
similarity index 99%
rename from planning/behavior_path_lane_change_module/src/manager.cpp
rename to planning/autoware_behavior_path_lane_change_module/src/manager.cpp
index 81d4b86afa094..d284b7c421f94 100644
--- a/planning/behavior_path_lane_change_module/src/manager.cpp
+++ b/planning/autoware_behavior_path_lane_change_module/src/manager.cpp
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "behavior_path_lane_change_module/manager.hpp"
+#include "autoware_behavior_path_lane_change_module/manager.hpp"
-#include "behavior_path_lane_change_module/interface.hpp"
+#include "autoware_behavior_path_lane_change_module/interface.hpp"
#include "tier4_autoware_utils/ros/parameter.hpp"
#include "tier4_autoware_utils/ros/update_param.hpp"
diff --git a/planning/behavior_path_lane_change_module/src/scene.cpp b/planning/autoware_behavior_path_lane_change_module/src/scene.cpp
similarity index 99%
rename from planning/behavior_path_lane_change_module/src/scene.cpp
rename to planning/autoware_behavior_path_lane_change_module/src/scene.cpp
index 69beca9804e08..7b16a910b684c 100644
--- a/planning/behavior_path_lane_change_module/src/scene.cpp
+++ b/planning/autoware_behavior_path_lane_change_module/src/scene.cpp
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "behavior_path_lane_change_module/scene.hpp"
+#include "autoware_behavior_path_lane_change_module/scene.hpp"
+#include "autoware_behavior_path_lane_change_module/utils/utils.hpp"
#include "autoware_behavior_path_planner_common/utils/drivable_area_expansion/static_drivable_area.hpp"
#include "autoware_behavior_path_planner_common/utils/path_safety_checker/objects_filtering.hpp"
#include "autoware_behavior_path_planner_common/utils/path_safety_checker/safety_check.hpp"
#include "autoware_behavior_path_planner_common/utils/path_utils.hpp"
#include "autoware_behavior_path_planner_common/utils/traffic_light_utils.hpp"
#include "autoware_behavior_path_planner_common/utils/utils.hpp"
-#include "behavior_path_lane_change_module/utils/utils.hpp"
#include
#include
diff --git a/planning/behavior_path_lane_change_module/src/utils/markers.cpp b/planning/autoware_behavior_path_lane_change_module/src/utils/markers.cpp
similarity index 99%
rename from planning/behavior_path_lane_change_module/src/utils/markers.cpp
rename to planning/autoware_behavior_path_lane_change_module/src/utils/markers.cpp
index 8a505ddf47984..2306eef90e61d 100644
--- a/planning/behavior_path_lane_change_module/src/utils/markers.cpp
+++ b/planning/autoware_behavior_path_lane_change_module/src/utils/markers.cpp
@@ -16,7 +16,7 @@
#include "autoware_behavior_path_planner_common/marker_utils/utils.hpp"
#include "autoware_behavior_path_planner_common/utils/path_shifter/path_shifter.hpp"
-#include
+#include
#include
#include
diff --git a/planning/behavior_path_lane_change_module/src/utils/utils.cpp b/planning/autoware_behavior_path_lane_change_module/src/utils/utils.cpp
similarity index 99%
rename from planning/behavior_path_lane_change_module/src/utils/utils.cpp
rename to planning/autoware_behavior_path_lane_change_module/src/utils/utils.cpp
index 2fafd7c41d4a3..13df94b8766ad 100644
--- a/planning/behavior_path_lane_change_module/src/utils/utils.cpp
+++ b/planning/autoware_behavior_path_lane_change_module/src/utils/utils.cpp
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "behavior_path_lane_change_module/utils/utils.hpp"
+#include "autoware_behavior_path_lane_change_module/utils/utils.hpp"
+#include "autoware_behavior_path_lane_change_module/utils/data_structs.hpp"
+#include "autoware_behavior_path_lane_change_module/utils/path.hpp"
#include "autoware_behavior_path_planner_common/marker_utils/utils.hpp"
#include "autoware_behavior_path_planner_common/parameters.hpp"
#include "autoware_behavior_path_planner_common/utils/path_safety_checker/safety_check.hpp"
#include "autoware_behavior_path_planner_common/utils/path_shifter/path_shifter.hpp"
#include "autoware_behavior_path_planner_common/utils/path_utils.hpp"
#include "autoware_behavior_path_planner_common/utils/utils.hpp"
-#include "behavior_path_lane_change_module/utils/data_structs.hpp"
-#include "behavior_path_lane_change_module/utils/path.hpp"
#include "object_recognition_utils/predicted_path_utils.hpp"
#include "tier4_autoware_utils/math/unit_conversion.hpp"
diff --git a/planning/behavior_path_lane_change_module/test/test_behavior_path_planner_node_interface.cpp b/planning/autoware_behavior_path_lane_change_module/test/test_behavior_path_planner_node_interface.cpp
similarity index 98%
rename from planning/behavior_path_lane_change_module/test/test_behavior_path_planner_node_interface.cpp
rename to planning/autoware_behavior_path_lane_change_module/test/test_behavior_path_planner_node_interface.cpp
index 7b36bf475646b..71ee395712474 100644
--- a/planning/behavior_path_lane_change_module/test/test_behavior_path_planner_node_interface.cpp
+++ b/planning/autoware_behavior_path_lane_change_module/test/test_behavior_path_planner_node_interface.cpp
@@ -48,7 +48,7 @@ std::shared_ptr generateNode()
const auto behavior_path_planner_dir =
ament_index_cpp::get_package_share_directory("behavior_path_planner");
const auto behavior_path_lane_change_module_dir =
- ament_index_cpp::get_package_share_directory("behavior_path_lane_change_module");
+ ament_index_cpp::get_package_share_directory("autoware_behavior_path_lane_change_module");
std::vector module_names;
module_names.emplace_back("behavior_path_planner::LaneChangeRightModuleManager");
diff --git a/planning/behavior_path_lane_change_module/test/test_lane_change_utils.cpp b/planning/autoware_behavior_path_lane_change_module/test/test_lane_change_utils.cpp
similarity index 97%
rename from planning/behavior_path_lane_change_module/test/test_lane_change_utils.cpp
rename to planning/autoware_behavior_path_lane_change_module/test/test_lane_change_utils.cpp
index 1f90114df8045..27a025758daaf 100644
--- a/planning/behavior_path_lane_change_module/test/test_lane_change_utils.cpp
+++ b/planning/autoware_behavior_path_lane_change_module/test/test_lane_change_utils.cpp
@@ -11,7 +11,7 @@
// 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 "behavior_path_lane_change_module/utils/data_structs.hpp"
+#include "autoware_behavior_path_lane_change_module/utils/data_structs.hpp"
#include
#include
diff --git a/planning/behavior_path_lane_change_module/plugins.xml b/planning/behavior_path_lane_change_module/plugins.xml
deleted file mode 100644
index 7df36919d8d54..0000000000000
--- a/planning/behavior_path_lane_change_module/plugins.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/planning/behavior_path_planner/README.md b/planning/behavior_path_planner/README.md
index 70190731ac1a7..a17e1aee89557 100644
--- a/planning/behavior_path_planner/README.md
+++ b/planning/behavior_path_planner/README.md
@@ -30,7 +30,7 @@ Behavior Path Planner has following scene modules
| Static Obstacle Avoidance | this module generates avoidance path when there is objects that should be avoid. | [LINK](../autoware_behavior_path_static_obstacle_avoidance_module/README.md) |
| Dynamic Obstacle Avoidance | WIP | [LINK](../autoware_behavior_path_dynamic_obstacle_avoidance_module/README.md) |
| Avoidance By Lane Change | this module generates lane change path when there is objects that should be avoid. | [LINK](../behavior_path_avoidance_by_lane_change_module/README.md) |
-| Lane Change | this module is performed when it is necessary and a collision check with other vehicles is cleared. | [LINK](../behavior_path_lane_change_module/README.md) |
+| Lane Change | this module is performed when it is necessary and a collision check with other vehicles is cleared. | [LINK](../autoware_behavior_path_lane_change_module/README.md) |
| External Lane Change | WIP | LINK |
| Goal Planner | this module is performed when ego-vehicle is in the road lane and goal is in the shoulder lane. ego-vehicle will stop at the goal. | [LINK](../behavior_path_goal_planner_module/README.md) |
| Start Planner | this module is performed when ego-vehicle is stationary and footprint of ego-vehicle is included in shoulder lane. This module ends when ego-vehicle merges into the road. | [LINK](../autoware_behavior_path_start_planner_module/README.md) |