diff --git a/src/lib/FlightTasks/tasks/FlightTask.hpp b/src/lib/FlightTasks/tasks/FlightTask.hpp
index 22f1dd614b..40cb3ed03d 100644
--- a/src/lib/FlightTasks/tasks/FlightTask.hpp
+++ b/src/lib/FlightTasks/tasks/FlightTask.hpp
@@ -50,11 +50,11 @@
 #include "../SubscriptionArray.hpp"
 
 
-class FlightTask : public control::SuperBlock
+class FlightTask : public control::Block
 {
 public:
-	FlightTask(SuperBlock *parent, const char *name) :
-		SuperBlock(parent, name)
+	FlightTask(control::SuperBlock *parent, const char *name) :
+		Block(parent, name)
 	{
 		_time_stamp_activate = hrt_absolute_time();
 	};
diff --git a/src/lib/FlightTasks/tasks/FlightTaskManual.cpp b/src/lib/FlightTasks/tasks/FlightTaskManual.cpp
index 9241349b2a..b6a1d8cc0c 100644
--- a/src/lib/FlightTasks/tasks/FlightTaskManual.cpp
+++ b/src/lib/FlightTasks/tasks/FlightTaskManual.cpp
@@ -46,7 +46,7 @@
 
 using namespace matrix;
 
-FlightTaskManual::FlightTaskManual(SuperBlock *parent, const char *name) :
+FlightTaskManual::FlightTaskManual(control::SuperBlock *parent, const char *name) :
 	FlightTask(parent, name),
 	_xy_vel_man_expo(parent, "MPC_XY_MAN_EXPO", false),
 	_z_vel_man_expo(parent, "MPC_Z_MAN_EXPO", false),
diff --git a/src/lib/FlightTasks/tasks/FlightTaskManual.hpp b/src/lib/FlightTasks/tasks/FlightTaskManual.hpp
index ea6e1c7053..40dfce56a5 100644
--- a/src/lib/FlightTasks/tasks/FlightTaskManual.hpp
+++ b/src/lib/FlightTasks/tasks/FlightTaskManual.hpp
@@ -50,7 +50,7 @@
 class FlightTaskManual : public FlightTask
 {
 public:
-	FlightTaskManual(SuperBlock *parent, const char *name);
+	FlightTaskManual(control::SuperBlock *parent, const char *name);
 
 	virtual ~FlightTaskManual() = default;
 
diff --git a/src/lib/FlightTasks/tasks/FlightTaskOrbit.cpp b/src/lib/FlightTasks/tasks/FlightTaskOrbit.cpp
index 3b43cb878d..3852a2f287 100644
--- a/src/lib/FlightTasks/tasks/FlightTaskOrbit.cpp
+++ b/src/lib/FlightTasks/tasks/FlightTaskOrbit.cpp
@@ -45,7 +45,7 @@
 
 using namespace matrix;
 
-FlightTaskOrbit::FlightTaskOrbit(SuperBlock *parent, const char *name) :
+FlightTaskOrbit::FlightTaskOrbit(control::SuperBlock *parent, const char *name) :
 	FlightTaskManual(parent, name)
 {
 	_r = 1.f;
diff --git a/src/lib/FlightTasks/tasks/FlightTaskOrbit.hpp b/src/lib/FlightTasks/tasks/FlightTaskOrbit.hpp
index 24661719e6..1bc81e7378 100644
--- a/src/lib/FlightTasks/tasks/FlightTaskOrbit.hpp
+++ b/src/lib/FlightTasks/tasks/FlightTaskOrbit.hpp
@@ -46,7 +46,7 @@
 class FlightTaskOrbit : public FlightTaskManual
 {
 public:
-	FlightTaskOrbit(SuperBlock *parent, const char *name);
+	FlightTaskOrbit(control::SuperBlock *parent, const char *name);
 
 	virtual ~FlightTaskOrbit() = default;