diff --git a/common/utils/LOG/vcd_signal_dumper.h b/common/utils/LOG/vcd_signal_dumper.h
index 07fedf917ddaf112e237f9d38a7b4048b29d99e3..601465c628dc725b0502235e7b7ac14ced6dab9c 100644
--- a/common/utils/LOG/vcd_signal_dumper.h
+++ b/common/utils/LOG/vcd_signal_dumper.h
@@ -532,7 +532,7 @@ typedef enum {
   VCD_SIGNAL_DUMPER_FUNCTIONS_PSS_SYNCHRO_NR,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PSS_SEARCH_TIME_NR,
   VCD_SIGNAL_DUMPER_FUNCTIONS_NR_INITIAL_UE_SYNC,
-  VCD_SIGNAL_DUMPER_FUNCTIONS_BEAM_GPIO,
+  VCD_SIGNAL_DUMPER_FUNCTIONS_BEAM_SWITCHING_GPIO,
 
 
   VCD_SIGNAL_DUMPER_FUNCTIONS_END
diff --git a/common/utils/T/T_messages.txt b/common/utils/T/T_messages.txt
index 272b9af070ba24e39e12b71c84b0c92094ebfd5a..d036b405606a78cb1b73d9564ec2b8ddc9383b29 100644
--- a/common/utils/T/T_messages.txt
+++ b/common/utils/T/T_messages.txt
@@ -3490,8 +3490,8 @@ ID = VCD_FUNCTION_NR_INITIAL_UE_SYNC
     GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
     VCD_NAME = nr_initial_ue_sync
-ID = VCD_SIGNAL_DUMPER_FUNCTIONS_BEAM_GPIO
-    DESC = VCD function BEAM_GPIO
+ID = VCD_FUNCTION_BEAM_SWITCHING_GPIO
+    DESC = VCD function BEAM_SWITCHING_GPIO
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
     VCD_NAME = beam_switching_gpio
diff --git a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
index 70a8197c7dc9f6d4a9fc9fb5cefbc351a1bc0f62..1377086e8f47f57eba45b38a32a0c16868e20407 100644
--- a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+++ b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
@@ -420,7 +420,7 @@ static int trx_usrp_write(openair0_device *device,
     s->tx_md.time_spec      = uhd::time_spec_t::from_ticks(timestamp, s->sample_rate);
     s->tx_count++;
 
-VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_BEAM_GPIO,1);
+VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_BEAM_SWITCHING_GPIO,1);
     // bit 3 enables gpio (for backward compatibility)
     if (flags_msb&8) {
       // push GPIO bits 7-9 from flags_msb
@@ -429,7 +429,7 @@ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_BEAM_GPIO,1)
       s->usrp->set_gpio_attr("FP0", "OUT", gpio789, 0x380);
       s->usrp->clear_command_time();
     }
-VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_BEAM_GPIO,0);
+VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_BEAM_SWITCHING_GPIO,0);
 
     if (cc>1) {
       std::vector<void *> buff_ptrs;