Index: /issm/trunk-jpl/test/NightlyRun/IdToName.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/IdToName.m	(revision 15874)
+++ /issm/trunk-jpl/test/NightlyRun/IdToName.m	(revision 15875)
@@ -9,5 +9,5 @@
 	case 102, name='SquareShelfConstrainedStressSSA3d';
 	case 103, name='SquareShelfConstrainedStressHO';
-	case 104, name='SquareShelfConstrainedStressS3d';
+	case 104, name='SquareShelfConstrainedStressFS';
 	case 105, name='SquareShelfConstrainedMasstransp2d';
 	case 106, name='SquareShelfConstrainedMasstransp2dDG';
@@ -31,5 +31,5 @@
 	case 202, name='SquareShelfStressSSA3d';
 	case 203, name='SquareShelfStressHO';
-	case 204, name='SquareShelfStressS3d';
+	case 204, name='SquareShelfStressFS';
 	case 205, name='SquareShelfStressMHOPenalties';
 	case 206, name='SquareShelfTherStea';
@@ -38,9 +38,9 @@
 	case 209, name='SquareShelfTranSSA3d';
 	case 210, name='SquareShelfTranHO';
-	case 211, name='SquareShelfTranS3d';
+	case 211, name='SquareShelfTranFS';
 	case 212, name='SquareShelfCMBSSA2d';
 	case 213, name='SquareShelfCMBSSA3d';
 	case 214, name='SquareShelfCMBHO';
-	case 215, name='SquareShelfCMBS3d';
+	case 215, name='SquareShelfCMBFS';
 	case 216, name='SquareShelfStressSSA2dRift';
 	case 217, name='SquareShelfConstrained';
@@ -80,5 +80,5 @@
 	case 306, name='SquareSheetConstrainedStressHSSA3d';
 	case 307, name='SquareSheetConstrainedStressHO';
-	case 308, name='SquareSheetConstrainedStressS3d';
+	case 308, name='SquareSheetConstrainedStressFS';
 	case 309, name='SquareSheetConstrainedMasstransp2d';
 	case 320, name='SquareSheetConstrainedMasstransp2dDG';
@@ -94,5 +94,5 @@
 	case 320, name='SquareSheetConstrainedCMDragSSA3d';
 	case 321, name='SquareSheetConstrainedCMDragHO';
-	case 322, name='SquareSheetConstrainedCMDragS3d';
+	case 322, name='SquareSheetConstrainedCMDragFS';
 	case 323, name='SquareSheetConstrainedTranCflSSA2d';
 	case 324, name='SquareSheetConstrainedTranCflSIA3d';
@@ -108,5 +108,5 @@
 	case 402, name='SquareSheetShelfStressSSA3d';
 	case 403, name='SquareSheetShelfStressHO';
-	case 404, name='SquareSheetShelfStressS3d';
+	case 404, name='SquareSheetShelfStressFS';
 	case 405, name='SquareSheetShelfStressMHOPenalties';
 	case 406, name='SquareSheetShelfTherStea';
@@ -134,5 +134,5 @@
 	case 428, name='SquareSheetShelfStressSSA2dNewton';
 	case 429, name='SquareSheetShelfStressHONewton';
-	case 430, name='SquareSheetShelfStressS3dNewton';
+	case 430, name='SquareSheetShelfStressFSNewton';
 	case 431, name='SquareSheetShelfSteaEnthalpySSA3d';
 	case 432, name='SquareSheetShelfSteaEnthalpyHO';
@@ -141,13 +141,13 @@
 	case 501, name='PigStressSSA2d';
 	case 502, name='PigStressHO';
-	case 503, name='PigStressS3d';
+	case 503, name='PigStressFS';
 	case 504, name='PigTranSSA2d';
 	case 505, name='PigTranSSA3d';
 	case 506, name='PigTranHO';
-	case 507, name='PigTranS3d';
+	case 507, name='PigTranFS';
 	case 508, name='PigSteaSSA3d';
 	case 509, name='PigSteaHO';
-	case 510, name='PigSteaS3d';
-	case 511, name='PigCMBS3d';
+	case 510, name='PigSteaFS';
+	case 511, name='PigCMBFS';
 	case 512, name='PigCMDragHO';
 	case 513, name='PigCMDragSteaSSA3d';
@@ -212,5 +212,5 @@
 	case 3002, name='SquareShelfConstrainedStressSSA3dAdolc';
 	case 3003, name='SquareShelfConstrainedStressHOAdolc';
-	case 3004, name='SquareShelfConstrainedStressS3dAdolc';
+	case 3004, name='SquareShelfConstrainedStressFSAdolc';
 	case 3005, name='SquareShelfConstrainedMasstransp2dAdolc';
 	case 3006, name='SquareShelfConstrainedMasstransp2dDGAdolc';
