diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h
index 09829267c..b28d63422 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h
@@ -66,11 +66,11 @@ public:
     }
 
     /*!
-     * \brief Returns "Galileo_E1_PCPS_Ambiguous_Acquisition_Fpga"
+     * \brief Returns "Galileo_E1_PCPS_Ambiguous_Acquisition_FPGA"
      */
     inline std::string implementation() override
     {
-        return "Galileo_E1_PCPS_Ambiguous_Acquisition_Fpga";
+        return "Galileo_E1_PCPS_Ambiguous_Acquisition_FPGA";
     }
 
     /*!
diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h
index 12d38bf34..14dae0230 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h
@@ -66,11 +66,11 @@ public:
     }
 
     /*!
-     * \brief Returns "Galileo_E5a_Pcps_Acquisition_Fpga"
+     * \brief Returns "Galileo_E5a_Pcps_Acquisition_FPGA"
      */
     inline std::string implementation() override
     {
-        return "Galileo_E5a_Pcps_Acquisition_Fpga";
+        return "Galileo_E5a_Pcps_Acquisition_FPGA";
     }
 
     /*!
diff --git a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h
index 8ae54e46a..d67bfd4a6 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h
+++ b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h
@@ -65,7 +65,7 @@ public:
     }
 
     /*!
-     * \brief Returns "Galileo_E5b_Pcps_Acquisition_Fpga"
+     * \brief Returns "Galileo_E5b_Pcps_Acquisition_FPGA"
      */
     inline std::string implementation() override
     {
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h
index cfc483cda..2b7bfd3f9 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h
@@ -67,11 +67,11 @@ public:
     }
 
     /*!
-     * \brief Returns "GPS_L1_CA_PCPS_Acquisition_Fpga"
+     * \brief Returns "GPS_L1_CA_PCPS_Acquisition_FPGA"
      */
     inline std::string implementation() override
     {
-        return "GPS_L1_CA_PCPS_Acquisition_Fpga";
+        return "GPS_L1_CA_PCPS_Acquisition_FPGA";
     }
 
     /*!
diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h
index 19acec8cb..81f4d342c 100644
--- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h
+++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h
@@ -60,11 +60,11 @@ public:
     }
 
     /*!
-     * \brief Returns "GPS_L2_M_PCPS_Acquisition_Fpga"
+     * \brief Returns "GPS_L2_M_PCPS_Acquisition_FPGA"
      */
     inline std::string implementation() override
     {
-        return "GPS_L2_M_PCPS_Acquisition_Fpga";
+        return "GPS_L2_M_PCPS_Acquisition_FPGA";
     }
 
     inline size_t item_size() override
diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h
index 497ab9b90..bf2bfafcf 100644
--- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h
+++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h
@@ -69,11 +69,11 @@ public:
     }
 
     /*!
-     * \brief Returns "GPS_L5i_PCPS_Acquisition_Fpga"
+     * \brief Returns "GPS_L5i_PCPS_Acquisition_FPGA"
      */
     inline std::string implementation() override
     {
-        return "GPS_L5i_PCPS_Acquisition_Fpga";
+        return "GPS_L5i_PCPS_Acquisition_FPGA";
     }
 
     /*!
diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.h b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.h
index 722440f32..8de75e087 100644
--- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.h
+++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.h
@@ -65,11 +65,11 @@ public:
     }
 
     /*!
-     * \brief Returns "Galileo_E1_DLL_PLL_VEML_Tracking_Fpga"
+     * \brief Returns "Galileo_E1_DLL_PLL_VEML_Tracking_FPGA"
      */
     inline std::string implementation() override
     {
-        return "Galileo_E1_DLL_PLL_VEML_Tracking_Fpga";
+        return "Galileo_E1_DLL_PLL_VEML_Tracking_FPGA";
     }
 
     /*!
diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.h b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.h
index 510df45ea..1b3c8f52b 100644
--- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.h
+++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.h
@@ -59,11 +59,11 @@ public:
     }
 
     /*!
-     * \brief Returns "Galileo_E5a_DLL_PLL_Tracking_Fpga"
+     * \brief Returns "Galileo_E5a_DLL_PLL_Tracking_FPGA"
      */
     inline std::string implementation() override
     {
-        return "Galileo_E5a_DLL_PLL_Tracking_Fpga";
+        return "Galileo_E5a_DLL_PLL_Tracking_FPGA";
     }
 
     /*!
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.h
index dedefd7c5..ed3b23f4a 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.h
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.h
@@ -64,11 +64,11 @@ public:
     }
 
     /*!
-     * \brief Returns "GPS_L1_CA_DLL_PLL_Tracking_Fpga"
+     * \brief Returns "GPS_L1_CA_DLL_PLL_Tracking_FPGA"
      */
     inline std::string implementation() override
     {
-        return "GPS_L1_CA_DLL_PLL_Tracking_Fpga";
+        return "GPS_L1_CA_DLL_PLL_Tracking_FPGA";
     }
 
     /*!
diff --git a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.h b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.h
index 506e8fec6..a89dd5d55 100644
--- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.h
+++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.h
@@ -57,10 +57,10 @@ public:
         return role_;
     }
 
-    //! Returns "GPS_L2_M_DLL_PLL_Tracking_Fpga"
+    //! Returns "GPS_L2_M_DLL_PLL_Tracking_FPGA"
     inline std::string implementation() override
     {
-        return "GPS_L2_M_DLL_PLL_Tracking_Fpga";
+        return "GPS_L2_M_DLL_PLL_Tracking_FPGA";
     }
 
     inline size_t item_size() override
diff --git a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.h b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.h
index 24fc37a14..ed85735b2 100644
--- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.h
+++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.h
@@ -65,11 +65,11 @@ public:
     }
 
     /*!
-     * \brief Returns "GPS_L5_DLL_PLL_Tracking_Fpga"
+     * \brief Returns "GPS_L5_DLL_PLL_Tracking_FPGA"
      */
     inline std::string implementation() override
     {
-        return "GPS_L5_DLL_PLL_Tracking_Fpga";
+        return "GPS_L5_DLL_PLL_Tracking_FPGA";
     }
 
     /*!
diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index 4012c4121..a9c0186e2 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -821,13 +821,13 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
 #endif
 
 #if ENABLE_FPGA and AD9361_DRIVER
-            else if (implementation == "Adrv9361_Z7035_Signal_Source_Fpga")
+            else if (implementation == "Adrv9361_Z7035_Signal_Source_FPGA")
                 {
                     std::unique_ptr<GNSSBlockInterface> block_ = std::make_unique<Adrv9361z7035SignalSourceFPGA>(configuration, role, in_streams,
                         out_streams, queue);
                     block = std::move(block_);
                 }
-            else if (implementation == "Fmcomms5_Signal_Source_Fpga")
+            else if (implementation == "Fmcomms5_Signal_Source_FPGA")
                 {
                     std::unique_ptr<GNSSBlockInterface> block_ = std::make_unique<Fmcomms5SignalSourceFPGA>(configuration, role, in_streams,
                         out_streams, queue);
@@ -836,7 +836,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
 #endif
 
 #if ENABLE_FPGA and MAX2771_DRIVER
-            else if (implementation == "Max2771_Evkit_Signal_Source_Fpga")
+            else if (implementation == "Max2771_Evkit_Signal_Source_FPGA")
                 {
                     std::unique_ptr<GNSSBlockInterface> block_ = std::make_unique<MAX2771EVKITSignalSourceFPGA>(configuration, role, in_streams,
                         out_streams, queue);
@@ -845,7 +845,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
 #endif
 
 #if ENABLE_FPGA and DMA_PROXY_DRIVER
-            else if (implementation == "Dma_Signal_Source_Fpga")
+            else if (implementation == "Dma_Signal_Source_FPGA")
                 {
                     std::unique_ptr<GNSSBlockInterface> block_ = std::make_unique<DMASignalSourceFPGA>(configuration, role, in_streams,
                         out_streams, queue);
@@ -1084,31 +1084,31 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
                 }
 #endif
 #if ENABLE_FPGA
-            else if (implementation == "GPS_L1_CA_PCPS_Acquisition_Fpga")
+            else if (implementation == "GPS_L1_CA_PCPS_Acquisition_FPGA")
                 {
                     std::unique_ptr<GNSSBlockInterface> block_ = std::make_unique<GpsL1CaPcpsAcquisitionFpga>(configuration, role, in_streams,
                         out_streams);
                     block = std::move(block_);
                 }
-            else if (implementation == "Galileo_E1_PCPS_Ambiguous_Acquisition_Fpga")
+            else if (implementation == "Galileo_E1_PCPS_Ambiguous_Acquisition_FPGA")
                 {
                     std::unique_ptr<GNSSBlockInterface> block_ = std::make_unique<GalileoE1PcpsAmbiguousAcquisitionFpga>(configuration, role, in_streams,
                         out_streams);
                     block = std::move(block_);
                 }
-            else if (implementation == "GPS_L2_M_PCPS_Acquisition_Fpga")
+            else if (implementation == "GPS_L2_M_PCPS_Acquisition_FPGA")
                 {
                     std::unique_ptr<GNSSBlockInterface> block_ = std::make_unique<GpsL2MPcpsAcquisitionFpga>(configuration, role, in_streams,
                         out_streams);
                     block = std::move(block_);
                 }
-            else if (implementation == "GPS_L5i_PCPS_Acquisition_Fpga")
+            else if (implementation == "GPS_L5i_PCPS_Acquisition_FPGA")
                 {
                     std::unique_ptr<AcquisitionInterface> block_ = std::make_unique<GpsL5iPcpsAcquisitionFpga>(configuration, role, in_streams,
                         out_streams);
                     block = std::move(block_);
                 }
-            else if (implementation == "Galileo_E5a_Pcps_Acquisition_Fpga")
+            else if (implementation == "Galileo_E5a_Pcps_Acquisition_FPGA")
                 {
                     std::unique_ptr<GNSSBlockInterface> block_ = std::make_unique<GalileoE5aPcpsAcquisitionFpga>(configuration, role, in_streams,
                         out_streams);
@@ -1234,31 +1234,31 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
                 }
 #endif
 #if ENABLE_FPGA
-            else if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_Fpga")
+            else if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_FPGA")
                 {
                     std::unique_ptr<TrackingInterface> block_ = std::make_unique<GpsL1CaDllPllTrackingFpga>(configuration, role, in_streams,
                         out_streams);
                     block = std::move(block_);
                 }
-            else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_Fpga")
+            else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_FPGA")
                 {
                     std::unique_ptr<TrackingInterface> block_ = std::make_unique<GalileoE1DllPllVemlTrackingFpga>(configuration, role, in_streams,
                         out_streams);
                     block = std::move(block_);
                 }
-            else if (implementation == "GPS_L2_M_DLL_PLL_Tracking_Fpga")
+            else if (implementation == "GPS_L2_M_DLL_PLL_Tracking_FPGA")
                 {
                     std::unique_ptr<GNSSBlockInterface> block_ = std::make_unique<GpsL2MDllPllTrackingFpga>(configuration, role, in_streams,
                         out_streams);
                     block = std::move(block_);
                 }
-            else if ((implementation == "GPS_L5i_DLL_PLL_Tracking_Fpga") or (implementation == "GPS_L5_DLL_PLL_Tracking_Fpga"))
+            else if ((implementation == "GPS_L5i_DLL_PLL_Tracking_FPGA") or (implementation == "GPS_L5_DLL_PLL_Tracking_FPGA"))
                 {
                     std::unique_ptr<GNSSBlockInterface> block_ = std::make_unique<GpsL5DllPllTrackingFpga>(configuration, role, in_streams,
                         out_streams);
                     block = std::move(block_);
                 }
-            else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_Fpga")
+            else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_FPGA")
                 {
                     std::unique_ptr<GNSSBlockInterface> block_ = std::make_unique<GalileoE5aDllPllTrackingFpga>(configuration, role, in_streams,
                         out_streams);
@@ -1522,31 +1522,31 @@ std::unique_ptr<AcquisitionInterface> GNSSBlockFactory::GetAcqBlock(
         }
 #endif
 #if ENABLE_FPGA
-    else if (implementation == "GPS_L1_CA_PCPS_Acquisition_Fpga")
+    else if (implementation == "GPS_L1_CA_PCPS_Acquisition_FPGA")
         {
             std::unique_ptr<AcquisitionInterface> block_ = std::make_unique<GpsL1CaPcpsAcquisitionFpga>(configuration, role, in_streams,
                 out_streams);
             block = std::move(block_);
         }
-    else if (implementation == "Galileo_E1_PCPS_Ambiguous_Acquisition_Fpga")
+    else if (implementation == "Galileo_E1_PCPS_Ambiguous_Acquisition_FPGA")
         {
             std::unique_ptr<AcquisitionInterface> block_ = std::make_unique<GalileoE1PcpsAmbiguousAcquisitionFpga>(configuration, role, in_streams,
                 out_streams);
             block = std::move(block_);
         }
-    else if (implementation == "GPS_L2_M_PCPS_Acquisition_Fpga")
+    else if (implementation == "GPS_L2_M_PCPS_Acquisition_FPGA")
         {
             std::unique_ptr<AcquisitionInterface> block_ = std::make_unique<GpsL2MPcpsAcquisitionFpga>(configuration, role, in_streams,
                 out_streams);
             block = std::move(block_);
         }
-    else if (implementation == "GPS_L5i_PCPS_Acquisition_Fpga")
+    else if (implementation == "GPS_L5i_PCPS_Acquisition_FPGA")
         {
             std::unique_ptr<AcquisitionInterface> block_ = std::make_unique<GpsL5iPcpsAcquisitionFpga>(configuration, role, in_streams,
                 out_streams);
             block = std::move(block_);
         }
-    else if (implementation == "Galileo_E5a_Pcps_Acquisition_Fpga")
+    else if (implementation == "Galileo_E5a_Pcps_Acquisition_FPGA")
         {
             std::unique_ptr<AcquisitionInterface> block_ = std::make_unique<GalileoE5aPcpsAcquisitionFpga>(configuration, role, in_streams,
                 out_streams);
@@ -1690,31 +1690,31 @@ std::unique_ptr<TrackingInterface> GNSSBlockFactory::GetTrkBlock(
         }
 #endif
 #if ENABLE_FPGA
-    else if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_Fpga")
+    else if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_FPGA")
         {
             std::unique_ptr<TrackingInterface> block_ = std::make_unique<GpsL1CaDllPllTrackingFpga>(configuration, role, in_streams,
                 out_streams);
             block = std::move(block_);
         }
-    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_Fpga")
+    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_FPGA")
         {
             std::unique_ptr<TrackingInterface> block_ = std::make_unique<GalileoE1DllPllVemlTrackingFpga>(configuration, role, in_streams,
                 out_streams);
             block = std::move(block_);
         }
-    else if (implementation == "GPS_L2_M_DLL_PLL_Tracking_Fpga")
+    else if (implementation == "GPS_L2_M_DLL_PLL_Tracking_FPGA")
         {
             std::unique_ptr<TrackingInterface> block_ = std::make_unique<GpsL2MDllPllTrackingFpga>(configuration, role, in_streams,
                 out_streams);
             block = std::move(block_);
         }
-    else if ((implementation == "GPS_L5i_DLL_PLL_Tracking_Fpga") or (implementation == "GPS_L5_DLL_PLL_Tracking_Fpga"))
+    else if ((implementation == "GPS_L5i_DLL_PLL_Tracking_FPGA") or (implementation == "GPS_L5_DLL_PLL_Tracking_FPGA"))
         {
             std::unique_ptr<TrackingInterface> block_ = std::make_unique<GpsL5DllPllTrackingFpga>(configuration, role, in_streams,
                 out_streams);
             block = std::move(block_);
         }
-    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_Fpga")
+    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_FPGA")
         {
             std::unique_ptr<TrackingInterface> block_ = std::make_unique<GalileoE5aDllPllTrackingFpga>(configuration, role, in_streams,
                 out_streams);
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc
index 73aab356c..4d68363f8 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc
@@ -67,7 +67,7 @@ class GalileoE1PcpsAmbiguousAcquisitionTestFpga : public ::testing::Test
 {
 public:
     bool acquire_signal();
-    std::string implementation = "GPS_L1_CA_DLL_PLL_Tracking_Fpga";
+    std::string implementation = "GPS_L1_CA_DLL_PLL_Tracking_FPGA";
     std::vector<Gnss_Synchro> gnss_synchro_vec;
 
     const int32_t TEST_ACQ_SKIP_SAMPLES = 1024;
@@ -397,7 +397,7 @@ bool GalileoE1PcpsAmbiguousAcquisitionTestFpga::acquire_signal()
 void GalileoE1PcpsAmbiguousAcquisitionTestFpga::init()
 {
     config->set_property("GNSS-SDR.internal_fs_sps", "4000000");
-    config->set_property("Acquisition.implementation", "Galileo_E1_PCPS_Ambiguous_Acquisition_Fpga");
+    config->set_property("Acquisition.implementation", "Galileo_E1_PCPS_Ambiguous_Acquisition_FPGA");
     config->set_property("Acquisition.threshold", "0.00001");
     config->set_property("Acquisition.doppler_max", std::to_string(doppler_max));
     config->set_property("Acquisition.doppler_step", std::to_string(doppler_step));
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc
index 13058472e..47ddc54aa 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc
@@ -66,7 +66,7 @@ class GpsL1CaPcpsAcquisitionTestFpga : public ::testing::Test
 {
 public:
     bool acquire_signal();
-    std::string implementation = "GPS_L1_CA_DLL_PLL_Tracking_Fpga";
+    std::string implementation = "GPS_L1_CA_DLL_PLL_Tracking_FPGA";
     std::vector<Gnss_Synchro> gnss_synchro_vec;
 
     const int32_t TEST_ACQ_SKIP_SAMPLES = 1024;
@@ -396,7 +396,7 @@ bool GpsL1CaPcpsAcquisitionTestFpga::acquire_signal()
 void GpsL1CaPcpsAcquisitionTestFpga::init()
 {
     config->set_property("GNSS-SDR.internal_fs_sps", "4000000");
-    config->set_property("Acquisition.implementation", "GPS_L1_CA_PCPS_Acquisition_Fpga");
+    config->set_property("Acquisition.implementation", "GPS_L1_CA_PCPS_Acquisition_FPGA");
     config->set_property("Acquisition.threshold", "0.00001");
     config->set_property("Acquisition.doppler_max", std::to_string(doppler_max));
     config->set_property("Acquisition.doppler_step", std::to_string(doppler_step));
diff --git a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc
index a55d054b1..c466a277b 100644
--- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc
@@ -642,7 +642,7 @@ bool HybridObservablesTestFpga::acquire_signal()
     switch_fpga->set_switch_position(0);  // set switch position to DMA
 
     // create the correspondign acquisition block according to the desired tracking signal
-    if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_Fpga")
+    if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_FPGA")
         {
             tmp_gnss_synchro.System = 'G';
             signal = "1C";
@@ -654,7 +654,7 @@ bool HybridObservablesTestFpga::acquire_signal()
 
             args.freq_band = 0;  // frequency band on which the DMA has to transfer the samples
         }
-    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_Fpga")
+    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_FPGA")
         {
             tmp_gnss_synchro.System = 'E';
             signal = "1B";
@@ -666,7 +666,7 @@ bool HybridObservablesTestFpga::acquire_signal()
 
             args.freq_band = 0;  // frequency band on which the DMA has to transfer the samples
         }
-    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_Fpga")
+    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_FPGA")
         {
             tmp_gnss_synchro.System = 'E';
             signal = "5X";
@@ -678,7 +678,7 @@ bool HybridObservablesTestFpga::acquire_signal()
 
             args.freq_band = 1;  // frequency band on which the DMA has to transfer the samples
         }
-    else if (implementation == "GPS_L5_DLL_PLL_Tracking_Fpga")
+    else if (implementation == "GPS_L5_DLL_PLL_Tracking_FPGA")
         {
             tmp_gnss_synchro.System = 'G';
             signal = "L5";
@@ -732,19 +732,19 @@ bool HybridObservablesTestFpga::acquire_signal()
 
     // number of samples that the DMA has to transfer
     unsigned int nsamples_to_transfer;
-    if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_Fpga")
+    if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_FPGA")
         {
             nsamples_to_transfer = static_cast<unsigned int>(std::round(static_cast<double>(baseband_sampling_freq) / (GPS_L1_CA_CODE_RATE_CPS / GPS_L1_CA_CODE_LENGTH_CHIPS)));
         }
-    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_Fpga")
+    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_FPGA")
         {
             nsamples_to_transfer = static_cast<unsigned int>(std::round(static_cast<double>(baseband_sampling_freq) / (GALILEO_E1_CODE_CHIP_RATE_CPS / GALILEO_E1_B_CODE_LENGTH_CHIPS)));
         }
-    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_Fpga")
+    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_FPGA")
         {
             nsamples_to_transfer = static_cast<unsigned int>(std::round(static_cast<double>(baseband_sampling_freq) / (GALILEO_E5A_CODE_CHIP_RATE_CPS / GALILEO_E5A_CODE_LENGTH_CHIPS)));
         }
-    else  // (if (implementation.compare("GPS_L5_DLL_PLL_Tracking_Fpga") == 0))
+    else  // (if (implementation.compare("GPS_L5_DLL_PLL_Tracking_FPGA") == 0))
         {
             nsamples_to_transfer = static_cast<unsigned int>(std::round(static_cast<double>(baseband_sampling_freq) / (GPS_L5I_CODE_RATE_CPS / GPS_L5I_CODE_LENGTH_CHIPS)));
         }
@@ -762,7 +762,7 @@ bool HybridObservablesTestFpga::acquire_signal()
             acquisition->init();
             acquisition->set_local_code();
 
-            if ((implementation == "GPS_L1_CA_DLL_PLL_Tracking_Fpga") or (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_Fpga"))
+            if ((implementation == "GPS_L1_CA_DLL_PLL_Tracking_FPGA") or (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_FPGA"))
                 {
                     // Skip the first TEST_OBS_SKIP_SAMPLES samples
                     args.skip_used_samples = 0;
@@ -910,7 +910,7 @@ void HybridObservablesTestFpga::configure_receiver(
     config->set_property("GNSS-SDR.internal_fs_sps", std::to_string(baseband_sampling_freq));
 
     std::string System_and_Signal;
-    if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_Fpga")
+    if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_FPGA")
         {
             gnss_synchro_master.System = 'G';
             std::string signal = "1C";
@@ -923,7 +923,7 @@ void HybridObservablesTestFpga::configure_receiver(
 
             config->set_property("TelemetryDecoder.implementation", "GPS_L1_CA_Telemetry_Decoder");
         }
-    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_Fpga")
+    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_FPGA")
         {
             gnss_synchro_master.System = 'E';
             std::string signal = "1B";
@@ -939,7 +939,7 @@ void HybridObservablesTestFpga::configure_receiver(
 
             config->set_property("TelemetryDecoder.implementation", "Galileo_E1B_Telemetry_Decoder");
         }
-    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_Fpga")  // or implementation.compare("Galileo_E5a_DLL_PLL_Tracking_b") == 0)
+    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_FPGA")  // or implementation.compare("Galileo_E5a_DLL_PLL_Tracking_b") == 0)
         {
             gnss_synchro_master.System = 'E';
             std::string signal = "5X";
@@ -953,7 +953,7 @@ void HybridObservablesTestFpga::configure_receiver(
 
             config->set_property("TelemetryDecoder.implementation", "Galileo_E5a_Telemetry_Decoder");
         }
-    else if (implementation == "GPS_L5_DLL_PLL_Tracking_Fpga")
+    else if (implementation == "GPS_L5_DLL_PLL_Tracking_FPGA")
         {
             gnss_synchro_master.System = 'G';
             std::string signal = "L5";
@@ -2031,22 +2031,22 @@ TEST_F(HybridObservablesTestFpga, ValidationOfResults)
     args.scaling_factor = DMA_SIGNAL_SCALING_FACTOR;
 
     // reset the HW to clear the sample counters: the acquisition constructor generates a reset
-    if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_Fpga")
+    if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_FPGA")
         {
             acquisition = std::make_shared<GpsL1CaPcpsAcquisitionFpga>(config.get(), "Acquisition", 0, 0);
             args.freq_band = 0;
         }
-    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_Fpga")
+    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_FPGA")
         {
             acquisition = std::make_shared<GalileoE1PcpsAmbiguousAcquisitionFpga>(config.get(), "Acquisition", 0, 0);
             args.freq_band = 0;
         }
-    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_Fpga")
+    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_FPGA")
         {
             acquisition = std::make_shared<GalileoE5aPcpsAcquisitionFpga>(config.get(), "Acquisition", 0, 0);
             args.freq_band = 1;
         }
-    else if (implementation == "GPS_L5_DLL_PLL_Tracking_Fpga")
+    else if (implementation == "GPS_L5_DLL_PLL_Tracking_FPGA")
         {
             acquisition = std::make_shared<GpsL5iPcpsAcquisitionFpga>(config.get(), "Acquisition", 0, 0);
             args.freq_band = 1;
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc
index 4bd43fc30..d5f2348af 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc
@@ -355,7 +355,7 @@ void GpsL1CADllPllTrackingTestFpga::configure_receiver()
         std::to_string(baseband_sampling_freq));
     // Set Tracking
     config->set_property("Tracking_1C.implementation",
-        "GPS_L1_CA_DLL_PLL_Tracking_Fpga");
+        "GPS_L1_CA_DLL_PLL_Tracking_FPGA");
     config->set_property("Tracking_1C.item_type", "cshort");
     config->set_property("Tracking_1C.dump", "true");
     config->set_property("Tracking_1C.dump_filename", "./tracking_ch_");
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc
index 33baeac6f..a2f27204e 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc
@@ -536,7 +536,7 @@ void TrackingPullInTestFpga::configure_receiver(
     config->set_property("GNSS-SDR.internal_fs_sps", std::to_string(baseband_sampling_freq));
 
     std::string System_and_Signal;
-    if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_Fpga")
+    if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_FPGA")
         {
             gnss_synchro.System = 'G';
             std::string signal = "1C";
@@ -545,7 +545,7 @@ void TrackingPullInTestFpga::configure_receiver(
             config->set_property("Tracking.early_late_space_chips", "0.5");
             config->set_property("Tracking.early_late_space_narrow_chips", "0.5");
         }
-    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_Fpga")
+    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_FPGA")
         {
             gnss_synchro.System = 'E';
             std::string signal = "1B";
@@ -557,7 +557,7 @@ void TrackingPullInTestFpga::configure_receiver(
             config->set_property("Tracking.very_early_late_space_narrow_chips", "0.6");
             config->set_property("Tracking.track_pilot", "true");
         }
-    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_Fpga" or implementation == "Galileo_E5a_DLL_PLL_Tracking_b_Fpga")
+    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_FPGA" or implementation == "Galileo_E5a_DLL_PLL_Tracking_b_Fpga")
         {
             gnss_synchro.System = 'E';
             std::string signal = "5X";
@@ -565,13 +565,13 @@ void TrackingPullInTestFpga::configure_receiver(
             signal.copy(gnss_synchro.Signal, 2, 0);
             if (implementation == "Galileo_E5a_DLL_PLL_Tracking_b")
                 {
-                    config->supersede_property("Tracking.implementation", std::string("Galileo_E5a_DLL_PLL_Tracking_Fpga"));
+                    config->supersede_property("Tracking.implementation", std::string("Galileo_E5a_DLL_PLL_Tracking_FPGA"));
                 }
             config->set_property("Tracking.early_late_space_chips", "0.5");
             config->set_property("Tracking.track_pilot", "true");
             config->set_property("Tracking.order", "2");
         }
-    else if (implementation == "GPS_L5_DLL_PLL_Tracking_Fpga")
+    else if (implementation == "GPS_L5_DLL_PLL_Tracking_FPGA")
         {
             gnss_synchro.System = 'G';
             std::string signal = "L5";
@@ -638,7 +638,7 @@ bool TrackingPullInTestFpga::acquire_signal(int SV_ID)
     switch_fpga->set_switch_position(0);  // set switch position to DMA
 
     // create the correspondign acquisition block according to the desired tracking signal
-    if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_Fpga")
+    if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_FPGA")
         {
             tmp_gnss_synchro.System = 'G';
             signal = "1C";
@@ -650,7 +650,7 @@ bool TrackingPullInTestFpga::acquire_signal(int SV_ID)
 
             args.freq_band = 0;  // frequency band on which the DMA has to transfer the samples
         }
-    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_Fpga")
+    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_FPGA")
         {
             tmp_gnss_synchro.System = 'E';
             signal = "1B";
@@ -662,7 +662,7 @@ bool TrackingPullInTestFpga::acquire_signal(int SV_ID)
 
             args.freq_band = 0;  // frequency band on which the DMA has to transfer the samples
         }
-    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_Fpga")
+    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_FPGA")
         {
             tmp_gnss_synchro.System = 'E';
             signal = "5X";
@@ -674,7 +674,7 @@ bool TrackingPullInTestFpga::acquire_signal(int SV_ID)
 
             args.freq_band = 1;  // frequency band on which the DMA has to transfer the samples
         }
-    else if (implementation == "GPS_L5_DLL_PLL_Tracking_Fpga")
+    else if (implementation == "GPS_L5_DLL_PLL_Tracking_FPGA")
         {
             tmp_gnss_synchro.System = 'G';
             signal = "L5";
@@ -732,19 +732,19 @@ bool TrackingPullInTestFpga::acquire_signal(int SV_ID)
 
     // number of samples that the DMA has to transfer
     unsigned int nsamples_to_transfer;
-    if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_Fpga")
+    if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_FPGA")
         {
             nsamples_to_transfer = static_cast<unsigned int>(std::round(static_cast<double>(baseband_sampling_freq) / (GPS_L1_CA_CODE_RATE_CPS / GPS_L1_CA_CODE_LENGTH_CHIPS)));
         }
-    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_Fpga")
+    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_FPGA")
         {
             nsamples_to_transfer = static_cast<unsigned int>(std::round(static_cast<double>(baseband_sampling_freq) / (GALILEO_E1_CODE_CHIP_RATE_CPS / GALILEO_E1_B_CODE_LENGTH_CHIPS)));
         }
-    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_Fpga")
+    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_FPGA")
         {
             nsamples_to_transfer = static_cast<unsigned int>(std::round(static_cast<double>(baseband_sampling_freq) / (GALILEO_E5A_CODE_CHIP_RATE_CPS / GALILEO_E5A_CODE_LENGTH_CHIPS)));
         }
-    else  // (if (implementation.compare("GPS_L5_DLL_PLL_Tracking_Fpga") == 0))
+    else  // (if (implementation.compare("GPS_L5_DLL_PLL_Tracking_FPGA") == 0))
         {
             nsamples_to_transfer = static_cast<unsigned int>(std::round(static_cast<double>(baseband_sampling_freq) / (GPS_L5I_CODE_RATE_CPS / GPS_L5I_CODE_LENGTH_CHIPS)));
         }
@@ -762,7 +762,7 @@ bool TrackingPullInTestFpga::acquire_signal(int SV_ID)
             acquisition->init();
             acquisition->set_local_code();
 
-            if ((implementation == "GPS_L1_CA_DLL_PLL_Tracking_Fpga") or (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_Fpga"))
+            if ((implementation == "GPS_L1_CA_DLL_PLL_Tracking_FPGA") or (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_FPGA"))
                 {
                     // Configure the DMA to send TEST_TRK_PULL_IN_TEST_SKIP_SAMPLES in order to initialize the internal
                     // states of the downsampling filter in the FPGA
@@ -1079,22 +1079,22 @@ TEST_F(TrackingPullInTestFpga, ValidationOfResults)
                             std::shared_ptr<AcquisitionInterface> acquisition;
 
                             // reset the HW to clear the sample counters: the acquisition constructor generates a reset
-                            if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_Fpga")
+                            if (implementation == "GPS_L1_CA_DLL_PLL_Tracking_FPGA")
                                 {
                                     acquisition = std::make_shared<GpsL1CaPcpsAcquisitionFpga>(config.get(), "Acquisition", 0, 0);
                                     args.freq_band = 0;
                                 }
-                            else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_Fpga")
+                            else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking_FPGA")
                                 {
                                     acquisition = std::make_shared<GalileoE1PcpsAmbiguousAcquisitionFpga>(config.get(), "Acquisition", 0, 0);
                                     args.freq_band = 0;
                                 }
-                            else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_Fpga")
+                            else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_FPGA")
                                 {
                                     acquisition = std::make_shared<GalileoE5aPcpsAcquisitionFpga>(config.get(), "Acquisition", 0, 0);
                                     args.freq_band = 1;
                                 }
-                            else if (implementation == "GPS_L5_DLL_PLL_Tracking_Fpga")
+                            else if (implementation == "GPS_L5_DLL_PLL_Tracking_FPGA")
                                 {
                                     acquisition = std::make_shared<GpsL5iPcpsAcquisitionFpga>(config.get(), "Acquisition", 0, 0);
                                     args.freq_band = 1;