diff --git a/rclcpp/CMakeLists.txt b/rclcpp/CMakeLists.txt
index 9353ffc..88cddf4 100644
--- a/rclcpp/CMakeLists.txt
+++ b/rclcpp/CMakeLists.txt
@@ -18,13 +18,13 @@ if("${_dds_vendor}" STREQUAL "connext")
   if("${_dds_type}" STREQUAL "dynamic")
     ament_export_dependencies(ros_dds_connext_dynamic)
   elseif("${_dds_type}" STREQUAL "static")
-    ament_export_dependencies(rosidl_generator_dds_connext_cpp ros_dds_connext_static)
+    ament_export_dependencies(rosidl_typesupport_connext_cpp ros_middleware_connext_cpp)
   endif()
 elseif("${_dds_vendor}" STREQUAL "opensplice")
   if("${_dds_type}" STREQUAL "dynamic")
     message(FATAL_ERROR "The DDS implementation '${_dds_vendor}' does not support the type '${_dds_type}'.")
   elseif("${_dds_type}" STREQUAL "static")
-    ament_export_dependencies(rosidl_generator_dds_opensplice_cpp)
+    ament_export_dependencies(rosidl_typesupport_opensplice_cpp)
   endif()
 else()
   message(FATAL_ERROR "Set the environment variable 'ROS_DDS_IMPLEMENTATION' to either 'connext' or 'opensplice'.")