Index: /issm/trunk-jpl/src/c/shared/Enum/Enum.vim
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/Enum.vim	(revision 27121)
+++ /issm/trunk-jpl/src/c/shared/Enum/Enum.vim	(revision 27122)
@@ -115,8 +115,8 @@
 syn keyword cConstant CalvingTestIndependentRateEnum
 syn keyword cConstant CalvingUseParamEnum
-syn keyword cConstant CalvingScaleThetaEnum
-syn keyword cConstant CalvingAmpAlphaEnum
-syn keyword cConstant CalvingMidpointEnum
-syn keyword cConstant CalvingNonlinearLawEnum
+syn keyword cConstant CalvingThetaEnum
+syn keyword cConstant CalvingAlphaEnum
+syn keyword cConstant CalvingXoffsetEnum
+syn keyword cConstant CalvingYoffsetEnum
 syn keyword cConstant ConfigurationTypeEnum
 syn keyword cConstant ConstantsGEnum
Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp	(revision 27121)
+++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp	(revision 27122)
@@ -117,8 +117,8 @@
 		case CalvingTestIndependentRateEnum : return "CalvingTestIndependentRate";
 		case CalvingUseParamEnum : return "CalvingUseParam";
-		case CalvingScaleThetaEnum : return "CalvingScaleTheta";
-		case CalvingAmpAlphaEnum : return "CalvingAmpAlpha";
-		case CalvingMidpointEnum : return "CalvingMidpoint";
-		case CalvingNonlinearLawEnum : return "CalvingNonlinearLaw";
+		case CalvingThetaEnum : return "CalvingTheta";
+		case CalvingAlphaEnum : return "CalvingAlpha";
+		case CalvingXoffsetEnum : return "CalvingXoffset";
+		case CalvingYoffsetEnum : return "CalvingYoffset";
 		case ConfigurationTypeEnum : return "ConfigurationType";
 		case ConstantsGEnum : return "ConstantsG";
Index: /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim	(revision 27121)
+++ /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim	(revision 27122)
@@ -108,8 +108,8 @@
 syn keyword juliaConstC CalvingTestIndependentRateEnum
 syn keyword juliaConstC CalvingUseParamEnum
-syn keyword juliaConstC CalvingScaleThetaEnum
-syn keyword juliaConstC CalvingAmpAlphaEnum
-syn keyword juliaConstC CalvingMidpointEnum
-syn keyword juliaConstC CalvingNonlinearLawEnum
+syn keyword juliaConstC CalvingThetaEnum
+syn keyword juliaConstC CalvingAlphaEnum
+syn keyword juliaConstC CalvingXoffsetEnum
+syn keyword juliaConstC CalvingYoffsetEnum
 syn keyword juliaConstC ConfigurationTypeEnum
 syn keyword juliaConstC ConstantsGEnum
Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp	(revision 27121)
+++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp	(revision 27122)
@@ -117,8 +117,8 @@
 	      else if (strcmp(name,"CalvingTestIndependentRate")==0) return CalvingTestIndependentRateEnum;
 	      else if (strcmp(name,"CalvingUseParam")==0) return CalvingUseParamEnum;
-	      else if (strcmp(name,"CalvingScaleTheta")==0) return CalvingScaleThetaEnum;
-	      else if (strcmp(name,"CalvingAmpAlpha")==0) return CalvingAmpAlphaEnum;
-	      else if (strcmp(name,"CalvingMidpoint")==0) return CalvingMidpointEnum;
-	      else if (strcmp(name,"CalvingNonlinearLaw")==0) return CalvingNonlinearLawEnum;
+	      else if (strcmp(name,"CalvingTheta")==0) return CalvingThetaEnum;
+	      else if (strcmp(name,"CalvingAlpha")==0) return CalvingAlphaEnum;
+	      else if (strcmp(name,"CalvingXoffset")==0) return CalvingXoffsetEnum;
+	      else if (strcmp(name,"CalvingYoffset")==0) return CalvingYoffsetEnum;
 	      else if (strcmp(name,"ConfigurationType")==0) return ConfigurationTypeEnum;
 	      else if (strcmp(name,"ConstantsG")==0) return ConstantsGEnum;