Index: /issm/trunk-jpl/src/m/classes/toolkits.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/toolkits.m	(revision 14688)
+++ /issm/trunk-jpl/src/m/classes/toolkits.m	(revision 14689)
@@ -6,5 +6,5 @@
 classdef toolkits < dynamicprops
     properties (SetAccess=public) 
-		 NoneAnalysis           = struct();
+		 DefaultAnalysis           = struct();
 		 %The other properties are dynamic
 	 end
@@ -41,7 +41,7 @@
 			 %MUMPS is the default toolkits
 			 if ismumps(),
-				 obj.NoneAnalysis           = mumpsoptions();
+				 obj.DefaultAnalysis           = mumpsoptions();
 			 else
-				 obj.NoneAnalysis           = iluasmoptions();
+				 obj.DefaultAnalysis           = iluasmoptions();
 			 end
 
Index: /issm/trunk-jpl/src/m/classes/toolkits.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/toolkits.py	(revision 14688)
+++ /issm/trunk-jpl/src/m/classes/toolkits.py	(revision 14689)
@@ -19,7 +19,7 @@
 		#MUMPS is the default toolkits
 		if ismumps():
-			self.NoneAnalysis           = mumpsoptions()
+			self.DefaultAnalysis           = mumpsoptions()
 		else:
-			self.NoneAnalysis           = iluasmoptions()
+			self.DefaultAnalysis           = iluasmoptions()
 
 		#The other properties are dynamic
Index: /issm/trunk-jpl/src/m/enum/DefaultAnalysisEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/DefaultAnalysisEnum.m	(revision 14689)
+++ /issm/trunk-jpl/src/m/enum/DefaultAnalysisEnum.m	(revision 14689)
@@ -0,0 +1,11 @@
+function macro=DefaultAnalysisEnum()
+%DEFAULTANALYSISENUM - Enum of DefaultAnalysis
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
+%            Please read src/c/EnumDefinitions/README for more information
+%
+%   Usage:
+%      macro=DefaultAnalysisEnum()
+
+macro=StringToEnum('DefaultAnalysis');
Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py
===================================================================
--- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py	(revision 14688)
+++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py	(revision 14689)
@@ -2279,4 +2279,24 @@
 	return StringToEnum('AnalysisCounter')[0]
 
+def NoneAnalysisEnum():
+	"""
+	NONEANALYSISENUM - Enum of NoneAnalysis
+
+	   Usage:
+	      macro=NoneAnalysisEnum()
+	"""
+
+	return StringToEnum('NoneAnalysis')[0]
+
+def DefaultAnalysisEnum():
+	"""
+	DEFAULTANALYSISENUM - Enum of DefaultAnalysis
+
+	   Usage:
+	      macro=DefaultAnalysisEnum()
+	"""
+
+	return StringToEnum('DefaultAnalysis')[0]
+
 def BalancethicknessAnalysisEnum():
 	"""
@@ -2469,14 +2489,4 @@
 	return StringToEnum('MeltingAnalysis')[0]
 
-def NoneAnalysisEnum():
-	"""
-	NONEANALYSISENUM - Enum of NoneAnalysis
-
-	   Usage:
-	      macro=NoneAnalysisEnum()
-	"""
-
-	return StringToEnum('NoneAnalysis')[0]
-
 def PrognosticAnalysisEnum():
 	"""
@@ -3019,4 +3029,14 @@
 	return StringToEnum('TransientParam')[0]
 
+def IceFrontTypeEnum():
+	"""
+	ICEFRONTTYPEENUM - Enum of IceFrontType
+
+	   Usage:
+	      macro=IceFrontTypeEnum()
+	"""
+
+	return StringToEnum('IceFrontType')[0]
+
 def MacAyeal2dIceFrontEnum():
 	"""
@@ -3089,4 +3109,14 @@
 	return StringToEnum('Numericalflux')[0]
 
+def NumericalfluxTypeEnum():
+	"""
+	NUMERICALFLUXTYPEENUM - Enum of NumericalfluxType
+
+	   Usage:
+	      macro=NumericalfluxTypeEnum()
+	"""
+
+	return StringToEnum('NumericalfluxType')[0]
+
 def ParamEnum():
 	"""
@@ -3199,4 +3229,14 @@
 	return StringToEnum('Riftfront')[0]
 
+def RiftfrontTypeEnum():
+	"""
+	RIFTFRONTTYPEENUM - Enum of RiftfrontType
+
+	   Usage:
+	      macro=RiftfrontTypeEnum()
+	"""
+
+	return StringToEnum('RiftfrontType')[0]
+
 def SegmentEnum():
 	"""
@@ -3849,14 +3889,4 @@
 	return StringToEnum('ThicknessAbsMisfit')[0]
 
-def TypeEnum():
-	"""
-	TYPEENUM - Enum of Type
-
-	   Usage:
-	      macro=TypeEnum()
-	"""
-
-	return StringToEnum('Type')[0]
-
 def VelEnum():
 	"""
@@ -5167,4 +5197,4 @@
 	"""
 
-	return 515
-
+	return 518
+
Index: /issm/trunk-jpl/src/m/enum/IceFrontTypeEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/IceFrontTypeEnum.m	(revision 14689)
+++ /issm/trunk-jpl/src/m/enum/IceFrontTypeEnum.m	(revision 14689)
@@ -0,0 +1,11 @@
+function macro=IceFrontTypeEnum()
+%ICEFRONTTYPEENUM - Enum of IceFrontType
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
+%            Please read src/c/EnumDefinitions/README for more information
+%
+%   Usage:
+%      macro=IceFrontTypeEnum()
+
+macro=StringToEnum('IceFrontType');
Index: /issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m	(revision 14688)
+++ /issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m	(revision 14689)
@@ -9,3 +9,3 @@
 %      macro=MaximumNumberOfEnums()
 
-macro=515;
+macro=518;
Index: /issm/trunk-jpl/src/m/enum/NumericalfluxTypeEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/NumericalfluxTypeEnum.m	(revision 14689)
+++ /issm/trunk-jpl/src/m/enum/NumericalfluxTypeEnum.m	(revision 14689)
@@ -0,0 +1,11 @@
+function macro=NumericalfluxTypeEnum()
+%NUMERICALFLUXTYPEENUM - Enum of NumericalfluxType
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
+%            Please read src/c/EnumDefinitions/README for more information
+%
+%   Usage:
+%      macro=NumericalfluxTypeEnum()
+
+macro=StringToEnum('NumericalfluxType');
Index: /issm/trunk-jpl/src/m/enum/RiftfrontTypeEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/RiftfrontTypeEnum.m	(revision 14689)
+++ /issm/trunk-jpl/src/m/enum/RiftfrontTypeEnum.m	(revision 14689)
@@ -0,0 +1,11 @@
+function macro=RiftfrontTypeEnum()
+%RIFTFRONTTYPEENUM - Enum of RiftfrontType
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
+%            Please read src/c/EnumDefinitions/README for more information
+%
+%   Usage:
+%      macro=RiftfrontTypeEnum()
+
+macro=StringToEnum('RiftfrontType');
Index: sm/trunk-jpl/src/m/enum/TypeEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/TypeEnum.m	(revision 14688)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=TypeEnum()
-%TYPEENUM - Enum of Type
-%
-%   WARNING: DO NOT MODIFY THIS FILE
-%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
-%            Please read src/c/EnumDefinitions/README for more information
-%
-%   Usage:
-%      macro=TypeEnum()
-
-macro=StringToEnum('Type');