Index: /issm/trunk/src/m/solutions/ice/CreateFemModel.m
===================================================================
--- /issm/trunk/src/m/solutions/ice/CreateFemModel.m	(revision 35)
+++ /issm/trunk/src/m/solutions/ice/CreateFemModel.m	(revision 36)
@@ -26,6 +26,7 @@
 %generate grid sets and reduce yg to ys from g-set to s-set.
 BuildGridSets(grids,constraints); ys=Reducevector_g(yg);
-	
-Gmn = IceNormalizeconstraints(Rmg);
+
+%buile Gmn
+Gmn=Normalizeconstraints(Rmg);
 
 %recover dof number
Index: /issm/trunk/src/m/solutions/ice/diagnostic_core_linear.m
===================================================================
--- /issm/trunk/src/m/solutions/ice/diagnostic_core_linear.m	(revision 35)
+++ /issm/trunk/src/m/solutions/ice/diagnostic_core_linear.m	(revision 36)
@@ -51,8 +51,8 @@
 % Reduce stiffness matrix from g set to f set (effectively rooting out the single point constraints), 
 % and compute modifications to loads from single point constraints.
-[K_ff K_fs]=IceReducematrixfromgtof(K_gg,G_mn); 
+[K_ff K_fs]=Reducematrixfromgtof(K_gg,G_mn); 
 
 % Reduce load from g set to f set
-p_f=IceReducerightside(p_g,G_mn,K_fs,ys);
+p_f=Reducerightside(p_g,G_mn,K_fs,ys);
 
 % Solve
Index: /issm/trunk/src/m/solutions/ice/diagnostic_core_nonlinear.m
===================================================================
--- /issm/trunk/src/m/solutions/ice/diagnostic_core_nonlinear.m	(revision 35)
+++ /issm/trunk/src/m/solutions/ice/diagnostic_core_nonlinear.m	(revision 36)
@@ -99,8 +99,8 @@
 	% and compute modifications to loads from single point constraints.
 	
-	[K_ff K_fs]=IceReducematrixfromgtof(K_gg,G_mn); 
+	[K_ff K_fs]=Reducematrixfromgtof(K_gg,G_mn); 
 
 	% Reduce load from g set to f set
-	p_f=IceReducerightside(p_g,G_mn,K_fs,ys);
+	p_f=Reducerightside(p_g,G_mn,K_fs,ys);
 
 	% Solve
@@ -156,5 +156,5 @@
 	[K_gg,p_g]=SystemMatrices(elements,grids,loads,materials,kflag, pflag, sparsity,inputs,analysis_type);
 	[K_gg,p_g]=PenaltySystemMatrices(grids,loads,materials,kflag, pflag, sparsity,inputs,analysis_type,K_gg,p_g);
-	[K_ff K_fs]=IceReducematrixfromgtof(K_gg,G_mn); 
+	[K_ff K_fs]=Reducematrixfromgtof(K_gg,G_mn); 
 	varargout(1)={K_ff};
 	varargout(2)={K_fs};
Index: /issm/trunk/src/m/solutions/ice/melting_core.m
===================================================================
--- /issm/trunk/src/m/solutions/ice/melting_core.m	(revision 35)
+++ /issm/trunk/src/m/solutions/ice/melting_core.m	(revision 36)
@@ -44,8 +44,8 @@
 % Reduce stiffness matrix from g set to f set (effectively rooting out the single point constraints),
 % and compute modifications to loads from single point constraints.
-[K_ff K_fs]=IceReducematrixfromgtof(K_gg,G_mn); 
+[K_ff K_fs]=Reducematrixfromgtof(K_gg,G_mn); 
 
 % Reduce load from g set to f set
-p_f=IceReducerightside(p_g,G_mn,K_fs,ys);
+p_f=Reducerightside(p_g,G_mn,K_fs,ys);
 
 % Solve
Index: /issm/trunk/src/m/solutions/ice/prognostic_core.m
===================================================================
--- /issm/trunk/src/m/solutions/ice/prognostic_core.m	(revision 35)
+++ /issm/trunk/src/m/solutions/ice/prognostic_core.m	(revision 36)
@@ -47,8 +47,8 @@
 % Reduce stiffness matrix from g set to f set (effectively rooting out the single point constraints), 
 % and compute modifications to loads from single point constraints.
-[K_ff K_fs]=IceReducematrixfromgtof(K_gg,G_mn); 
+[K_ff K_fs]=Reducematrixfromgtof(K_gg,G_mn); 
 
 % Reduce load from g set to f set
-p_f=IceReducerightside(p_g,G_mn,K_fs,ys);
+p_f=Reducerightside(p_g,G_mn,K_fs,ys);
 
 % Solve
Index: /issm/trunk/src/m/solutions/ice/thermal_core.m
===================================================================
--- /issm/trunk/src/m/solutions/ice/thermal_core.m	(revision 35)
+++ /issm/trunk/src/m/solutions/ice/thermal_core.m	(revision 36)
@@ -58,8 +58,8 @@
 	% Reduce stiffness matrix from g set to f set (effectively rooting out the single point constraints),
 	% and compute modifications to loads from single point constraints.
-	[K_ff K_fs]=IceReducematrixfromgtof(K_gg_penalized,G_mn); 
+	[K_ff K_fs]=Reducematrixfromgtof(K_gg_penalized,G_mn); 
 
 	% Reduce load from g set to f set
-	p_f=IceReducerightside(p_g_penalized,G_mn,K_fs,ys);
+	p_f=Reducerightside(p_g_penalized,G_mn,K_fs,ys);
 	
 	% Solve
@@ -69,5 +69,5 @@
 	t_g= Mergesolution_g(t_f,G_mn,ys); 
 
-	[loads,converged]=IcePenaltyConstraints(loads,grids,materials,params,struct('pressure',pressure, 'dt',dt, 'temperature',t_g));
+	[loads,converged]=PenaltyConstraints(loads,grids,materials,params,struct('pressure',pressure, 'dt',dt, 'temperature',t_g));
 
 end