diff --git a/src/examples/fixedwing_control/main.c b/src/examples/fixedwing_control/main.c
index 97f9b412a7..d6e78fd821 100644
--- a/src/examples/fixedwing_control/main.c
+++ b/src/examples/fixedwing_control/main.c
@@ -414,7 +414,7 @@ usage(const char *reason)
  * Makefile does only apply to this management task.
  *
  * The actual stack size should be set in the call
- * to px4_px4_task_spawn_cmd().
+ * to px4_task_spawn_cmd().
  */
 int ex_fixedwing_control_main(int argc, char *argv[])
 {
@@ -431,7 +431,7 @@ int ex_fixedwing_control_main(int argc, char *argv[])
 		}
 
 		thread_should_exit = false;
-		deamon_task = px4_px4_task_spawn_cmd("ex_fixedwing_control",
+		deamon_task = px4_task_spawn_cmd("ex_fixedwing_control",
 					     SCHED_DEFAULT,
 					     SCHED_PRIORITY_MAX - 20,
 					     2048,
diff --git a/src/examples/flow_position_estimator/flow_position_estimator_main.c b/src/examples/flow_position_estimator/flow_position_estimator_main.c
index a1a81d6361..027511df20 100644
--- a/src/examples/flow_position_estimator/flow_position_estimator_main.c
+++ b/src/examples/flow_position_estimator/flow_position_estimator_main.c
@@ -95,7 +95,7 @@ static void usage(const char *reason)
  * Makefile does only apply to this management task.
  *
  * The actual stack size should be set in the call
- * to px4_px4_task_spawn_cmd().
+ * to px4_task_spawn_cmd().
  */
 int flow_position_estimator_main(int argc, char *argv[])
 {
@@ -111,7 +111,7 @@ int flow_position_estimator_main(int argc, char *argv[])
 		}
 
 		thread_should_exit = false;
-		daemon_task = px4_px4_task_spawn_cmd("flow_position_estimator",
+		daemon_task = px4_task_spawn_cmd("flow_position_estimator",
 					     SCHED_DEFAULT,
 					     SCHED_PRIORITY_MAX - 5,
 					     4000,
diff --git a/src/examples/matlab_csv_serial/matlab_csv_serial.c b/src/examples/matlab_csv_serial/matlab_csv_serial.c
index b840283b6d..139a182b22 100644
--- a/src/examples/matlab_csv_serial/matlab_csv_serial.c
+++ b/src/examples/matlab_csv_serial/matlab_csv_serial.c
@@ -87,7 +87,7 @@ static void usage(const char *reason)
  * Makefile does only apply to this management task.
  *
  * The actual stack size should be set in the call
- * to px4_px4_task_spawn_cmd().
+ * to px4_task_spawn_cmd().
  */
 int matlab_csv_serial_main(int argc, char *argv[])
 {
@@ -103,7 +103,7 @@ int matlab_csv_serial_main(int argc, char *argv[])
 		}
 
 		thread_should_exit = false;
-		daemon_task = px4_px4_task_spawn_cmd("matlab_csv_serial",
+		daemon_task = px4_task_spawn_cmd("matlab_csv_serial",
 					     SCHED_DEFAULT,
 					     SCHED_PRIORITY_MAX - 5,
 					     2000,
diff --git a/src/examples/rover_steering_control/main.cpp b/src/examples/rover_steering_control/main.cpp
index e607acc2c2..887ea86309 100644
--- a/src/examples/rover_steering_control/main.cpp
+++ b/src/examples/rover_steering_control/main.cpp
@@ -408,7 +408,7 @@ usage(const char *reason)
  * Makefile does only apply to this management task.
  *
  * The actual stack size should be set in the call
- * to px4_px4_task_spawn_cmd().
+ * to px4_task_spawn_cmd().
  */
 int rover_steering_control_main(int argc, char *argv[])
 {
@@ -425,7 +425,7 @@ int rover_steering_control_main(int argc, char *argv[])
 		}
 
 		thread_should_exit = false;
-		deamon_task = px4_px4_task_spawn_cmd("rover_steering_control",
+		deamon_task = px4_task_spawn_cmd("rover_steering_control",
 					     SCHED_DEFAULT,
 					     SCHED_PRIORITY_MAX - 20,
 					     2048,
diff --git a/src/modules/attitude_estimator_so3/attitude_estimator_so3_main.cpp b/src/modules/attitude_estimator_so3/attitude_estimator_so3_main.cpp
index 76dc209c12..68a61488f9 100755
--- a/src/modules/attitude_estimator_so3/attitude_estimator_so3_main.cpp
+++ b/src/modules/attitude_estimator_so3/attitude_estimator_so3_main.cpp
@@ -132,7 +132,7 @@ usage(const char *reason)
  * Makefile does only apply to this management task.
  *
  * The actual stack size should be set in the call
- * to px4_px4_task_spawn_cmd().
+ * to px4_task_spawn_cmd().
  */
 int attitude_estimator_so3_main(int argc, char *argv[])
 {
@@ -149,7 +149,7 @@ int attitude_estimator_so3_main(int argc, char *argv[])
 		}
 
 		thread_should_exit = false;
-		attitude_estimator_so3_task = px4_px4_task_spawn_cmd("attitude_estimator_so3",
+		attitude_estimator_so3_task = px4_task_spawn_cmd("attitude_estimator_so3",
 					      SCHED_DEFAULT,
 					      SCHED_PRIORITY_MAX - 5,
 					      14000,
diff --git a/src/systemcmds/reboot/reboot.c b/src/systemcmds/reboot/reboot.c
index ee9f2e0d8d..de4d77d5fd 100644
--- a/src/systemcmds/reboot/reboot.c
+++ b/src/systemcmds/reboot/reboot.c
@@ -65,7 +65,7 @@ int reboot_main(int argc, char *argv[])
 		}
 	}
 
-	systemreset(to_bootloader);
+	px4_systemreset(to_bootloader);
 }