diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m
index 2d9cb68e69824e7b7da172eefdbe50695ef5ddcb..d872c08c3f9a3d82824c8be975fb2d1404403252 100644
--- a/crpptbx/TCV/gdat_tcv.m
+++ b/crpptbx/TCV/gdat_tcv.m
@@ -1483,7 +1483,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
     % need to get q_rho but to avoid loop for rhotor in grids_1d, get q_rho explicitely here
     params_eff = gdat_data.gdat_params;
     if liuqe_matlab==1
-      nodenameeff = 'tcv_eq(''tor_flux_tot'',''LIUQE.M'')';
+      nodenameeff = ['tcv_eq(''tor_flux_tot'',''' psitbx_str ''')'];
       phi_tor = tdi(nodenameeff);
     else
       phi_tor.data = [];
@@ -1673,7 +1673,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
         return
       end
     else
-      nodenameeff=['tcv_eq(''vol'',''LIUQE.M' substr_liuqe_tcv_eq ''')'];
+      nodenameeff=['tcv_eq(''vol'',''' psitbx_str ''')'];
     end
     if liuqe_version_eff==-1
       data_request_eff = 'volume'; % only LCFS
diff --git a/crpptbx/TCV/tcv_requests_mapping.m b/crpptbx/TCV/tcv_requests_mapping.m
index b66cef305338bdeb0d550017623a9138ccf39971..d3a517627cab50105a5d5e539e6d1783ce16ec42 100644
--- a/crpptbx/TCV/tcv_requests_mapping.m
+++ b/crpptbx/TCV/tcv_requests_mapping.m
@@ -199,11 +199,11 @@ switch lower(data_request)
   mapping.label = 'nG=Ip[MA]/(\pi a^2)*1e20 on nel times';
   mapping.method = 'expression';
   mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''nel'';' ...
-                    'gdat_tmp=gdat_aug(shot,params_eff);params_eff.data_request=''ip'';' ...
-		    'gdat_tmp2=gdat_aug(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ...
+                    'gdat_tmp=gdat_tcv(shot,params_eff);params_eff.data_request=''ip'';' ...
+		    'gdat_tmp2=gdat_tcv(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ...
 		    'tmp_data2=interp1(gdat_tmp2.t,gdat_tmp2.data,gdat_tmp.t,[],NaN);' ...
                     'params_eff.data_request=''a_minor'';' ...
-		    'gdat_tmp3=gdat_aug(shot,params_eff);ij=find(gdat_tmp3.data==0);gdat_tmp3.data(ij)=NaN;' ...
+		    'gdat_tmp3=gdat_tcv(shot,params_eff);ij=find(gdat_tmp3.data==0);gdat_tmp3.data(ij)=NaN;' ...
 		    'tmp_data3=interp1(gdat_tmp3.t,gdat_tmp3.data,gdat_tmp.t,[],NaN);' ...
 		    'gdat_tmp.data = tmp_data2*1e-6./pi./(tmp_data3.^2+1e-5);' ...
 		    'ij=find(gdat_tmp.data<0 | gdat_tmp.data>4);gdat_tmp.data(ij)=NaN;gdat_tmp.data = gdat_tmp.data * 1e20;'];
@@ -212,8 +212,8 @@ switch lower(data_request)
   mapping.label = 'Greenwald\_fraction=n\_el/n\_G';
   mapping.method = 'expression';
   mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''nel'';' ...
-                    'gdat_tmp=gdat_aug(shot,params_eff);params_eff.data_request=''n_greenwald'';' ...
-		    'gdat_tmp2=gdat_aug(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ...
+                    'gdat_tmp=gdat_tcv(shot,params_eff);params_eff.data_request=''n_greenwald'';' ...
+		    'gdat_tmp2=gdat_tcv(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ...
 		    'tmp_data2=interp1(gdat_tmp2.t,gdat_tmp2.data,gdat_tmp.t,[],NaN);' ...
 		    'gdat_tmp.data = gdat_tmp.data./(tmp_data2+1e-5);'];
  case {'phi_tor', 'phitor', 'toroidal_flux'}