diff --git a/rclcpp/include/rclcpp/node.hpp b/rclcpp/include/rclcpp/node.hpp
index 42f24eb..1fc8d8f 100644
--- a/rclcpp/include/rclcpp/node.hpp
+++ b/rclcpp/include/rclcpp/node.hpp
@@ -152,7 +152,7 @@ public:
     typename CallbackT,
     typename Alloc = std::allocator<void>,
     typename SubscriptionT = rclcpp::subscription::Subscription<MessageT, Alloc>>
-  typename rclcpp::subscription::Subscription<MessageT, Alloc>::SharedPtr
+  std::shared_ptr<SubscriptionT>
   create_subscription(
     const std::string & topic_name,
     CallbackT && callback,
@@ -182,7 +182,7 @@ public:
     typename CallbackT,
     typename Alloc = std::allocator<void>,
     typename SubscriptionT = rclcpp::subscription::Subscription<MessageT, Alloc>>
-  typename rclcpp::subscription::Subscription<MessageT, Alloc>::SharedPtr
+  std::shared_ptr<SubscriptionT>
   create_subscription(
     const std::string & topic_name,
     size_t qos_history_depth,
diff --git a/rclcpp/include/rclcpp/node_impl.hpp b/rclcpp/include/rclcpp/node_impl.hpp
index b561b4b..b249bc3 100644
--- a/rclcpp/include/rclcpp/node_impl.hpp
+++ b/rclcpp/include/rclcpp/node_impl.hpp
@@ -84,7 +84,7 @@ Node::create_publisher(
 }
 
 template<typename MessageT, typename CallbackT, typename Alloc, typename SubscriptionT>
-typename rclcpp::subscription::Subscription<MessageT, Alloc>::SharedPtr
+std::shared_ptr<SubscriptionT>
 Node::create_subscription(
   const std::string & topic_name,
   CallbackT && callback,
@@ -117,7 +117,7 @@ Node::create_subscription(
 }
 
 template<typename MessageT, typename CallbackT, typename Alloc, typename SubscriptionT>
-typename rclcpp::subscription::Subscription<MessageT, Alloc>::SharedPtr
+std::shared_ptr<SubscriptionT>
 Node::create_subscription(
   const std::string & topic_name,
   size_t qos_history_depth,