diff --git a/src/surface/gui/gui/event_nodes/client.py b/src/surface/gui/gui/event_nodes/client.py
index 90fcc24d..02933f0d 100644
--- a/src/surface/gui/gui/event_nodes/client.py
+++ b/src/surface/gui/gui/event_nodes/client.py
@@ -3,8 +3,8 @@
 
 import rclpy
 from PyQt6.QtCore import pyqtBoundSignal
-from rclpy.client import SrvType, SrvTypeRequest
-from rclpy.node import Client, Node
+from rclpy.client import Client, SrvType, SrvTypeRequest
+from rclpy.node import Node
 
 # Set to None for no timeout limits on service requests
 # else set to float number of seconds to limit request spinning
diff --git a/src/surface/gui/gui/event_nodes/server.py b/src/surface/gui/gui/event_nodes/server.py
index cf5df851..e90c2451 100644
--- a/src/surface/gui/gui/event_nodes/server.py
+++ b/src/surface/gui/gui/event_nodes/server.py
@@ -3,9 +3,9 @@
 from threading import Thread
 from typing import Callable
 
-from rclpy.client import SrvType, SrvTypeRequest, SrvTypeResponse
+from rclpy.service import Service, SrvType, SrvTypeRequest, SrvTypeResponse
 from rclpy.executors import SingleThreadedExecutor
-from rclpy.node import Node, Service
+from rclpy.node import Node
 
 
 class GUIEventServer(Node):
diff --git a/src/surface/task_selector/task_selector/task_selector.py b/src/surface/task_selector/task_selector/task_selector.py
index a5301516..3839228e 100644
--- a/src/surface/task_selector/task_selector/task_selector.py
+++ b/src/surface/task_selector/task_selector/task_selector.py
@@ -1,5 +1,5 @@
 import rclpy
-from rclpy.action import ActionClient
+from rclpy.action.client import ActionClient
 from rclpy.node import Node
 from rclpy.qos import qos_profile_system_default
 from task_selector.tasks import Tasks