Index: /issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.cpp	(revision 22360)
+++ /issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.cpp	(revision 22361)
@@ -18,7 +18,7 @@
 }
 /*}}}*/
-SpcDynamic::SpcDynamic(int spc_sid,int spc_nodeid, int spc_dof,int spc_analysis_type){/*{{{*/
+SpcDynamic::SpcDynamic(int spc_id,int spc_nodeid, int spc_dof,int spc_analysis_type){/*{{{*/
 
-	sid           = spc_sid;
+	id           = spc_id;
 	nodeid        = spc_nodeid;
 	dof           = spc_dof;
@@ -41,5 +41,5 @@
 	SpcDynamic* spcdyn = new SpcDynamic(*this); 
 
-	spcdyn->sid=this->sid;
+	spcdyn->id=this->id;
 	spcdyn->nodeid=this->nodeid;
 	spcdyn->dof=this->dof;
@@ -60,5 +60,5 @@
 
 	_printf_("SpcDynamic:\n");
-	_printf_("   sid: " << sid << "\n");
+	_printf_("   id: " << id << "\n");
 	_printf_("   nodeid: " << nodeid << "\n");
 	_printf_("   dof: " << dof << "\n");
@@ -69,5 +69,5 @@
 }
 /*}}}*/
-int     SpcDynamic::Id(void){ return sid; }/*{{{*/
+int     SpcDynamic::Id(void){ return id; }/*{{{*/
 /*}}}*/
 void    SpcDynamic::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
@@ -75,5 +75,5 @@
 	MARSHALLING_ENUM(SpcDynamicEnum);
 
-	MARSHALLING(sid);
+	MARSHALLING(id);
 	MARSHALLING(nodeid);
 	MARSHALLING(dof);
Index: /issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.h	(revision 22360)
+++ /issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.h	(revision 22361)
@@ -14,5 +14,5 @@
 
 	private: 
-		int        sid;             /*! id, to track it */
+		int        id;              /*! id, to track it */
 		int        nodeid;          /*!node id          */
 		int        dof;             /*!component        */
@@ -26,5 +26,5 @@
 		/*SpcDynamic constructors, destructors*/
 		SpcDynamic();
-		SpcDynamic(int sid,int nodeid, int dof,int analysis_type);
+		SpcDynamic(int id_in,int nodeid, int dof,int analysis_type);
 		~SpcDynamic();
 
Index: /issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.cpp	(revision 22360)
+++ /issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.cpp	(revision 22361)
@@ -18,7 +18,7 @@
 }
 /*}}}*/
