diff --git a/README.md b/README.md
index 88cad91a..3837e09e 100644
--- a/README.md
+++ b/README.md
@@ -173,16 +173,16 @@ Specific topic(s) can be generated and published according to the given inferenc
|Inference|Published Topic|
|---|---|
|People Detection|```/ros2_openvino_toolkit/face_detection```([object_msgs:msg:ObjectsInBoxes](https://github.com/intel/ros2_object_msgs/blob/master/msg/ObjectsInBoxes.msg))|
-|Emotion Recognition|```/ros2_openvino_toolkit/emotions_recognition```([people_msgs:msg:EmotionsStamped](../../../people_msgs/msg/EmotionsStamped.msg))|
-|Age and Gender Recognition|```/ros2_openvino_toolkit/age_genders_Recognition```([people_msgs:msg:AgeGenderStamped](../../../people_msgs/msg/AgeGenderStamped.msg))|
-|Head Pose Estimation|```/ros2_openvino_toolkit/headposes_estimation```([people_msgs:msg:HeadPoseStamped](../../../people_msgs/msg/HeadPoseStamped.msg))|
+|Emotion Recognition|```/ros2_openvino_toolkit/emotions_recognition```([openvino_people_msgs:msg:EmotionsStamped](../../../openvino_people_msgs/msg/EmotionsStamped.msg))|
+|Age and Gender Recognition|```/ros2_openvino_toolkit/age_genders_Recognition```([openvino_people_msgs:msg:AgeGenderStamped](../../../openvino_people_msgs/msg/AgeGenderStamped.msg))|
+|Head Pose Estimation|```/ros2_openvino_toolkit/headposes_estimation```([openvino_people_msgs:msg:HeadPoseStamped](../../../openvino_people_msgs/msg/HeadPoseStamped.msg))|
|Object Detection|```/ros2_openvino_toolkit/detected_objects```([object_msgs::msg::ObjectsInBoxes](https://github.com/intel/ros2_object_msgs/blob/master/msg/ObjectsInBoxes.msg))|
-|Object Segmentation|```/ros2_openvino_toolkit/segmented_obejcts```([people_msgs::msg::ObjectsInMasks](../../../people_msgs/msg/ObjectsInMasks.msg))|
-|Object Segmentation Maskrcnn|```/ros2_openvino_toolkit/segmented_obejcts```([people_msgs::msg::ObjectsInMasks](../../../people_msgs/msg/ObjectsInMasks.msg))|
-|Person Reidentification|```/ros2_openvino_toolkit/reidentified_persons```([people_msgs::msg::ReidentificationStamped](../../../people_msgs/msg/ReidentificationStamped.msg))|
-|Face Reidenfication|```/ros2_openvino_toolkit/reidentified_faces```([people_msgs::msg::ReidentificationStamped](../../../people_msgs/msg/ReidentificationStamped.msg))|
-|Vehicle Detection|```/ros2_openvino_toolkit/detected_vehicles_attribs```([people_msgs::msg::VehicleAttribsStamped](../../../people_msgs/msg/PersonAttributeStamped.msg))|
-|Vehicle License Detection|```/ros2_openvino_toolkit/detected_license_plates```([people_msgs::msg::LicensePlateStamped](../../../people_msgs/msg/LicensePlateStamped.msg))|
+|Object Segmentation|```/ros2_openvino_toolkit/segmented_obejcts```([openvino_people_msgs::msg::ObjectsInMasks](../../../openvino_people_msgs/msg/ObjectsInMasks.msg))|
+|Object Segmentation Maskrcnn|```/ros2_openvino_toolkit/segmented_obejcts```([openvino_people_msgs::msg::ObjectsInMasks](../../../openvino_people_msgs/msg/ObjectsInMasks.msg))|
+|Person Reidentification|```/ros2_openvino_toolkit/reidentified_persons```([openvino_people_msgs::msg::ReidentificationStamped](../../../openvino_people_msgs/msg/ReidentificationStamped.msg))|
+|Face Reidenfication|```/ros2_openvino_toolkit/reidentified_faces```([openvino_people_msgs::msg::ReidentificationStamped](../../../openvino_people_msgs/msg/ReidentificationStamped.msg))|
+|Vehicle Detection|```/ros2_openvino_toolkit/detected_vehicles_attribs```([openvino_people_msgs::msg::VehicleAttribsStamped](../../../openvino_people_msgs/msg/PersonAttributeStamped.msg))|
+|Vehicle License Detection|```/ros2_openvino_toolkit/detected_license_plates```([openvino_people_msgs::msg::LicensePlateStamped](../../../openvino_people_msgs/msg/LicensePlateStamped.msg))|
@@ -197,9 +197,9 @@ Several ROS2 Services are created, expecting to be used in client/server mode, e
|---|---|
|Object Detection Service|```/detect_object```([object_msgs::srv::DetectObject](https://github.com/intel/ros2_object_msgs/blob/master/srv/DetectObject.srv))|
|Face Detection Service|```/detect_face```([object_msgs::srv::DetectObject](https://github.com/intel/ros2_object_msgs/blob/master/srv/DetectObject.srv))|
-|Age Gender Detection Service|```/detect_age_gender```([people_msgs::srv::AgeGender](./people_msgs/srv/AgeGenderSrv.srv))|
-|Headpose Detection Service|```/detect_head_pose```([people_msgs::srv::HeadPose](./people_msgs/srv/HeadPoseSrv.srv))|
-|Emotion Detection Service|```/detect_emotion```([people_msgs::srv::Emotion](./people_msgs/srv/EmotionSrv.srv))|
+|Age Gender Detection Service|```/detect_age_gender```([openvino_people_msgs::srv::AgeGender](./openvino_people_msgs/srv/AgeGenderSrv.srv))|
+|Headpose Detection Service|```/detect_head_pose```([openvino_people_msgs::srv::HeadPose](./openvino_people_msgs/srv/HeadPoseSrv.srv))|
+|Emotion Detection Service|```/detect_emotion```([openvino_people_msgs::srv::Emotion](./openvino_people_msgs/srv/EmotionSrv.srv))|
diff --git a/doc/quick_start/getting_started_with_ros2_ov2.0.md b/doc/quick_start/getting_started_with_ros2_ov2.0.md
index 13b2f4c4..b6ee87bd 100644
--- a/doc/quick_start/getting_started_with_ros2_ov2.0.md
+++ b/doc/quick_start/getting_started_with_ros2_ov2.0.md
@@ -105,31 +105,31 @@ sudo cp ~/catkin_ws/src/ros2_openvino_toolkit/data/labels/object_detection/vehic
* Check the parameter configuration in ros2_openvino_toolkit/sample/param/xxxx.yaml before lauching, make sure parameters such as model_path, label_path and input_path are set correctly. Please refer to the quick start document for [yaml configuration guidance](./yaml_configuration_guide.md) for detailed configuration guidance.
* run face detection sample code input from StandardCamera.
```
- ros2 launch dynamic_vino_sample pipeline_people.launch.py
+ ros2 launch openvino_node pipeline_people.launch.py
```
* run person reidentification sample code input from StandardCamera.
```
- ros2 launch dynamic_vino_sample pipeline_reidentification.launch.py
+ ros2 launch openvino_node pipeline_reidentification.launch.py
```
* run person face reidentification sample code input from RealSenseCamera.
```
- ros2 launch dynamic_vino_sample pipeline_face_reidentification.launch.py
+ ros2 launch openvino_node pipeline_face_reidentification.launch.py
```
* run face detection sample code input from Image.
```
- ros2 launch dynamic_vino_sample pipeline_image.launch.py
+ ros2 launch openvino_node pipeline_image.launch.py
```
* run object segmentation sample code input from RealSenseCameraTopic.
```
- ros2 launch dynamic_vino_sample pipeline_segmentation.launch.py
+ ros2 launch openvino_node pipeline_segmentation.launch.py
```
* run vehicle detection sample code input from StandardCamera.
```
- ros2 launch dynamic_vino_sample pipeline_vehicle_detection.launch.py
+ ros2 launch openvino_node pipeline_vehicle_detection.launch.py
```
* run person attributes sample code input from StandardCamera.
```
- ros2 launch dynamic_vino_sample pipeline_person_attributes.launch.py
+ ros2 launch openvino_node pipeline_person_attributes.launch.py
```
# More Information
diff --git a/docker/docker_instructions_ov2.0.md b/docker/docker_instructions_ov2.0.md
index 265fc9cb..1fc9e078 100644
--- a/docker/docker_instructions_ov2.0.md
+++ b/docker/docker_instructions_ov2.0.md
@@ -97,35 +97,35 @@ sudo cp ~/catkin_ws/src/ros2_openvino_toolkit/data/labels/object_detection/vehic
* Check the parameter configuration in ros2_openvino_toolkit/sample/param/xxxx.yaml before lauching, make sure parameters such as model_path, label_path and input_path are set correctly. Please refer to the quick start document for [yaml configuration guidance](../doc/quick_start/yaml_configuration_guide.md) for detailed configuration guidance.
* run face detection sample code input from StandardCamera.
```
- ros2 launch dynamic_vino_sample pipeline_people.launch.py
+ ros2 launch openvino_node pipeline_people.launch.py
```
* run person reidentification sample code input from StandardCamera.
```
- ros2 launch dynamic_vino_sample pipeline_reidentification.launch.py
+ ros2 launch openvino_node pipeline_reidentification.launch.py
```
* run person face reidentification sample code input from RealSenseCamera.
```
- ros2 launch dynamic_vino_sample pipeline_face_reidentification.launch.py
+ ros2 launch openvino_node pipeline_face_reidentification.launch.py
```
* run face detection sample code input from Image.
```
- ros2 launch dynamic_vino_sample pipeline_image.launch.py
+ ros2 launch openvino_node pipeline_image.launch.py
```
* run object segmentation sample code input from RealSenseCameraTopic.
```
- ros2 launch dynamic_vino_sample pipeline_segmentation.launch.py
+ ros2 launch openvino_node pipeline_segmentation.launch.py
```
* run object segmentation sample code input from Image.
```
- ros2 launch dynamic_vino_sample pipeline_segmentation_image.launch.py
+ ros2 launch openvino_node pipeline_segmentation_image.launch.py
```
* run vehicle detection sample code input from StandardCamera.
```
- ros2 launch dynamic_vino_sample pipeline_vehicle_detection.launch.py
+ ros2 launch openvino_node pipeline_vehicle_detection.launch.py
```
* run person attributes sample code input from StandardCamera.
```
- ros2 launch dynamic_vino_sample pipeline_person_attributes.launch.py
+ ros2 launch openvino_node pipeline_person_attributes.launch.py
```
# More Information
diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_topic_output.hpp b/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_topic_output.hpp
deleted file mode 100644
index a1bcd980..00000000
--- a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_topic_output.hpp
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright (c) 2018-2022 Intel Corporation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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.
-
-/**
- * @brief A header file with declaration for RosTopicOutput Class
- * @file ros_topic_output.hpp
- */
-
-#ifndef DYNAMIC_VINO_LIB__OUTPUTS__ROS_TOPIC_OUTPUT_HPP_
-#define DYNAMIC_VINO_LIB__OUTPUTS__ROS_TOPIC_OUTPUT_HPP_
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-
-#include "dynamic_vino_lib/inferences/face_detection.hpp"
-#include "dynamic_vino_lib/outputs/base_output.hpp"
-
-namespace Outputs
-{
-/**
- * @class RosTopicOutput
- * @brief This class handles and publish the detection result with ros topic.
- */
-class RosTopicOutput : public BaseOutput
-{
-public:
- explicit RosTopicOutput(std::string output_name_,
- const rclcpp::Node::SharedPtr node=nullptr);
- /**
- * @brief Calculate the camera matrix of a frame.
- * @param[in] A frame.
- */
- void feedFrame(const cv::Mat &) override;
- /**
- * @brief Publish all the detected infomations generated by the accept
- * functions with ros topic.
- */
- void handleOutput() override;
- /**
- * @brief Generate ros topic infomation according to
- * the license plate detection result.
- * @param[in] results a bundle of license plate detection results.
- */
- void accept(const std::vector &) override;
- /**
- * @brief Generate ros topic infomation according to
- * the vehicle attributes detection result.
- * @param[in] results a bundle of vehicle attributes detection results.
- */
- void accept(const std::vector &) override;
- /**
- * @brief Generate ros topic infomation according to
- * the face reidentification result.
- * @param[in] results a bundle of face reidentification results.
- */
- void accept(const std::vector &) override;
- /**
- * @brief Generate ros topic infomation according to
- * the landmarks detection result.
- * @param[in] results a bundle of landmarks detection results.
- */
- void accept(const std::vector &) override;
- /**
- * @brief Generate ros topic infomation according to
- * the person attributes detection result.
- * @param[in] results a bundle of person attributes detection results.
- */
- void accept(const std::vector &) override;
- /**
- * @brief Generate ros topic infomation according to
- * the person reidentification result.
- * @param[in] results a bundle of person reidentification results.
- */
- void accept(const std::vector &) override;
- /**
- * @brief Generate ros topic infomation according to
- * the object segmentation result.
- * @param[in] results a bundle of object segmentation results.
- */
- void accept(const std::vector &) override;
- /**
- * @brief Generate ros topic infomation according to
- * the object segmentation result.
- * @param[in] results a bundle of object segmentation maskrcnn results.
- */
- void accept(const std::vector &) override;
- /**
- * @brief Generate ros topic infomation according to
- * the object detection result.
- * @param[in] results a bundle of object detection results.
- */
- void accept(const std::vector &) override;
- /**
- * @brief Generate ros topic infomation according to
- * the face detection result.
- * @param[in] An face detection result objetc.
- */
- void accept(const std::vector &) override;
- /**
- * @brief Generate ros topic infomation according to
- * the emotion detection result.
- * @param[in] An emotion detection result objetc.
- */
- void accept(const std::vector &) override;
- /**
- * @brief Generate ros topic infomation according to
- * the age gender detection result.
- * @param[in] An age gender detection result objetc.
- */
- void accept(const std::vector &) override;
- /**
- * @brief Generate ros topic infomation according to
- * the headpose detection result.
- * @param[in] An head pose detection result objetc.
- */
- void accept(const std::vector &) override;
-
-protected:
- const std::string topic_name_;
- std::shared_ptr node_;
- rclcpp::Publisher::SharedPtr pub_license_plate_;
- std::shared_ptr license_plate_topic_;
- rclcpp::Publisher::SharedPtr pub_vehicle_attribs_;
- std::shared_ptr vehicle_attribs_topic_;
- rclcpp::Publisher::SharedPtr pub_landmarks_;
- std::shared_ptr landmarks_topic_;
- rclcpp::Publisher::SharedPtr pub_face_reid_;
- std::shared_ptr face_reid_topic_;
- rclcpp::Publisher::SharedPtr pub_person_attribs_;
- std::shared_ptr person_attribs_topic_;
- rclcpp::Publisher::SharedPtr pub_person_reid_;
- std::shared_ptr person_reid_topic_;
- rclcpp::Publisher::SharedPtr pub_segmented_object_;
- std::shared_ptr segmented_objects_topic_;
- rclcpp::Publisher::SharedPtr pub_detected_object_;
- std::shared_ptr detected_objects_topic_;
- rclcpp::Publisher::SharedPtr pub_face_;
- std::shared_ptr faces_topic_;
- rclcpp::Publisher::SharedPtr pub_emotion_;
- std::shared_ptr emotions_topic_;
- rclcpp::Publisher::SharedPtr pub_age_gender_;
- std::shared_ptr age_gender_topic_;
- rclcpp::Publisher::SharedPtr pub_headpose_;
- std::shared_ptr headpose_topic_;
-};
-} // namespace Outputs
-#endif // DYNAMIC_VINO_LIB__OUTPUTS__ROS_TOPIC_OUTPUT_HPP_
diff --git a/pipeline_srv_msgs/CMakeLists.txt b/openvino_msgs/CMakeLists.txt
similarity index 98%
rename from pipeline_srv_msgs/CMakeLists.txt
rename to openvino_msgs/CMakeLists.txt
index eaa0cd1c..30b70b83 100644
--- a/pipeline_srv_msgs/CMakeLists.txt
+++ b/openvino_msgs/CMakeLists.txt
@@ -14,7 +14,7 @@
cmake_minimum_required(VERSION 3.5)
-project(pipeline_srv_msgs)
+project(openvino_msgs)
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14)
diff --git a/pipeline_srv_msgs/msg/Connection.msg b/openvino_msgs/msg/Connection.msg
similarity index 100%
rename from pipeline_srv_msgs/msg/Connection.msg
rename to openvino_msgs/msg/Connection.msg
diff --git a/pipeline_srv_msgs/msg/Pipeline.msg b/openvino_msgs/msg/Pipeline.msg
similarity index 100%
rename from pipeline_srv_msgs/msg/Pipeline.msg
rename to openvino_msgs/msg/Pipeline.msg
diff --git a/pipeline_srv_msgs/msg/PipelineRequest.msg b/openvino_msgs/msg/PipelineRequest.msg
similarity index 100%
rename from pipeline_srv_msgs/msg/PipelineRequest.msg
rename to openvino_msgs/msg/PipelineRequest.msg
diff --git a/pipeline_srv_msgs/package.xml b/openvino_msgs/package.xml
similarity index 98%
rename from pipeline_srv_msgs/package.xml
rename to openvino_msgs/package.xml
index 802a2b12..85d579d0 100644
--- a/pipeline_srv_msgs/package.xml
+++ b/openvino_msgs/package.xml
@@ -14,7 +14,7 @@ limitations under the License.
-->
- pipeline_srv_msgs
+ openvino_msgs
0.9.0
A package containing pipeline service message definitions.
Yang Lu
diff --git a/pipeline_srv_msgs/srv/PipelineSrv.srv b/openvino_msgs/srv/PipelineSrv.srv
similarity index 100%
rename from pipeline_srv_msgs/srv/PipelineSrv.srv
rename to openvino_msgs/srv/PipelineSrv.srv
diff --git a/vino_param_lib/CMakeLists.txt b/openvino_param_lib/CMakeLists.txt
similarity index 99%
rename from vino_param_lib/CMakeLists.txt
rename to openvino_param_lib/CMakeLists.txt
index 36cbde88..8a78469a 100644
--- a/vino_param_lib/CMakeLists.txt
+++ b/openvino_param_lib/CMakeLists.txt
@@ -13,7 +13,7 @@
# limitations under the License.
cmake_minimum_required(VERSION 3.5)
-project(vino_param_lib)
+project(openvino_param_lib)
find_package(ament_cmake REQUIRED)
find_package(yaml_cpp_vendor REQUIRED)
diff --git a/vino_param_lib/include/vino_param_lib/param_manager.hpp b/openvino_param_lib/include/openvino_param_lib/param_manager.hpp
similarity index 96%
rename from vino_param_lib/include/vino_param_lib/param_manager.hpp
rename to openvino_param_lib/include/openvino_param_lib/param_manager.hpp
index 912d8ed6..558d9359 100644
--- a/vino_param_lib/include/vino_param_lib/param_manager.hpp
+++ b/openvino_param_lib/include/openvino_param_lib/param_manager.hpp
@@ -16,8 +16,8 @@
* @brief A header file with declaration for parameter management
* @file param_manager.hpp
*/
-#ifndef VINO_PARAM_LIB__PARAM_MANAGER_HPP_
-#define VINO_PARAM_LIB__PARAM_MANAGER_HPP_
+#ifndef OPENVINO_PARAM_LIB__PARAM_MANAGER_HPP_
+#define OPENVINO_PARAM_LIB__PARAM_MANAGER_HPP_
#include
#include