diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m
index 3a544d57a6d7a853de3ae9b72062f95f60cc5436..03cdaf098c76f3af08adfc2c160df99f08eb871d 100644
--- a/crpptbx/TCV/gdat_tcv.m
+++ b/crpptbx/TCV/gdat_tcv.m
@@ -1105,10 +1105,10 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
       NBH_in_TCV = 0;
       if shot >= 51641
         % NBI
-        moderemote = mdsdata('data(\VSYSTEM::TCV_NBHDB_B["NBI:MODEREMOTE_RB"])');
+        moderemote = mdsdata('data(\VSYSTEM::TCV_NBHDB_B["NBI:MODEREMOTE_FB"])');
         lcs_mode   = mdsdata('data(\VSYSTEM::TCV_NBHDB_I["NBI:LCS_MODE"])');
-        % NBH in TCV equiv moderemote='OK' AND lcs_mode = 9
-        NBH_in_TCV = strcmpi(strtrim(moderemote),'OK') && lcs_mode == 9;
+        % NBH in TCV equiv moderemote='ON' AND lcs_mode = 9
+        NBH_in_TCV = strcmpi(strtrim(moderemote),'ON') && lcs_mode == 9;
       else
         % Nodes used in previous block only exist outside of Vista for shots after 51641
         if any(shot == [51458 51459 51460 51461 51463 51465 51470 51472 ... % 29.JAN.2016
@@ -1601,10 +1601,10 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
       NBH_in_TCV = 0;
       if shot >= 51641
         % NBI
-        moderemote = mdsdata('data(\VSYSTEM::TCV_NBHDB_B["NBI:MODEREMOTE_RB"])');
+        moderemote = mdsdata('data(\VSYSTEM::TCV_NBHDB_B["NBI:MODEREMOTE_FB"])');
         lcs_mode   = mdsdata('data(\VSYSTEM::TCV_NBHDB_I["NBI:LCS_MODE"])');
-        % NBH in TCV equiv moderemote='OK' AND lcs_mode = 9
-        NBH_in_TCV = strcmpi(strtrim(moderemote),'OK') && lcs_mode == 9;
+        % NBH in TCV equiv moderemote='ON' AND lcs_mode = 9
+        NBH_in_TCV = strcmpi(strtrim(moderemote),'ON') && lcs_mode == 9;
       else
         % Nodes used in previous block only exist outside of Vista for shots after 51641
         if any(shot == [51458 51459 51460 51461 51463 51465 51470 51472 ... % 29.JAN.2016