Index: /issm/trunk-jpl/src/c/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/c/Makefile.am	(revision 12021)
+++ /issm/trunk-jpl/src/c/Makefile.am	(revision 12022)
@@ -16,6 +16,6 @@
 #Core sources{{{1
 core_sources = ./issm.h\
-			        ./issm-binding.h\
-			        ./include/macros.h\
+					./issm-binding.h\
+					./include/macros.h\
 					./include/typedefs.h\
 					./include/types.h\
Index: /issm/trunk-jpl/src/c/include/macros.h
===================================================================
--- /issm/trunk-jpl/src/c/include/macros.h	(revision 12021)
+++ /issm/trunk-jpl/src/c/include/macros.h	(revision 12022)
@@ -40,14 +40,14 @@
 #endif
 /*}}}*/
-/* MODULEBOOT/MODULEEND {{{1*/
+/* ISSMBOOT/ISSMEND {{{1*/
 
 /*The following macros hide the error exception handling in a matlab module. Just put 
- * MODULEBOOT(); and MODULEEND(); at the beginning and end of a module, and c++ exceptions 
+ * ISSMBOOT(); and ISSMEND(); at the beginning and end of a module, and c++ exceptions 
  * will be trapped. Really nifty!*/
 
-#define MODULEBOOT(); \
+#define ISSMBOOT(); \
 	try{
 
-#define MODULEEND(); }\
+#define ISSMEND(); }\
 	catch(ErrorException &exception){\
 		exception.Report(); \
Index: /issm/trunk-jpl/src/c/matlab/include/matlab_macros.h
===================================================================
--- /issm/trunk-jpl/src/c/matlab/include/matlab_macros.h	(revision 12021)
+++ /issm/trunk-jpl/src/c/matlab/include/matlab_macros.h	(revision 12022)
@@ -20,5 +20,4 @@
  * will be trapped. Really nifty!*/
 
-//Module Boot //{{{
 #define MODULEBOOT(); ModuleBoot(); \
 	try{
Index: /issm/trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp
===================================================================
--- /issm/trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp	(revision 12021)
+++ /issm/trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp	(revision 12022)
@@ -27,5 +27,5 @@
 		
 		#ifdef _HAVE_PETSC_
-		PetscMatrixToDoubleMatrix(&tmatrix_ptr,&rows,&cols,matrix->matrix);
+		PetscMatrixToDoubleMatrix(&matrix_ptr,&rows,&cols,matrix->matrix);
 		#else
 		matrix_ptr=matrix->matrix->ToSerial();
Index: /issm/trunk-jpl/src/c/solutions/issm.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutions/issm.cpp	(revision 12021)
+++ /issm/trunk-jpl/src/c/solutions/issm.cpp	(revision 12022)
@@ -35,5 +35,5 @@
 	int      ierr;
 
-	MODULEBOOT();
+	ISSMBOOT();
 
 	/*Initialize environments: Petsc, MPI, etc...: */
@@ -141,7 +141,6 @@
 	
 	/*end module: */
-	MODULEEND();
+	ISSMEND();
 
 	return 0; //unix success return;
 }
-