Index: /issm/trunk/src/m/solutions/NewFemModel.m
===================================================================
--- /issm/trunk/src/m/solutions/NewFemModel.m	(revision 4365)
+++ /issm/trunk/src/m/solutions/NewFemModel.m	(revision 4366)
@@ -32,5 +32,5 @@
 	   displaystring(md.verbose,'%s%s','   dealing with analysis type: ',EnumAsString(analysis_type));
 
-		femmodel=SetCurrentAnalysis(femmodel,analysis_type);
+		femmodel=SetCurrentConfiguration(femmodel,analysis_type);
 
 	   displaystring(md.verbose,'%s','      generating degrees of freedofemmodel...');
Index: /issm/trunk/src/m/solutions/SetCurrentAnalysis.m
===================================================================
--- /issm/trunk/src/m/solutions/SetCurrentAnalysis.m	(revision 4365)
+++ /issm/trunk/src/m/solutions/SetCurrentAnalysis.m	(revision 4366)
@@ -1,10 +1,10 @@
-function femmodel=SetCurrentAnalysis(femmodel,analysis_enum)
-%SETCURRENTANALYSIS - set current analysis used to configure elements and nodes in our solutions
+function femmodel=SetCurrentConfiguration(femmodel,analysis_enum)
+%SETCURRENTCONFIGURATION- set current analysis used to configure elements and nodes in our solutions
 %
 %   Usage:
-%      femmodel=SetCurrentAnalysis(femmodel,analysis_type)
+%      femmodel=SetCurrentConfiguration(femmodel,analysis_type)
 %
 %   Ex:
-%      femmodel=SetCurrentAnalysis(femmodel,DiagnosticHorizAnalysisEnum)
+%      femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum)
 %
 
@@ -20,5 +20,5 @@
 
 	if found==-1,
-		error('SetCurrentAnalysis error message: could not find analysis_type in list of FemModel analyses');
+		error('SetCurrentConfiguration error message: could not find analysis_type in list of FemModel analyses');
 	end
 	
Index: /issm/trunk/src/m/solutions/balancedthickness2_core.m
===================================================================
--- /issm/trunk/src/m/solutions/balancedthickness2_core.m	(revision 4365)
+++ /issm/trunk/src/m/solutions/balancedthickness2_core.m	(revision 4366)
@@ -11,5 +11,5 @@
 
 	%Activate formulation
-	femmodel=SetCurrentAnalysis(femmodel,Balancedthickness2AnalysisEnum);
+	femmodel=SetCurrentConfiguration(femmodel,Balancedthickness2AnalysisEnum);
 
 	displaystring(verbose,'\n%s',['depth averaging velocities...']);
Index: /issm/trunk/src/m/solutions/balancedthickness_core.m
===================================================================
--- /issm/trunk/src/m/solutions/balancedthickness_core.m	(revision 4365)
+++ /issm/trunk/src/m/solutions/balancedthickness_core.m	(revision 4366)
@@ -11,5 +11,5 @@
 
 	%Activate formulation
-	femmodel=SetCurrentAnalysis(femmodel,BalancedthicknessAnalysisEnum);
+	femmodel=SetCurrentConfiguration(femmodel,BalancedthicknessAnalysisEnum);
 
 	displaystring(verbose,'\n%s',['depth averaging velocities...']);
Index: /issm/trunk/src/m/solutions/balancedvelocities_core.m
===================================================================
--- /issm/trunk/src/m/solutions/balancedvelocities_core.m	(revision 4365)
+++ /issm/trunk/src/m/solutions/balancedvelocities_core.m	(revision 4366)
@@ -11,5 +11,5 @@
 
 	%Activate formulation
-	femmodel=SetCurrentAnalysis(femmodel,BalancedvelocitiesAnalysisEnum);
+	femmodel=SetCurrentConfiguration(femmodel,BalancedvelocitiesAnalysisEnum);
 
 	displaystring(verbose,'\n%s',['depth averaging velocities...']);
Index: /issm/trunk/src/m/solutions/bedslope_core.m
===================================================================
--- /issm/trunk/src/m/solutions/bedslope_core.m	(revision 4365)
+++ /issm/trunk/src/m/solutions/bedslope_core.m	(revision 4366)
@@ -14,7 +14,7 @@
 
 	%Call on core computations: 
-	femmodel=SetCurrentAnalysisAlias(femmodel,BedSlopeAnalysisEnum,BedSlopeXAnalysisEnum);
+	femmodel=SetCurrentConfiguration(femmodel,BedSlopeAnalysisEnum,BedSlopeXAnalysisEnum);
 	femmodel=solver_linear(femmodel);
-	femmodel=SetCurrentAnalysisAlias(femmodel,BedSlopeAnalysisEnum,BedSlopeYAnalysisEnum);
+	femmodel=SetCurrentConfiguration(femmodel,BedSlopeAnalysisEnum,BedSlopeYAnalysisEnum);
 	femmodel=solver_linear(femmodel);
 	
