diff --git a/ros2_ws/src/simple_robot_1dof/launch/forward_kinematics_1dof_launch.py b/ros2_ws/src/simple_robot_1dof/launch/kuka_rviz_simulation_1dof_launch.py
similarity index 100%
rename from ros2_ws/src/simple_robot_1dof/launch/forward_kinematics_1dof_launch.py
rename to ros2_ws/src/simple_robot_1dof/launch/kuka_rviz_simulation_1dof_launch.py
diff --git a/ros2_ws/src/simple_robot_1dof/setup.py b/ros2_ws/src/simple_robot_1dof/setup.py
index 6a1eb2fa0cc77656ef8b307824b707f0f305d3e9..6aae5652cbc53e2ce9519ea01d9ec08d9dd83523 100644
--- a/ros2_ws/src/simple_robot_1dof/setup.py
+++ b/ros2_ws/src/simple_robot_1dof/setup.py
@@ -10,7 +10,7 @@ setup(
         ('share/ament_index/resource_index/packages',
             ['resource/' + package_name]),
         ('share/' + package_name, ['package.xml']),
-        ('share/' + package_name + '/launch', ['launch/forward_kinematics_1dof_launch.py']),
+        ('share/' + package_name + '/launch', ['launch/kuka_rviz_simulation_1dof_launch.py']),
         ('share/' + package_name + '/rviz', ['rviz/forward_kinematics_simulations.rviz']),
     ],
     install_requires=['setuptools'],
@@ -22,8 +22,6 @@ setup(
     tests_require=['pytest'],
     entry_points={
         'console_scripts': [
-            #'publisher = simple_robot_1dof.reference_node_1dof:main',
-            #'subscriber = simple_robot_1dof.forward_kinematics_node_1dof:main',
             'forward_kinematics_node_1dof = simple_robot_1dof.forward_kinematics_node_1dof:main',
             'reference_node_1dof = simple_robot_1dof.reference_node_1dof:main',
         ],
diff --git a/ros2_ws/src/simple_robot_2dof/launch/forward_kinematics_2dof_sequential_launch.py b/ros2_ws/src/simple_robot_2dof/launch/kuka_rviz_simulation_2dof_sequential_launch.py
similarity index 100%
rename from ros2_ws/src/simple_robot_2dof/launch/forward_kinematics_2dof_sequential_launch.py
rename to ros2_ws/src/simple_robot_2dof/launch/kuka_rviz_simulation_2dof_sequential_launch.py
diff --git a/ros2_ws/src/simple_robot_2dof/launch/forward_kinematics_2dof_simultaneous_launch.py b/ros2_ws/src/simple_robot_2dof/launch/kuka_rviz_simulation_2dof_simultaneous_launch.py
similarity index 100%
rename from ros2_ws/src/simple_robot_2dof/launch/forward_kinematics_2dof_simultaneous_launch.py
rename to ros2_ws/src/simple_robot_2dof/launch/kuka_rviz_simulation_2dof_simultaneous_launch.py
diff --git a/ros2_ws/src/simple_robot_2dof/setup.py b/ros2_ws/src/simple_robot_2dof/setup.py
index c83089fd5973a57e677aecfb10fc01b28a04d9ae..c5c817cdeb78ef78139bf6ba139ea721bd840d90 100644
--- a/ros2_ws/src/simple_robot_2dof/setup.py
+++ b/ros2_ws/src/simple_robot_2dof/setup.py
@@ -10,8 +10,8 @@ setup(
         ('share/ament_index/resource_index/packages',
             ['resource/' + package_name]),
         ('share/' + package_name, ['package.xml']),
-        ('share/' + package_name + '/launch', ['launch/forward_kinematics_2dof_simultaneous_launch.py']),
-        ('share/' + package_name + '/launch', ['launch/forward_kinematics_2dof_sequential_launch.py']),
+        ('share/' + package_name + '/launch', ['launch/kuka_rviz_simulation_2dof_simultaneous_launch.py']),
+        ('share/' + package_name + '/launch', ['launch/kuka_rviz_simulation_2dof_sequential_launch.py']),
         ('share/' + package_name + '/rviz', ['rviz/forward_kinematics_simulations.rviz']),
     ],
     install_requires=['setuptools'],
diff --git a/ros2_ws/src/simple_robot_3dof/launch/forward_kinematics_3dof_sequential_launch.py b/ros2_ws/src/simple_robot_3dof/launch/kuka_rviz_simulation_3dof_sequential_launch.py
similarity index 100%
rename from ros2_ws/src/simple_robot_3dof/launch/forward_kinematics_3dof_sequential_launch.py
rename to ros2_ws/src/simple_robot_3dof/launch/kuka_rviz_simulation_3dof_sequential_launch.py
diff --git a/ros2_ws/src/simple_robot_3dof/launch/forward_kinematics_3dof_simultaneous_launch.py b/ros2_ws/src/simple_robot_3dof/launch/kuka_rviz_simulation_3dof_simultaneous_launch.py
similarity index 100%
rename from ros2_ws/src/simple_robot_3dof/launch/forward_kinematics_3dof_simultaneous_launch.py
rename to ros2_ws/src/simple_robot_3dof/launch/kuka_rviz_simulation_3dof_simultaneous_launch.py
diff --git a/ros2_ws/src/simple_robot_3dof/launch/forward_kinematics_3dof_wheelchair_launch.py b/ros2_ws/src/simple_robot_3dof/launch/kuka_rviz_simulation_3dof_wheelchair_launch.py
similarity index 100%
rename from ros2_ws/src/simple_robot_3dof/launch/forward_kinematics_3dof_wheelchair_launch.py
rename to ros2_ws/src/simple_robot_3dof/launch/kuka_rviz_simulation_3dof_wheelchair_launch.py
diff --git a/ros2_ws/src/simple_robot_3dof/setup.py b/ros2_ws/src/simple_robot_3dof/setup.py
index e0c5c2c243fae181ec0c8ea20a804df8043a7c7c..794a2d33dfd1650ccf33368e9c7c9bfb1aa7d323 100644
--- a/ros2_ws/src/simple_robot_3dof/setup.py
+++ b/ros2_ws/src/simple_robot_3dof/setup.py
@@ -10,9 +10,9 @@ setup(
         ('share/ament_index/resource_index/packages',
             ['resource/' + package_name]),
         ('share/' + package_name, ['package.xml']),
-        ('share/' + package_name + '/launch', ['launch/forward_kinematics_3dof_simultaneous_launch.py']),
-        ('share/' + package_name + '/launch', ['launch/forward_kinematics_3dof_sequential_launch.py']),
-        ('share/' + package_name + '/launch', ['launch/forward_kinematics_3dof_wheelchair_launch.py']),
+        ('share/' + package_name + '/launch', ['launch/kuka_rviz_simulation_3dof_sequential_launch.py']),
+        ('share/' + package_name + '/launch', ['launch/kuka_rviz_simulation_3dof_simultaneous_launch.py']),
+        ('share/' + package_name + '/launch', ['launch/kuka_rviz_simulation_3dof_wheelchair_launch.py']),
         ('share/' + package_name + '/rviz', ['rviz/forward_kinematics_simulations.rviz']),
     ],
     install_requires=['setuptools'],