From 4338951e89122e2ffd32ab4518610a06c9fc46e0 Mon Sep 17 00:00:00 2001
From: Davide Basso <davide.basso@skywarder.eu>
Date: Mon, 6 May 2024 14:06:40 +0200
Subject: [PATCH] [NAS] Fix formatting

---
 .gitignore                                  | 1 +
 src/tests/catch/nas/data/acc/acc.h          | 4 +---
 src/tests/catch/nas/data/acc/baro.h         | 4 +---
 src/tests/catch/nas/data/acc/config.h       | 4 +---
 src/tests/catch/nas/data/acc/gps.h          | 4 +---
 src/tests/catch/nas/data/acc/gyro.h         | 4 +---
 src/tests/catch/nas/data/acc/include.h      | 2 --
 src/tests/catch/nas/data/acc/input.h        | 4 +---
 src/tests/catch/nas/data/acc/mag.h          | 4 +---
 src/tests/catch/nas/data/acc/output.h       | 4 +---
 src/tests/catch/nas/data/acc/pitot.h        | 4 +---
 src/tests/catch/nas/data/acc/steps.h        | 4 +---
 src/tests/catch/nas/data/baro/acc.h         | 4 +---
 src/tests/catch/nas/data/baro/baro.h        | 4 +---
 src/tests/catch/nas/data/baro/config.h      | 4 +---
 src/tests/catch/nas/data/baro/gps.h         | 4 +---
 src/tests/catch/nas/data/baro/gyro.h        | 4 +---
 src/tests/catch/nas/data/baro/include.h     | 2 --
 src/tests/catch/nas/data/baro/input.h       | 4 +---
 src/tests/catch/nas/data/baro/mag.h         | 4 +---
 src/tests/catch/nas/data/baro/output.h      | 4 +---
 src/tests/catch/nas/data/baro/pitot.h       | 4 +---
 src/tests/catch/nas/data/baro/steps.h       | 4 +---
 src/tests/catch/nas/data/complete/acc.h     | 4 +---
 src/tests/catch/nas/data/complete/baro.h    | 4 +---
 src/tests/catch/nas/data/complete/config.h  | 4 +---
 src/tests/catch/nas/data/complete/gps.h     | 4 +---
 src/tests/catch/nas/data/complete/gyro.h    | 4 +---
 src/tests/catch/nas/data/complete/include.h | 2 --
 src/tests/catch/nas/data/complete/input.h   | 4 +---
 src/tests/catch/nas/data/complete/mag.h     | 4 +---
 src/tests/catch/nas/data/complete/output.h  | 4 +---
 src/tests/catch/nas/data/complete/pitot.h   | 4 +---
 src/tests/catch/nas/data/complete/steps.h   | 4 +---
 src/tests/catch/nas/data/gps/acc.h          | 4 +---
 src/tests/catch/nas/data/gps/baro.h         | 4 +---
 src/tests/catch/nas/data/gps/config.h       | 4 +---
 src/tests/catch/nas/data/gps/gps.h          | 4 +---
 src/tests/catch/nas/data/gps/gyro.h         | 4 +---
 src/tests/catch/nas/data/gps/include.h      | 2 --
 src/tests/catch/nas/data/gps/input.h        | 4 +---
 src/tests/catch/nas/data/gps/mag.h          | 4 +---
 src/tests/catch/nas/data/gps/output.h       | 4 +---
 src/tests/catch/nas/data/gps/pitot.h        | 4 +---
 src/tests/catch/nas/data/gps/steps.h        | 4 +---
 src/tests/catch/nas/data/gyro/acc.h         | 4 +---
 src/tests/catch/nas/data/gyro/baro.h        | 4 +---
 src/tests/catch/nas/data/gyro/config.h      | 4 +---
 src/tests/catch/nas/data/gyro/gps.h         | 4 +---
 src/tests/catch/nas/data/gyro/gyro.h        | 4 +---
 src/tests/catch/nas/data/gyro/include.h     | 2 --
 src/tests/catch/nas/data/gyro/input.h       | 4 +---
 src/tests/catch/nas/data/gyro/mag.h         | 4 +---
 src/tests/catch/nas/data/gyro/output.h      | 4 +---
 src/tests/catch/nas/data/gyro/pitot.h       | 4 +---
 src/tests/catch/nas/data/gyro/steps.h       | 4 +---
 src/tests/catch/nas/data/mag/acc.h          | 4 +---
 src/tests/catch/nas/data/mag/baro.h         | 4 +---
 src/tests/catch/nas/data/mag/config.h       | 4 +---
 src/tests/catch/nas/data/mag/gps.h          | 4 +---
 src/tests/catch/nas/data/mag/gyro.h         | 4 +---
 src/tests/catch/nas/data/mag/include.h      | 2 --
 src/tests/catch/nas/data/mag/input.h        | 4 +---
 src/tests/catch/nas/data/mag/mag.h          | 4 +---
 src/tests/catch/nas/data/mag/output.h       | 4 +---
 src/tests/catch/nas/data/mag/pitot.h        | 4 +---
 src/tests/catch/nas/data/mag/steps.h        | 4 +---
 src/tests/catch/nas/data/pitot/acc.h        | 4 +---
 src/tests/catch/nas/data/pitot/baro.h       | 4 +---
 src/tests/catch/nas/data/pitot/config.h     | 4 +---
 src/tests/catch/nas/data/pitot/gps.h        | 4 +---
 src/tests/catch/nas/data/pitot/gyro.h       | 4 +---
 src/tests/catch/nas/data/pitot/include.h    | 2 --
 src/tests/catch/nas/data/pitot/input.h      | 4 +---
 src/tests/catch/nas/data/pitot/mag.h        | 4 +---
 src/tests/catch/nas/data/pitot/output.h     | 4 +---
 src/tests/catch/nas/data/pitot/pitot.h      | 4 +---
 src/tests/catch/nas/data/pitot/steps.h      | 4 +---
 78 files changed, 71 insertions(+), 224 deletions(-)

