diff --git a/demo_nodes_py/demo_nodes_py/services/add_two_ints_server.py b/demo_nodes_py/demo_nodes_py/services/add_two_ints_server.py
index a7e5762cf..ea0c61b0e 100644
--- a/demo_nodes_py/demo_nodes_py/services/add_two_ints_server.py
+++ b/demo_nodes_py/demo_nodes_py/services/add_two_ints_server.py
@@ -15,9 +15,10 @@
 from example_interfaces.srv import AddTwoInts
 
 import rclpy
+from rclpy.node import Node
 
 
-class AddTwoIntsServer(rclpy.Node):
+class AddTwoIntsServer(Node):
 
     def __init__(self):
         super().__init__('add_two_ints_server')
diff --git a/demo_nodes_py/demo_nodes_py/topics/listener.py b/demo_nodes_py/demo_nodes_py/topics/listener.py
index c6fae5b85..b87a213df 100644
--- a/demo_nodes_py/demo_nodes_py/topics/listener.py
+++ b/demo_nodes_py/demo_nodes_py/topics/listener.py
@@ -15,11 +15,12 @@
 import sys
 
 import rclpy
+from rclpy.node import Node
 
 from std_msgs.msg import String
 
 
-class Listener(rclpy.Node):
+class Listener(Node):
 
     def __init__(self):
         super().__init__('listener')
diff --git a/demo_nodes_py/demo_nodes_py/topics/listener_qos.py b/demo_nodes_py/demo_nodes_py/topics/listener_qos.py
index 30dbe083b..835e8304d 100644
--- a/demo_nodes_py/demo_nodes_py/topics/listener_qos.py
+++ b/demo_nodes_py/demo_nodes_py/topics/listener_qos.py
@@ -16,13 +16,14 @@
 import sys
 
 import rclpy
+from rclpy.node import Node
 from rclpy.qos import qos_profile_default, qos_profile_sensor_data
 from rclpy.qos import QoSReliabilityPolicy
 
 from std_msgs.msg import String
 
 
-class ListenerQos(rclpy.Node):
+class ListenerQos(Node):
 
     def __init__(self, qos_profile):
         super().__init__('listener_qos')
diff --git a/demo_nodes_py/demo_nodes_py/topics/talker.py b/demo_nodes_py/demo_nodes_py/topics/talker.py
index 45ec584ed..f2b77ec7f 100644
--- a/demo_nodes_py/demo_nodes_py/topics/talker.py
+++ b/demo_nodes_py/demo_nodes_py/topics/talker.py
@@ -15,11 +15,12 @@
 import sys
 
 import rclpy
+from rclpy.node import Node
 
 from std_msgs.msg import String
 
 
-class Talker(rclpy.Node):
+class Talker(Node):
 
     def __init__(self):
         super().__init__('talker')
diff --git a/demo_nodes_py/demo_nodes_py/topics/talker_qos.py b/demo_nodes_py/demo_nodes_py/topics/talker_qos.py
index cdaa6da02..75035445b 100644
--- a/demo_nodes_py/demo_nodes_py/topics/talker_qos.py
+++ b/demo_nodes_py/demo_nodes_py/topics/talker_qos.py
@@ -16,13 +16,14 @@
 import sys
 
 import rclpy
+from rclpy.node import Node
 from rclpy.qos import qos_profile_default, qos_profile_sensor_data
 from rclpy.qos import QoSReliabilityPolicy
 
 from std_msgs.msg import String
 
 
-class TalkerQos(rclpy.Node):
+class TalkerQos(Node):
 
     def __init__(self, qos_profile):
         super().__init__('talker_qos')