diff --git a/software/ros_packages/ground_station/src/Framework/MapSystems/RoverMapCoordinator.py b/software/ros_packages/ground_station/src/Framework/MapSystems/RoverMapCoordinator.py
index 40cb109..fdde76d 100644
--- a/software/ros_packages/ground_station/src/Framework/MapSystems/RoverMapCoordinator.py
+++ b/software/ros_packages/ground_station/src/Framework/MapSystems/RoverMapCoordinator.py
@@ -29,8 +29,8 @@ class RoverMapCoordinator(QtCore.QThread):
         self.shared_objects = shared_objects
         self.left_screen = self.shared_objects["screens"]["left_screen"]
         self.mapping_label = self.left_screen.mapping_label
-        self.navigation_label = self.left_screen.tableWidget
-        self.landmark_label = self.left_screen.tableWidget_2
+        self.navigation_label = self.left_screen.navigation_waypoints_table_widget
+        self.landmark_label = self.left_screen.landmark_waypoints_table_widget
 
         self.setings = QtCore.QSettings()
 
diff --git a/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py b/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py
index d66306c..e074ed0 100644
--- a/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py
+++ b/software/ros_packages/ground_station/src/Framework/NavigationSystems/WaypointsCoordinator.py
@@ -13,8 +13,8 @@ class WaypointsCoordinator(QtCore.QThread):
         self.shared_objects = shared_objects
         self.left_screen = self.shared_objects["screens"]["left_screen"]
 
-        self.navigation_label = self.left_screen.tableWidget
-        self.landmark_label = self.left_screen.tableWidget_2
+        self.navigation_label = self.left_screen.navigation_waypoints_table_widget
+        self.landmark_label = self.left_screen.landmark_waypoints_table_widget
 
         self.name_edit_label = (self.left_screen.
                                 manual_waypoint_landmark_name_line_edit)