-SpcStatic::SpcStatic(int spc_sid,int spc_nodeid, int spc_dof,IssmDouble spc_value,int spc_analysis_type){/*{{{*/
+SpcStatic::SpcStatic(int spc_id,int spc_nodeid, int spc_dof,IssmDouble spc_value,int spc_analysis_type){/*{{{*/
 
-	sid           = spc_sid;
+	id           = spc_id;
 	nodeid        = spc_nodeid;
 	dof           = spc_dof;
@@ -40,5 +40,5 @@
 	SpcStatic* spcstat = new SpcStatic(*this); 
 
-	spcstat->sid=this->sid;
+	spcstat->id=this->id;
 	spcstat->nodeid=this->nodeid;
 	spcstat->dof=this->dof;
@@ -52,5 +52,5 @@
 
 	_printf_("SpcStatic:\n");
-	_printf_("   sid: " << sid << "\n");
+	_printf_("   id: " << id << "\n");
 	_printf_("   nodeid: " << nodeid << "\n");
 	_printf_("   dof: " << dof << "\n");
@@ -63,5 +63,5 @@
 
 	_printf_("SpcStatic:\n");
-	_printf_("   sid: " << sid << "\n");
+	_printf_("   id: " << id << "\n");
 	_printf_("   nodeid: " << nodeid << "\n");
 	_printf_("   dof: " << dof << "\n");
@@ -71,5 +71,5 @@
 }
 /*}}}*/
-int     SpcStatic::Id(void){ return sid; }/*{{{*/
+int     SpcStatic::Id(void){ return id; }/*{{{*/
 /*}}}*/
 void    SpcStatic::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
@@ -77,5 +77,5 @@
 	MARSHALLING_ENUM(SpcStaticEnum);
 
-	MARSHALLING(sid);
+	MARSHALLING(id);
 	MARSHALLING(nodeid);
 	MARSHALLING(dof);
Index: /issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.h	(revision 22360)
+++ /issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.h	(revision 22361)
@@ -14,5 +14,5 @@
 
 	private: 
-		int        sid;             /*! id, to track it */
+		int        id;             /*! id, to track it */
 		int        nodeid;          /*!node id          */
 		int        dof;             /*!component        */
@@ -25,5 +25,5 @@
 		/*SpcStatic constructors, destructors:{{{*/
 		SpcStatic();
-		SpcStatic(int sid,int nodeid, int dof,IssmDouble value,int analysis_type);
+		SpcStatic(int id,int nodeid, int dof,IssmDouble value,int analysis_type);
 		~SpcStatic();
 		/*}}}*/
Index: /issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.cpp	(revision 22360)
+++ /issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.cpp	(revision 22361)
@@ -16,5 +16,5 @@
 SpcTransient::SpcTransient(){/*{{{*/
 	penalty       = false;
-	sid           = -1;
+	id            = -1;
 	nodeid        = -1;
 	dof           = -1;
@@ -26,8 +26,8 @@
 }
 /*}}}*/
-SpcTransient::SpcTransient(int spc_sid,int spc_nodeid, int spc_dof,int spc_nsteps, IssmDouble* spc_times, IssmDouble* spc_values,int spc_analysis_type){/*{{{*/
+SpcTransient::SpcTransient(int spc_id,int spc_nodeid, int spc_dof,int spc_nsteps, IssmDouble* spc_times, IssmDouble* spc_values,int spc_analysis_type){/*{{{*/
 
 	penalty = false;
-	sid     = spc_sid;
+	id     = spc_id;
 	nodeid  = spc_nodeid;
 	dof     = spc_dof;
@@ -52,5 +52,5 @@
 /*Object virtual functions definitions:*/
 Object* SpcTransient::copy() {/*{{{*/
-	return new SpcTransient(sid,nodeid,dof,nsteps,times,values,analysis_type);
+	return new SpcTransient(id,nodeid,dof,nsteps,times,values,analysis_type);
 }
 /*}}}*/
@@ -63,5 +63,5 @@
 	int i;
 	_printf_("SpcTransient:\n");
-	_printf_("   sid: " << sid << "\n");
+	_printf_("   id: " << id << "\n");
 	_printf_("   nodeid: " << nodeid << "\n");
 	_printf_("   dof: " << dof << "\n");
@@ -76,5 +76,5 @@
 /*}}}*/
 int     SpcTransient::Id(void){/*{{{*/
-	return sid;
+	return id;
 }
 /*}}}*/
@@ -83,5 +83,5 @@
 	MARSHALLING_ENUM(SpcTransientEnum);
 
-	MARSHALLING(sid);
+	MARSHALLING(id);
 	MARSHALLING(nodeid);
 	MARSHALLING(dof);
Index: /issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.h	(revision 22360)
+++ /issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.h	(revision 22361)
@@ -14,5 +14,5 @@
 
 	private: 
-		int         sid;             /* id, to track it             */
+		int         id;              /* id, to track it             */
 		int         nodeid;          /*node id                      */
 		int         dof;             /*component                    */
@@ -27,5 +27,5 @@
 		/*SpcTransient constructors, destructors:{{{*/
 		SpcTransient();
-		SpcTransient(int sid,int nodeid, int dof,int nsteps, IssmDouble* times, IssmDouble* values,int analysis_type);
+		SpcTransient(int id_in,int nodeid, int dof,int nsteps, IssmDouble* times, IssmDouble* values,int analysis_type);
 		~SpcTransient();
 		/*}}}*/