Index: /issm/trunk/src/m/solutions/diagnostic_core.m
===================================================================
--- /issm/trunk/src/m/solutions/diagnostic_core.m	(revision 4365)
+++ /issm/trunk/src/m/solutions/diagnostic_core.m	(revision 4366)
@@ -35,5 +35,5 @@
 
 		displaystring(verbose,'\n%s',['computing hutter velocities...']);
-		femmodel=SetCurrentAnalysis(femmodel,DiagnosticHutterAnalysisEnum);
+		femmodel=SetCurrentConfiguration(femmodel,DiagnosticHutterAnalysisEnum);
 		femmodel=solver_linear(femmodel);
 
@@ -45,5 +45,5 @@
 
 		displaystring(verbose,'\n%s',['computing horizontal velocities...']);
-		femmodel=SetCurrentAnalysis(femmodel,DiagnosticHorizAnalysisEnum);
+		femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum);
 		femmodel=solver_diagnostic_nonlinear(femmodel,modify_loads); 
 	end
@@ -53,5 +53,5 @@
 	
 		displaystring(verbose,'\n%s',['computing vertical velocities...']);
-		femmodel=SetCurrentAnalysis(femmodel,DiagnosticVertAnalysisEnum);
+		femmodel=SetCurrentConfiguration(femmodel,DiagnosticVertAnalysisEnum);
 		femmodel=solver_linear(femmodel);
 
@@ -66,5 +66,5 @@
 
 			displaystring(verbose,'\n%s',['computing stokes velocities and pressure...']);
-			femmodel=SetCurrentAnalysis(femmodel,DiagnosticStokesAnalysisEnum);
+			femmodel=SetCurrentConfiguration(femmodel,DiagnosticStokesAnalysisEnum);
 			femmodel=solver_diagnostic_nonlinear(femmodel,conserve_loads); 
 		end
Index: /issm/trunk/src/m/solutions/prognostic2_core.m
===================================================================
--- /issm/trunk/src/m/solutions/prognostic2_core.m	(revision 4365)
+++ /issm/trunk/src/m/solutions/prognostic2_core.m	(revision 4366)
@@ -10,5 +10,5 @@
 
 	%Activate formulation
-	femmodel=SetCurrentAnalysis(femmodel,Prognostic2AnalysisEnum);
+	femmodel=SetCurrentConfiguration(femmodel,Prognostic2AnalysisEnum);
 
 	displaystring(verbose,'\n%s',['depth averaging velocities...']);
Index: /issm/trunk/src/m/solutions/prognostic_core.m
===================================================================
--- /issm/trunk/src/m/solutions/prognostic_core.m	(revision 4365)
+++ /issm/trunk/src/m/solutions/prognostic_core.m	(revision 4366)
@@ -10,5 +10,5 @@
 
 	%Activate formulation
-	femmodel=SetCurrentAnalysis(femmodel,PrognosticAnalysisEnum);
+	femmodel=SetCurrentConfiguration(femmodel,PrognosticAnalysisEnum);
 
 	displaystring(verbose,'\n%s',['depth averaging velocities...']);
Index: /issm/trunk/src/m/solutions/surfaceslope_core.m
===================================================================
--- /issm/trunk/src/m/solutions/surfaceslope_core.m	(revision 4365)
+++ /issm/trunk/src/m/solutions/surfaceslope_core.m	(revision 4366)
@@ -14,7 +14,7 @@
 
 	%Call on core computations: 
-	femmodel=SetCurrentAnalysisAlias(femmodel,SurfaceSlopeAnalysisEnum,SurfaceSlopeXAnalysisEnum);
+	femmodel=SetCurrentConfiguration(femmodel,SurfaceSlopeAnalysisEnum,SurfaceSlopeXAnalysisEnum);
 	femmodel=solver_linear(femmodel);
-	femmodel=SetCurrentAnalysisAlias(femmodel,SurfaceSlopeAnalysisEnum,SurfaceSlopeYAnalysisEnum);
+	femmodel=SetCurrentConfiguration(femmodel,SurfaceSlopeAnalysisEnum,SurfaceSlopeYAnalysisEnum);
 	femmodel=solver_linear(femmodel);
 	
Index: /issm/trunk/src/m/solutions/thermal_core_step.m
===================================================================
--- /issm/trunk/src/m/solutions/thermal_core_step.m	(revision 4365)
+++ /issm/trunk/src/m/solutions/thermal_core_step.m	(revision 4366)
@@ -9,9 +9,9 @@
 
 	displaystring(verbose,'\n%s',['computing temperature...']);
-	femmodel=SetCurrentAnalysis(femmodel,ThermalAnalysisEnum);
+	femmodel=SetCurrentConfiguration(femmodel,ThermalAnalysisEnum);
 	femmodel=solver_thermal_nonlineat(femmodel);
 
 	displaystring(verbose,'\n%s',['compute melting...']);
-	femmodel=SetCurrentAnalysis(femmodel,MeltingAnalysisEnum);
+	femmodel=SetCurrentConfiguraton(femmodel,MeltingAnalysisEnum);
 	femmodel=solver_linear(femmodel);