diff --git a/.gitignore b/.gitignore
index b343c6b27..8077771da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ STM32F429zi_Discovery.xml
 ._*
 .DS_Store
 build
+build-host
 cmake-build-*
 *.sublime-workspace
 *.sublime-project
diff --git a/src/tests/catch/nas/data/acc/acc.h b/src/tests/catch/nas/data/acc/acc.h
index d8b02b0d0..7ab28dafb 100644
--- a/src/tests/catch/nas/data/acc/acc.h
+++ b/src/tests/catch/nas/data/acc/acc.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-AccelerometerData acc_acc[] = {
+Boardcore::AccelerometerData acc_acc[] = {
     {
         20000,
         5.7433,
diff --git a/src/tests/catch/nas/data/acc/baro.h b/src/tests/catch/nas/data/acc/baro.h
index f0d5ede95..437094000 100644
--- a/src/tests/catch/nas/data/acc/baro.h
+++ b/src/tests/catch/nas/data/acc/baro.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-PressureData acc_baro[] = {
+Boardcore::PressureData acc_baro[] = {
     {
         20000,
         99449.4766,
diff --git a/src/tests/catch/nas/data/acc/config.h b/src/tests/catch/nas/data/acc/config.h
index 786ca5663..9c2e9cf12 100644
--- a/src/tests/catch/nas/data/acc/config.h
+++ b/src/tests/catch/nas/data/acc/config.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASConfig acc_nas_config{
+Boardcore::NASConfig acc_nas_config{
     0.02,                                    ///< T
     0.0001,                                  ///< SIGMA_BETA
     10,                                      ///< SIGMA_W
diff --git a/src/tests/catch/nas/data/acc/gps.h b/src/tests/catch/nas/data/acc/gps.h
index c1bdcf4e5..e957a47ad 100644
--- a/src/tests/catch/nas/data/acc/gps.h
+++ b/src/tests/catch/nas/data/acc/gps.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-GPSData acc_gps[] = {
+Boardcore::GPSData acc_gps[] = {
     {
         20000,
         39.3891,
diff --git a/src/tests/catch/nas/data/acc/gyro.h b/src/tests/catch/nas/data/acc/gyro.h
index 45c640c05..af181248d 100644
--- a/src/tests/catch/nas/data/acc/gyro.h
+++ b/src/tests/catch/nas/data/acc/gyro.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-GyroscopeData acc_gyro[] = {
+Boardcore::GyroscopeData acc_gyro[] = {
     {
         20000,
         0,
diff --git a/src/tests/catch/nas/data/acc/include.h b/src/tests/catch/nas/data/acc/include.h
index 0ababf303..2fdef229c 100644
--- a/src/tests/catch/nas/data/acc/include.h
+++ b/src/tests/catch/nas/data/acc/include.h
@@ -28,8 +28,6 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
 #include "acc.h"
 #include "baro.h"
 #include "config.h"
diff --git a/src/tests/catch/nas/data/acc/input.h b/src/tests/catch/nas/data/acc/input.h
index 0a4470f1d..0ca6c8a68 100644
--- a/src/tests/catch/nas/data/acc/input.h
+++ b/src/tests/catch/nas/data/acc/input.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASState acc_input[] = {
+Boardcore::NASState acc_input[] = {
     {20000,
      {0, 0, -160, 0, 0, 0, -0.61363, 0.26682, 0.68151, 0.29633, 0, 0, 0}},
     {40000,
diff --git a/src/tests/catch/nas/data/acc/mag.h b/src/tests/catch/nas/data/acc/mag.h
index 8e1f16026..193042315 100644
--- a/src/tests/catch/nas/data/acc/mag.h
+++ b/src/tests/catch/nas/data/acc/mag.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-MagnetometerData acc_mag[] = {
+Boardcore::MagnetometerData acc_mag[] = {
     {
         20000,
         -373.52,
diff --git a/src/tests/catch/nas/data/acc/output.h b/src/tests/catch/nas/data/acc/output.h
index c87777897..92ac049ed 100644
--- a/src/tests/catch/nas/data/acc/output.h
+++ b/src/tests/catch/nas/data/acc/output.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASState acc_output[] = {
+Boardcore::NASState acc_output[] = {
     {20000,
      {0, 0, -160, -0.0071732, 0.008816, 0.081894, -0.61363, 0.26682, 0.68151,
       0.29633, 0, 0, 0}},
diff --git a/src/tests/catch/nas/data/acc/pitot.h b/src/tests/catch/nas/data/acc/pitot.h
index f85c3631b..b7b851ba1 100644
--- a/src/tests/catch/nas/data/acc/pitot.h
+++ b/src/tests/catch/nas/data/acc/pitot.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-PitotData acc_pitot[] = {
+Boardcore::PitotData acc_pitot[] = {
     {
         20000,
         0,
diff --git a/src/tests/catch/nas/data/acc/steps.h b/src/tests/catch/nas/data/acc/steps.h
index b6d5962fe..9aadfe729 100644
--- a/src/tests/catch/nas/data/acc/steps.h
+++ b/src/tests/catch/nas/data/acc/steps.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASPredictionSteps acc_steps[]{
+Boardcore::NASPredictionSteps acc_steps[]{
     {
         0,        0,        -160,    -0.0071732, 0.008816,   0.081894,
         -0.61363, 0.26682,  0.68151, 0.29633,    0,          0,
diff --git a/src/tests/catch/nas/data/baro/acc.h b/src/tests/catch/nas/data/baro/acc.h
index 7ec87987b..bba198930 100644
--- a/src/tests/catch/nas/data/baro/acc.h
+++ b/src/tests/catch/nas/data/baro/acc.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-AccelerometerData baro_acc[] = {
+Boardcore::AccelerometerData baro_acc[] = {
     {
         20000,
         5.7433,
diff --git a/src/tests/catch/nas/data/baro/baro.h b/src/tests/catch/nas/data/baro/baro.h
index 597aac454..bbde7c95b 100644
--- a/src/tests/catch/nas/data/baro/baro.h
+++ b/src/tests/catch/nas/data/baro/baro.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-PressureData baro_baro[] = {
+Boardcore::PressureData baro_baro[] = {
     {
         20000,
         99449.4766,
diff --git a/src/tests/catch/nas/data/baro/config.h b/src/tests/catch/nas/data/baro/config.h
index 247d84c90..fe824aa24 100644
--- a/src/tests/catch/nas/data/baro/config.h
+++ b/src/tests/catch/nas/data/baro/config.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASConfig baro_nas_config{
+Boardcore::NASConfig baro_nas_config{
     0.02,                                    ///< T
     0.0001,                                  ///< SIGMA_BETA
     10,                                      ///< SIGMA_W
diff --git a/src/tests/catch/nas/data/baro/gps.h b/src/tests/catch/nas/data/baro/gps.h
index f0a31b07a..40e383a74 100644
--- a/src/tests/catch/nas/data/baro/gps.h
+++ b/src/tests/catch/nas/data/baro/gps.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-GPSData baro_gps[] = {
+Boardcore::GPSData baro_gps[] = {
     {
         20000,
         39.3891,
diff --git a/src/tests/catch/nas/data/baro/gyro.h b/src/tests/catch/nas/data/baro/gyro.h
index 4143eeb70..a411225a3 100644
--- a/src/tests/catch/nas/data/baro/gyro.h
+++ b/src/tests/catch/nas/data/baro/gyro.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-GyroscopeData baro_gyro[] = {
+Boardcore::GyroscopeData baro_gyro[] = {
     {
         20000,
         0,
diff --git a/src/tests/catch/nas/data/baro/include.h b/src/tests/catch/nas/data/baro/include.h
index 0ababf303..2fdef229c 100644
--- a/src/tests/catch/nas/data/baro/include.h
+++ b/src/tests/catch/nas/data/baro/include.h
@@ -28,8 +28,6 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
 #include "acc.h"
 #include "baro.h"
 #include "config.h"
diff --git a/src/tests/catch/nas/data/baro/input.h b/src/tests/catch/nas/data/baro/input.h
index 11e1c9c1c..6c5904094 100644
--- a/src/tests/catch/nas/data/baro/input.h
+++ b/src/tests/catch/nas/data/baro/input.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASState baro_input[] = {
+Boardcore::NASState baro_input[] = {
     {20000,
      {0, 0, -160, 0, 0, 0, -0.61363, 0.26682, 0.68151, 0.29633, 0, 0, 0}},
     {40000,
diff --git a/src/tests/catch/nas/data/baro/mag.h b/src/tests/catch/nas/data/baro/mag.h
index c1649657e..433fa8a9d 100644
--- a/src/tests/catch/nas/data/baro/mag.h
+++ b/src/tests/catch/nas/data/baro/mag.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-MagnetometerData baro_mag[] = {
+Boardcore::MagnetometerData baro_mag[] = {
     {
         20000,
         -373.52,
diff --git a/src/tests/catch/nas/data/baro/output.h b/src/tests/catch/nas/data/baro/output.h
index 73d11a635..0e5902d29 100644
--- a/src/tests/catch/nas/data/baro/output.h
+++ b/src/tests/catch/nas/data/baro/output.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASState baro_output[] = {
+Boardcore::NASState baro_output[] = {
     {20000,
      {0, 0, -160, 0, 0, 0, -0.61363, 0.26682, 0.68151, 0.29633, 0, 0, 0}},
     {40000,
diff --git a/src/tests/catch/nas/data/baro/pitot.h b/src/tests/catch/nas/data/baro/pitot.h
index 16c6f17ae..9e8473d51 100644
--- a/src/tests/catch/nas/data/baro/pitot.h
+++ b/src/tests/catch/nas/data/baro/pitot.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-PitotData baro_pitot[] = {
+Boardcore::PitotData baro_pitot[] = {
     {
         20000,
         0,
diff --git a/src/tests/catch/nas/data/baro/steps.h b/src/tests/catch/nas/data/baro/steps.h
index 0b8ef70a0..2734b0b3c 100644
--- a/src/tests/catch/nas/data/baro/steps.h
+++ b/src/tests/catch/nas/data/baro/steps.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASPredictionSteps baro_steps[]{
+Boardcore::NASPredictionSteps baro_steps[]{
     {
         0, 0,    -160, 0, 0,    0,        -0.61363, 0.26682, 0.68151, 0.29633,
         0, 0,    0,    0, 0,    -160,     0,        0,       0,       0,
diff --git a/src/tests/catch/nas/data/complete/acc.h b/src/tests/catch/nas/data/complete/acc.h
index 6cb819b71..d5fda0e6c 100644
--- a/src/tests/catch/nas/data/complete/acc.h
+++ b/src/tests/catch/nas/data/complete/acc.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-AccelerometerData complete_acc[] = {
+Boardcore::AccelerometerData complete_acc[] = {
     {
         20000,
         5.7433,
diff --git a/src/tests/catch/nas/data/complete/baro.h b/src/tests/catch/nas/data/complete/baro.h
index 400fe409a..4c1f00c1b 100644
--- a/src/tests/catch/nas/data/complete/baro.h
+++ b/src/tests/catch/nas/data/complete/baro.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-PressureData complete_baro[] = {
+Boardcore::PressureData complete_baro[] = {
     {
         20000,
         99449.4766,
diff --git a/src/tests/catch/nas/data/complete/config.h b/src/tests/catch/nas/data/complete/config.h
index eda5062c7..3269d70d4 100644
--- a/src/tests/catch/nas/data/complete/config.h
+++ b/src/tests/catch/nas/data/complete/config.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASConfig complete_nas_config{
+Boardcore::NASConfig complete_nas_config{
     0.02,                                    ///< T
     0.0001,                                  ///< SIGMA_BETA
     10,                                      ///< SIGMA_W
diff --git a/src/tests/catch/nas/data/complete/gps.h b/src/tests/catch/nas/data/complete/gps.h
index f3f2f6adc..07b132d93 100644
--- a/src/tests/catch/nas/data/complete/gps.h
+++ b/src/tests/catch/nas/data/complete/gps.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-GPSData complete_gps[] = {
+Boardcore::GPSData complete_gps[] = {
     {
         20000,
         39.3891,
diff --git a/src/tests/catch/nas/data/complete/gyro.h b/src/tests/catch/nas/data/complete/gyro.h
index 1986bc3e8..e32495be3 100644
--- a/src/tests/catch/nas/data/complete/gyro.h
+++ b/src/tests/catch/nas/data/complete/gyro.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-GyroscopeData complete_gyro[] = {
+Boardcore::GyroscopeData complete_gyro[] = {
     {
         20000,
         0,
diff --git a/src/tests/catch/nas/data/complete/include.h b/src/tests/catch/nas/data/complete/include.h
index 0ababf303..2fdef229c 100644
--- a/src/tests/catch/nas/data/complete/include.h
+++ b/src/tests/catch/nas/data/complete/include.h
@@ -28,8 +28,6 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
 #include "acc.h"
 #include "baro.h"
 #include "config.h"
diff --git a/src/tests/catch/nas/data/complete/input.h b/src/tests/catch/nas/data/complete/input.h
index 68f464c76..2f7ba4ba1 100644
--- a/src/tests/catch/nas/data/complete/input.h
+++ b/src/tests/catch/nas/data/complete/input.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASState complete_input[] = {
+Boardcore::NASState complete_input[] = {
     {20000,
      {0, 0, -160, 0, 0, 0, -0.61363, 0.26682, 0.68151, 0.29633, 0, 0, 0}},
     {40000,
diff --git a/src/tests/catch/nas/data/complete/mag.h b/src/tests/catch/nas/data/complete/mag.h
index e7ede9126..0b98c0532 100644
--- a/src/tests/catch/nas/data/complete/mag.h
+++ b/src/tests/catch/nas/data/complete/mag.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-MagnetometerData complete_mag[] = {
+Boardcore::MagnetometerData complete_mag[] = {
     {
         20000,
         -373.52,
diff --git a/src/tests/catch/nas/data/complete/output.h b/src/tests/catch/nas/data/complete/output.h
index d28150025..832057b21 100644
--- a/src/tests/catch/nas/data/complete/output.h
+++ b/src/tests/catch/nas/data/complete/output.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASState complete_output[] = {
+Boardcore::NASState complete_output[] = {
     {20000,
      {7.047e-05, -8.6572e-05, -159.9978, -0.00011759, 0.00014453, 0.081894,
       -0.61367, 0.26679, 0.68147, 0.29636, -1.2556e-09, -6.4969e-09,
diff --git a/src/tests/catch/nas/data/complete/pitot.h b/src/tests/catch/nas/data/complete/pitot.h
index ea548efc9..ce79becb0 100644
--- a/src/tests/catch/nas/data/complete/pitot.h
+++ b/src/tests/catch/nas/data/complete/pitot.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-PitotData complete_pitot[] = {
+Boardcore::PitotData complete_pitot[] = {
     {
         20000,
         0,
diff --git a/src/tests/catch/nas/data/complete/steps.h b/src/tests/catch/nas/data/complete/steps.h
index e2f3b32b2..63c99b1a2 100644
--- a/src/tests/catch/nas/data/complete/steps.h
+++ b/src/tests/catch/nas/data/complete/steps.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASPredictionSteps complete_steps[]{
+Boardcore::NASPredictionSteps complete_steps[]{
     {
         0,           0,           -160,        -0.0071732,  0.008816,
         0.081894,    -0.61363,    0.26681,     0.68151,     0.29633,
diff --git a/src/tests/catch/nas/data/gps/acc.h b/src/tests/catch/nas/data/gps/acc.h
index dd21fe21b..8dc58584b 100644
--- a/src/tests/catch/nas/data/gps/acc.h
+++ b/src/tests/catch/nas/data/gps/acc.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-AccelerometerData gps_acc[] = {
+Boardcore::AccelerometerData gps_acc[] = {
     {
         20000,
         5.7433,
diff --git a/src/tests/catch/nas/data/gps/baro.h b/src/tests/catch/nas/data/gps/baro.h
index 82517e62c..ed93c6d49 100644
--- a/src/tests/catch/nas/data/gps/baro.h
+++ b/src/tests/catch/nas/data/gps/baro.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-PressureData gps_baro[] = {
+Boardcore::PressureData gps_baro[] = {
     {
         20000,
         99449.4766,
diff --git a/src/tests/catch/nas/data/gps/config.h b/src/tests/catch/nas/data/gps/config.h
index fee1f0508..8253019fb 100644
--- a/src/tests/catch/nas/data/gps/config.h
+++ b/src/tests/catch/nas/data/gps/config.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASConfig gps_nas_config{
+Boardcore::NASConfig gps_nas_config{
     0.02,                                    ///< T
     0.0001,                                  ///< SIGMA_BETA
     10,                                      ///< SIGMA_W
diff --git a/src/tests/catch/nas/data/gps/gps.h b/src/tests/catch/nas/data/gps/gps.h
index 2a035f550..2a59f7ae3 100644
--- a/src/tests/catch/nas/data/gps/gps.h
+++ b/src/tests/catch/nas/data/gps/gps.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-GPSData gps_gps[] = {
+Boardcore::GPSData gps_gps[] = {
     {
         20000,
         39.3891,
diff --git a/src/tests/catch/nas/data/gps/gyro.h b/src/tests/catch/nas/data/gps/gyro.h
index eec455337..353d46706 100644
--- a/src/tests/catch/nas/data/gps/gyro.h
+++ b/src/tests/catch/nas/data/gps/gyro.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-GyroscopeData gps_gyro[] = {
+Boardcore::GyroscopeData gps_gyro[] = {
     {
         20000,
         0,
diff --git a/src/tests/catch/nas/data/gps/include.h b/src/tests/catch/nas/data/gps/include.h
index 0ababf303..2fdef229c 100644
--- a/src/tests/catch/nas/data/gps/include.h
+++ b/src/tests/catch/nas/data/gps/include.h
@@ -28,8 +28,6 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
 #include "acc.h"
 #include "baro.h"
 #include "config.h"
diff --git a/src/tests/catch/nas/data/gps/input.h b/src/tests/catch/nas/data/gps/input.h
index 674eed751..f16049314 100644
--- a/src/tests/catch/nas/data/gps/input.h
+++ b/src/tests/catch/nas/data/gps/input.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASState gps_input[] = {
+Boardcore::NASState gps_input[] = {
     {20000,
      {0, 0, -160, 0, 0, 0, -0.61363, 0.26682, 0.68151, 0.29633, 0, 0, 0}},
     {40000,
diff --git a/src/tests/catch/nas/data/gps/mag.h b/src/tests/catch/nas/data/gps/mag.h
index 53c3eb93e..4f5d9e724 100644
--- a/src/tests/catch/nas/data/gps/mag.h
+++ b/src/tests/catch/nas/data/gps/mag.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-MagnetometerData gps_mag[] = {
+Boardcore::MagnetometerData gps_mag[] = {
     {
         20000,
         -373.52,
diff --git a/src/tests/catch/nas/data/gps/output.h b/src/tests/catch/nas/data/gps/output.h
index 20a57eefa..d04c9f096 100644
--- a/src/tests/catch/nas/data/gps/output.h
+++ b/src/tests/catch/nas/data/gps/output.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASState gps_output[] = {
+Boardcore::NASState gps_output[] = {
     {20000,
      {0, 0, -160, 0, 0, 0, -0.61363, 0.26682, 0.68151, 0.29633, 0, 0, 0}},
     {40000,
diff --git a/src/tests/catch/nas/data/gps/pitot.h b/src/tests/catch/nas/data/gps/pitot.h
index 4e9a30342..de76a01ea 100644
--- a/src/tests/catch/nas/data/gps/pitot.h
+++ b/src/tests/catch/nas/data/gps/pitot.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-PitotData gps_pitot[] = {
+Boardcore::PitotData gps_pitot[] = {
     {
         20000,
         0,
diff --git a/src/tests/catch/nas/data/gps/steps.h b/src/tests/catch/nas/data/gps/steps.h
index b40fbc386..590954029 100644
--- a/src/tests/catch/nas/data/gps/steps.h
+++ b/src/tests/catch/nas/data/gps/steps.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASPredictionSteps gps_steps[]{
+Boardcore::NASPredictionSteps gps_steps[]{
     {
         0, 0,    -160, 0, 0,    0,        -0.61363, 0.26682, 0.68151, 0.29633,
         0, 0,    0,    0, 0,    -160,     0,        0,       0,       0,
diff --git a/src/tests/catch/nas/data/gyro/acc.h b/src/tests/catch/nas/data/gyro/acc.h
index 02d99c923..7fffec724 100644
--- a/src/tests/catch/nas/data/gyro/acc.h
+++ b/src/tests/catch/nas/data/gyro/acc.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-AccelerometerData gyro_acc[] = {
+Boardcore::AccelerometerData gyro_acc[] = {
     {
         20000,
         5.7433,
diff --git a/src/tests/catch/nas/data/gyro/baro.h b/src/tests/catch/nas/data/gyro/baro.h
index 366bb3dd6..38875b731 100644
--- a/src/tests/catch/nas/data/gyro/baro.h
+++ b/src/tests/catch/nas/data/gyro/baro.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-PressureData gyro_baro[] = {
+Boardcore::PressureData gyro_baro[] = {
     {
         20000,
         99449.4766,
diff --git a/src/tests/catch/nas/data/gyro/config.h b/src/tests/catch/nas/data/gyro/config.h
index 096b9ad2d..2a83d0688 100644
--- a/src/tests/catch/nas/data/gyro/config.h
+++ b/src/tests/catch/nas/data/gyro/config.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASConfig gyro_nas_config{
+Boardcore::NASConfig gyro_nas_config{
     0.02,                                    ///< T
     0.0001,                                  ///< SIGMA_BETA
     10,                                      ///< SIGMA_W
diff --git a/src/tests/catch/nas/data/gyro/gps.h b/src/tests/catch/nas/data/gyro/gps.h
index 5254786cc..6bf680d8b 100644
--- a/src/tests/catch/nas/data/gyro/gps.h
+++ b/src/tests/catch/nas/data/gyro/gps.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-GPSData gyro_gps[] = {
+Boardcore::GPSData gyro_gps[] = {
     {
         20000,
         39.3891,
diff --git a/src/tests/catch/nas/data/gyro/gyro.h b/src/tests/catch/nas/data/gyro/gyro.h
index b41718723..e6c6a8510 100644
--- a/src/tests/catch/nas/data/gyro/gyro.h
+++ b/src/tests/catch/nas/data/gyro/gyro.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-GyroscopeData gyro_gyro[] = {
+Boardcore::GyroscopeData gyro_gyro[] = {
     {
         20000,
         0,
diff --git a/src/tests/catch/nas/data/gyro/include.h b/src/tests/catch/nas/data/gyro/include.h
index 0ababf303..2fdef229c 100644
--- a/src/tests/catch/nas/data/gyro/include.h
+++ b/src/tests/catch/nas/data/gyro/include.h
@@ -28,8 +28,6 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
 #include "acc.h"
 #include "baro.h"
 #include "config.h"
diff --git a/src/tests/catch/nas/data/gyro/input.h b/src/tests/catch/nas/data/gyro/input.h
index e688f85af..54546148d 100644
--- a/src/tests/catch/nas/data/gyro/input.h
+++ b/src/tests/catch/nas/data/gyro/input.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASState gyro_input[] = {
+Boardcore::NASState gyro_input[] = {
     {20000,
      {0, 0, -160, 0, 0, 0, -0.61363, 0.26682, 0.68151, 0.29633, 0, 0, 0}},
     {40000,
diff --git a/src/tests/catch/nas/data/gyro/mag.h b/src/tests/catch/nas/data/gyro/mag.h
index c58b16160..09494e785 100644
--- a/src/tests/catch/nas/data/gyro/mag.h
+++ b/src/tests/catch/nas/data/gyro/mag.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-MagnetometerData gyro_mag[] = {
+Boardcore::MagnetometerData gyro_mag[] = {
     {
         20000,
         -373.52,
diff --git a/src/tests/catch/nas/data/gyro/output.h b/src/tests/catch/nas/data/gyro/output.h
index e4a9ebf3a..c7cf662de 100644
--- a/src/tests/catch/nas/data/gyro/output.h
+++ b/src/tests/catch/nas/data/gyro/output.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASState gyro_output[] = {
+Boardcore::NASState gyro_output[] = {
     {20000,
      {0, 0, -160, 0, 0, 0, -0.61363, 0.26681, 0.68151, 0.29633, 0, 0, 0}},
     {40000,
diff --git a/src/tests/catch/nas/data/gyro/pitot.h b/src/tests/catch/nas/data/gyro/pitot.h
index 0f2ce392b..b711e60d1 100644
--- a/src/tests/catch/nas/data/gyro/pitot.h
+++ b/src/tests/catch/nas/data/gyro/pitot.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-PitotData gyro_pitot[] = {
+Boardcore::PitotData gyro_pitot[] = {
     {
         20000,
         0,
diff --git a/src/tests/catch/nas/data/gyro/steps.h b/src/tests/catch/nas/data/gyro/steps.h
index 99ed414e3..532f4827e 100644
--- a/src/tests/catch/nas/data/gyro/steps.h
+++ b/src/tests/catch/nas/data/gyro/steps.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASPredictionSteps gyro_steps[]{
+Boardcore::NASPredictionSteps gyro_steps[]{
     {
         0, 0,    -160, 0, 0,    0,        -0.61363, 0.26681, 0.68151, 0.29633,
         0, 0,    0,    0, 0,    -160,     0,        0,       0,       0,
diff --git a/src/tests/catch/nas/data/mag/acc.h b/src/tests/catch/nas/data/mag/acc.h
index 694d86aff..1a15e8935 100644
--- a/src/tests/catch/nas/data/mag/acc.h
+++ b/src/tests/catch/nas/data/mag/acc.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-AccelerometerData mag_acc[] = {
+Boardcore::AccelerometerData mag_acc[] = {
     {
         20000,
         5.7433,
diff --git a/src/tests/catch/nas/data/mag/baro.h b/src/tests/catch/nas/data/mag/baro.h
index febcbb5fd..4f020a696 100644
--- a/src/tests/catch/nas/data/mag/baro.h
+++ b/src/tests/catch/nas/data/mag/baro.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-PressureData mag_baro[] = {
+Boardcore::PressureData mag_baro[] = {
     {
         20000,
         99449.4766,
diff --git a/src/tests/catch/nas/data/mag/config.h b/src/tests/catch/nas/data/mag/config.h
index 8f05c3770..c87747fd6 100644
--- a/src/tests/catch/nas/data/mag/config.h
+++ b/src/tests/catch/nas/data/mag/config.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASConfig mag_nas_config{
+Boardcore::NASConfig mag_nas_config{
     0.02,                                    ///< T
     0.0001,                                  ///< SIGMA_BETA
     10,                                      ///< SIGMA_W
diff --git a/src/tests/catch/nas/data/mag/gps.h b/src/tests/catch/nas/data/mag/gps.h
index 450b6c9ad..7874c1dad 100644
--- a/src/tests/catch/nas/data/mag/gps.h
+++ b/src/tests/catch/nas/data/mag/gps.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-GPSData mag_gps[] = {
+Boardcore::GPSData mag_gps[] = {
     {
         20000,
         39.3891,
diff --git a/src/tests/catch/nas/data/mag/gyro.h b/src/tests/catch/nas/data/mag/gyro.h
index b05ee68e6..ca330ea91 100644
--- a/src/tests/catch/nas/data/mag/gyro.h
+++ b/src/tests/catch/nas/data/mag/gyro.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-GyroscopeData mag_gyro[] = {
+Boardcore::GyroscopeData mag_gyro[] = {
     {
         20000,
         0,
diff --git a/src/tests/catch/nas/data/mag/include.h b/src/tests/catch/nas/data/mag/include.h
index 0ababf303..2fdef229c 100644
--- a/src/tests/catch/nas/data/mag/include.h
+++ b/src/tests/catch/nas/data/mag/include.h
@@ -28,8 +28,6 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
 #include "acc.h"
 #include "baro.h"
 #include "config.h"
diff --git a/src/tests/catch/nas/data/mag/input.h b/src/tests/catch/nas/data/mag/input.h
index 611bb6b20..dc6a823e7 100644
--- a/src/tests/catch/nas/data/mag/input.h
+++ b/src/tests/catch/nas/data/mag/input.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASState mag_input[] = {
+Boardcore::NASState mag_input[] = {
     {20000,
      {0, 0, -160, 0, 0, 0, -0.61363, 0.26682, 0.68151, 0.29633, 0, 0, 0}},
     {40000,
diff --git a/src/tests/catch/nas/data/mag/mag.h b/src/tests/catch/nas/data/mag/mag.h
index 0bbdf1eb5..bd165dad6 100644
--- a/src/tests/catch/nas/data/mag/mag.h
+++ b/src/tests/catch/nas/data/mag/mag.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-MagnetometerData mag_mag[] = {
+Boardcore::MagnetometerData mag_mag[] = {
     {
         20000,
         -373.52,
diff --git a/src/tests/catch/nas/data/mag/output.h b/src/tests/catch/nas/data/mag/output.h
index 126481dc1..3a87c3b5a 100644
--- a/src/tests/catch/nas/data/mag/output.h
+++ b/src/tests/catch/nas/data/mag/output.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASState mag_output[] = {
+Boardcore::NASState mag_output[] = {
     {20000,
      {0, 0, -160, 0, 0, 0, -0.61363, 0.26682, 0.68151, 0.29633, 0, 0, 0}},
     {40000,
diff --git a/src/tests/catch/nas/data/mag/pitot.h b/src/tests/catch/nas/data/mag/pitot.h
index 4f933ac66..20884e6d5 100644
--- a/src/tests/catch/nas/data/mag/pitot.h
+++ b/src/tests/catch/nas/data/mag/pitot.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-PitotData mag_pitot[] = {
+Boardcore::PitotData mag_pitot[] = {
     {
         20000,
         0,
diff --git a/src/tests/catch/nas/data/mag/steps.h b/src/tests/catch/nas/data/mag/steps.h
index 9c7d18b45..45813f0bf 100644
--- a/src/tests/catch/nas/data/mag/steps.h
+++ b/src/tests/catch/nas/data/mag/steps.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASPredictionSteps mag_steps[]{
+Boardcore::NASPredictionSteps mag_steps[]{
     {
         0, 0,    -160, 0, 0,    0,        -0.61363, 0.26682, 0.68151, 0.29633,
         0, 0,    0,    0, 0,    -160,     0,        0,       0,       0,
diff --git a/src/tests/catch/nas/data/pitot/acc.h b/src/tests/catch/nas/data/pitot/acc.h
index 8ff7f21e5..432497fe5 100644
--- a/src/tests/catch/nas/data/pitot/acc.h
+++ b/src/tests/catch/nas/data/pitot/acc.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-AccelerometerData pitot_acc[] = {
+Boardcore::AccelerometerData pitot_acc[] = {
     {
         20000,
         5.7433,
diff --git a/src/tests/catch/nas/data/pitot/baro.h b/src/tests/catch/nas/data/pitot/baro.h
index 71e2735ab..d94f40bb1 100644
--- a/src/tests/catch/nas/data/pitot/baro.h
+++ b/src/tests/catch/nas/data/pitot/baro.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-PressureData pitot_baro[] = {
+Boardcore::PressureData pitot_baro[] = {
     {
         20000,
         99449.4766,
diff --git a/src/tests/catch/nas/data/pitot/config.h b/src/tests/catch/nas/data/pitot/config.h
index 5a14dc2a0..1cc5433fe 100644
--- a/src/tests/catch/nas/data/pitot/config.h
+++ b/src/tests/catch/nas/data/pitot/config.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASConfig pitot_nas_config{
+Boardcore::NASConfig pitot_nas_config{
     0.02,                                    ///< T
     0.0001,                                  ///< SIGMA_BETA
     10,                                      ///< SIGMA_W
diff --git a/src/tests/catch/nas/data/pitot/gps.h b/src/tests/catch/nas/data/pitot/gps.h
index bc845d432..447540132 100644
--- a/src/tests/catch/nas/data/pitot/gps.h
+++ b/src/tests/catch/nas/data/pitot/gps.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-GPSData pitot_gps[] = {
+Boardcore::GPSData pitot_gps[] = {
     {
         20000,
         39.3891,
diff --git a/src/tests/catch/nas/data/pitot/gyro.h b/src/tests/catch/nas/data/pitot/gyro.h
index c38494d83..05646c81f 100644
--- a/src/tests/catch/nas/data/pitot/gyro.h
+++ b/src/tests/catch/nas/data/pitot/gyro.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-GyroscopeData pitot_gyro[] = {
+Boardcore::GyroscopeData pitot_gyro[] = {
     {
         20000,
         0,
diff --git a/src/tests/catch/nas/data/pitot/include.h b/src/tests/catch/nas/data/pitot/include.h
index 0ababf303..2fdef229c 100644
--- a/src/tests/catch/nas/data/pitot/include.h
+++ b/src/tests/catch/nas/data/pitot/include.h
@@ -28,8 +28,6 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
 #include "acc.h"
 #include "baro.h"
 #include "config.h"
diff --git a/src/tests/catch/nas/data/pitot/input.h b/src/tests/catch/nas/data/pitot/input.h
index 2dd9c3f41..3bb356ea5 100644
--- a/src/tests/catch/nas/data/pitot/input.h
+++ b/src/tests/catch/nas/data/pitot/input.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASState pitot_input[] = {
+Boardcore::NASState pitot_input[] = {
     {20000,
      {0, 0, -160, 0, 0, 0, -0.61363, 0.26682, 0.68151, 0.29633, 0, 0, 0}},
     {40000,
diff --git a/src/tests/catch/nas/data/pitot/mag.h b/src/tests/catch/nas/data/pitot/mag.h
index eb6334973..435c86bc8 100644
--- a/src/tests/catch/nas/data/pitot/mag.h
+++ b/src/tests/catch/nas/data/pitot/mag.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-MagnetometerData pitot_mag[] = {
+Boardcore::MagnetometerData pitot_mag[] = {
     {
         20000,
         -373.52,
diff --git a/src/tests/catch/nas/data/pitot/output.h b/src/tests/catch/nas/data/pitot/output.h
index 534cf2d06..e1ff0d331 100644
--- a/src/tests/catch/nas/data/pitot/output.h
+++ b/src/tests/catch/nas/data/pitot/output.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASState pitot_output[] = {
+Boardcore::NASState pitot_output[] = {
     {20000,
      {0, 0, -160, 0, 0, 0, -0.61363, 0.26682, 0.68151, 0.29633, 0, 0, 0}},
     {40000,
diff --git a/src/tests/catch/nas/data/pitot/pitot.h b/src/tests/catch/nas/data/pitot/pitot.h
index 57d0d144e..60ae52380 100644
--- a/src/tests/catch/nas/data/pitot/pitot.h
+++ b/src/tests/catch/nas/data/pitot/pitot.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-PitotData pitot_pitot[] = {
+Boardcore::PitotData pitot_pitot[] = {
     {
         20000,
         0,
diff --git a/src/tests/catch/nas/data/pitot/steps.h b/src/tests/catch/nas/data/pitot/steps.h
index 440079e62..fcdf2f40c 100644
--- a/src/tests/catch/nas/data/pitot/steps.h
+++ b/src/tests/catch/nas/data/pitot/steps.h
@@ -28,9 +28,7 @@
 #include <sensors/SensorData.h>
 #include <sensors/analog/Pitot/PitotData.h>
 
-using namespace Boardcore;
-
-NASPredictionSteps pitot_steps[]{
+Boardcore::NASPredictionSteps pitot_steps[]{
     {
         0, 0,    -160, 0, 0,    0,        -0.61363, 0.26682, 0.68151, 0.29633,
         0, 0,    0,    0, 0,    -160,     0,        0,       0,       0,
-- 
GitLab