Index: /issm/trunk-jpl/src/c/cores/CorePointerFromSolutionEnum.cpp
===================================================================
--- /issm/trunk-jpl/src/c/cores/CorePointerFromSolutionEnum.cpp	(revision 21578)
+++ /issm/trunk-jpl/src/c/cores/CorePointerFromSolutionEnum.cpp	(revision 21579)
@@ -65,9 +65,9 @@
 			solutioncore=&esa_core;
 			break;
-		case GiaIvinsSolutionEnum:
-			#if _HAVE_GIAIVINS_
-			solutioncore=&giaivins_core;
+		case GiaSolutionEnum:
+			#if _HAVE_GIA_
+			solutioncore=&gia_core;
 			#else
-			_error_("ISSM not compiled with Gia Ivins capability");
+			_error_("ISSM not compiled with Gia capability");
 			#endif
 			break;
Index: /issm/trunk-jpl/src/c/cores/cores.h
===================================================================
--- /issm/trunk-jpl/src/c/cores/cores.h	(revision 21578)
+++ /issm/trunk-jpl/src/c/cores/cores.h	(revision 21579)
@@ -46,5 +46,5 @@
 void adgradient_core(FemModel* femmodel);
 void dummy_core(FemModel* femmodel);
-void giaivins_core(FemModel* femmodel);
+void gia_core(FemModel* femmodel);
 void esa_core(FemModel* femmodel);
 void smb_core(FemModel* femmodel);
Index: /issm/trunk-jpl/src/c/cores/gia_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/cores/gia_core.cpp	(revision 21579)
+++ /issm/trunk-jpl/src/c/cores/gia_core.cpp	(revision 21579)
@@ -0,0 +1,60 @@
+/*!\file: gia_core.cpp
+ * \brief: core of the GIA solution 
+ */ 
+
+#include "./cores.h"
+#include "../toolkits/toolkits.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
+#include "../modules/modules.h"
+#include "../solutionsequences/solutionsequences.h"
+void gia_core(FemModel* femmodel){
+
+	Vector<IssmDouble> *wg    = NULL;
+	Vector<IssmDouble> *dwdtg = NULL;
+	IssmDouble          *x    = NULL;
+	IssmDouble          *y    = NULL;
+
+	/*parameters: */
+	bool save_results;
+	int  gsize;
+	int  configuration_type;
+
+	/*Recover some parameters: */
+	femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
+	femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
+
+	if(VerboseSolution()) _printf0_("   computing GIA\n");
+
+	/*Call on core computations: */
+	femmodel->SetCurrentConfiguration(GiaIvinsAnalysisEnum);
+
+	/*Figure out size of g-set deflection vector and allocate solution vector: */
+	gsize      = femmodel->nodes->NumberOfDofs(configuration_type,GsetEnum);
+	wg = new Vector<IssmDouble>(gsize);
+	dwdtg = new Vector<IssmDouble>(gsize);
+
+	/*first, recover x and y vectors from vertices: */
+	VertexCoordinatesx(&x,&y,NULL,femmodel->vertices); //no need for z coordinate
+
+	/*call the main module: */
+	femmodel->Deflection(wg,dwdtg,x,y);
+
+	/*assemble vector: */
+	wg->Assemble();
+	dwdtg->Assemble();
+
+	InputUpdateFromVectorx(femmodel,wg,GiaWEnum,VertexSIdEnum);
+	InputUpdateFromVectorx(femmodel,dwdtg,GiadWdtEnum,VertexSIdEnum);
+
+	if(save_results){
+		if(VerboseSolution()) _printf0_("   saving results\n");
+		int outputs[2] = {GiaWEnum,GiadWdtEnum};
+		femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],2);
+	}
+	
+	xDelete<IssmDouble>(x);
+	xDelete<IssmDouble>(y);
+
+
+}
Index: sm/trunk-jpl/src/c/cores/giaivins_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/cores/giaivins_core.cpp	(revision 21578)
+++ 	(revision )
@@ -1,60 +1,0 @@
-/*!\file: giaivins_core.cpp
- * \brief: core of the GIAIVINS solution 
- */ 
-
-#include "./cores.h"
-#include "../toolkits/toolkits.h"
-#include "../classes/classes.h"
-#include "../shared/shared.h"
-#include "../modules/modules.h"
-#include "../solutionsequences/solutionsequences.h"
-void giaivins_core(FemModel* femmodel){
-
-	Vector<IssmDouble> *wg    = NULL;
-	Vector<IssmDouble> *dwdtg = NULL;
-	IssmDouble          *x    = NULL;
-	IssmDouble          *y    = NULL;
-
-	/*parameters: */
-	bool save_results;
-	int  gsize;
-	int  configuration_type;
-
-	/*Recover some parameters: */
-	femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
-	femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
-
-	if(VerboseSolution()) _printf0_("   computing GIAIVINS\n");
-
-	/*Call on core computations: */
-	femmodel->SetCurrentConfiguration(GiaIvinsAnalysisEnum);
-
-	/*Figure out size of g-set deflection vector and allocate solution vector: */
-	gsize      = femmodel->nodes->NumberOfDofs(configuration_type,GsetEnum);
-	wg = new Vector<IssmDouble>(gsize);
-	dwdtg = new Vector<IssmDouble>(gsize);
-
-	/*first, recover x and y vectors from vertices: */
-	VertexCoordinatesx(&x,&y,NULL,femmodel->vertices); //no need for z coordinate
-
-	/*call the main module: */
-	femmodel->Deflection(wg,dwdtg,x,y);
-
-	/*assemble vector: */
-	wg->Assemble();
-	dwdtg->Assemble();
-
-	InputUpdateFromVectorx(femmodel,wg,GiaIvinsWEnum,VertexSIdEnum);
-	InputUpdateFromVectorx(femmodel,dwdtg,GiaIvinsdWdtEnum,VertexSIdEnum);
-
-	if(save_results){
-		if(VerboseSolution()) _printf0_("   saving results\n");
-		int outputs[2] = {GiaIvinsWEnum,GiaIvinsdWdtEnum};
-		femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],2);
-	}
-	
-	xDelete<IssmDouble>(x);
-	xDelete<IssmDouble>(y);
-
-
-}
Index: /issm/trunk-jpl/src/c/cores/transient_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/cores/transient_core.cpp	(revision 21578)
+++ /issm/trunk-jpl/src/c/cores/transient_core.cpp	(revision 21579)
@@ -21,5 +21,5 @@
 	/*parameters: */
 	IssmDouble finaltime,dt,yts;