Index: /issm/trunk-jpl/test/NightlyRun/IdToName.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/IdToName.py	(revision 15874)
+++ /issm/trunk-jpl/test/NightlyRun/IdToName.py	(revision 15875)
@@ -13,5 +13,5 @@
 	102 : 'SquareShelfConstrainedStressSSA3d',
 	103 : 'SquareShelfConstrainedStressHO',
-	104 : 'SquareShelfConstrainedStressS3d',
+	104 : 'SquareShelfConstrainedStressFS',
 	105 : 'SquareShelfConstrainedMasstransp2d',
 	106 : 'SquareShelfConstrainedMasstransp2dDG',
@@ -35,5 +35,5 @@
 	202 : 'SquareShelfStressSSA3d',
 	203 : 'SquareShelfStressHO',
-	204 : 'SquareShelfStressS3d',
+	204 : 'SquareShelfStressFS',
 	205 : 'SquareShelfStressMHOPenalties',
 	206 : 'SquareShelfTherStea',
@@ -42,9 +42,9 @@
 	209 : 'SquareShelfTranSSA3d',
 	210 : 'SquareShelfTranHO',
-	211 : 'SquareShelfTranS3d',
+	211 : 'SquareShelfTranFS',
 	212 : 'SquareShelfCMBSSA2d',
 	213 : 'SquareShelfCMBSSA3d',
 	214 : 'SquareShelfCMBHO',
-	215 : 'SquareShelfCMBS3d',
+	215 : 'SquareShelfCMBFS',
 	216 : 'SquareShelfStressSSA2dRift',
 	217 : 'SquareShelfConstrained',
@@ -84,5 +84,5 @@
 	306  : 'SquareSheetConstrainedStressHSSA3d',
 	307  : 'SquareSheetConstrainedStressHO',
-	308  : 'SquareSheetConstrainedStressS3d',
+	308  : 'SquareSheetConstrainedStressFS',
 	309  : 'SquareSheetConstrainedMasstransp2d',
 	320  : 'SquareSheetConstrainedMasstransp2dDG',
@@ -98,5 +98,5 @@
 	320  : 'SquareSheetConstrainedCMDragSSA3d',
 	321  : 'SquareSheetConstrainedCMDragHO',
-	322  : 'SquareSheetConstrainedCMDragS3d',
+	322  : 'SquareSheetConstrainedCMDragFS',
 	323  : 'SquareSheetConstrainedTranCflSSA2d',
 	324  : 'SquareSheetConstrainedTranCflSIA3d',
@@ -112,5 +112,5 @@
 	402  : 'SquareSheetShelfStressSSA3d',
 	403  : 'SquareSheetShelfStressHO',
-	404  : 'SquareSheetShelfStressS3d',
+	404  : 'SquareSheetShelfStressFS',
 	405  : 'SquareSheetShelfStressMHOPenalties',
 	406  : 'SquareSheetShelfTherStea',
@@ -138,5 +138,5 @@
 	428  : 'SquareSheetShelfStressSSA2dNewton',
 	429  : 'SquareSheetShelfStressHONewton',
-	430  : 'SquareSheetShelfStressS3dNewton',
+	430  : 'SquareSheetShelfStressFSNewton',
 	431  : 'SquareSheetShelfSteaEnthalpySSA3d',
 	432  : 'SquareSheetShelfSteaEnthalpyHO',
@@ -145,13 +145,13 @@
 	501  : 'PigStressSSA2d',
 	502  : 'PigStressHO',
-	503  : 'PigStressS3d',
+	503  : 'PigStressFS',
 	504  : 'PigTranSSA2d',
 	505  : 'PigTranSSA3d',
 	506  : 'PigTranHO',
-	507  : 'PigTranS3d',
+	507  : 'PigTranFS',
 	508  : 'PigSteaSSA3d',
 	509  : 'PigSteaHO',
-	510  : 'PigSteaS3d',
-	511  : 'PigCMBS3d',
+	510  : 'PigSteaFS',
+	511  : 'PigCMBFS',
 	512  : 'PigCMDragHO',
 	513  : 'PigCMDragSteaSSA3d',
@@ -216,5 +216,5 @@
 	3002 : 'SquareShelfConstrainedStressSSA3dAdolc',
 	3003 : 'SquareShelfConstrainedStressHOAdolc',
-	3004 : 'SquareShelfConstrainedStressS3dAdolc',
+	3004 : 'SquareShelfConstrainedStressFSAdolc',
 	3005 : 'SquareShelfConstrainedMasstransp2dAdolc',
 	3006 : 'SquareShelfConstrainedMasstransp2dDGAdolc',