-	bool       isstressbalance,ismasstransport,issmb,isFS,isthermal,isgroundingline,isgiaivins,isslr,iscoupler,ismovingfront,isdamageevolution,ishydrology;
+	bool       isstressbalance,ismasstransport,issmb,isFS,isthermal,isgroundingline,isgia,isslr,iscoupler,ismovingfront,isdamageevolution,ishydrology;
 	bool       save_results,dakota_analysis;
 	bool       time_adapt;
@@ -53,5 +53,5 @@
 	femmodel->parameters->FindParam(&issmb,TransientIssmbEnum);
 	femmodel->parameters->FindParam(&isthermal,TransientIsthermalEnum);
-	femmodel->parameters->FindParam(&isgiaivins,TransientIsgiaivinsEnum);
+	femmodel->parameters->FindParam(&isgia,TransientIsgiaEnum);
 	femmodel->parameters->FindParam(&isslr,TransientIsslrEnum);
 	femmodel->parameters->FindParam(&iscoupler,TransientIscouplerEnum);
@@ -138,8 +138,8 @@
 		FloatingiceMeltingRatex(femmodel);
 		
-		if(isgiaivins){
+		if(isgia){
 			if(VerboseSolution()) _printf0_("   computing glacial isostatic adjustment\n");
-			#ifdef _HAVE_GIAIVINS_
-			giaivins_core(femmodel);
+			#ifdef _HAVE_GIA_
+			gia_core(femmodel);
 			#else
 			_error_("ISSM was not compiled with gia capabilities. Exiting");