Index: /issm/trunk-jpl/src/wrappers/Chaco/Chaco.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/Chaco/Chaco.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/Chaco/Chaco.cpp	(revision 20877)
@@ -16,5 +16,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(Chaco){
+WRAPPER(Chaco_python){
 
 	int i;
Index: /issm/trunk-jpl/src/wrappers/DistanceToMaskBoundary/DistanceToMaskBoundary.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/DistanceToMaskBoundary/DistanceToMaskBoundary.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/DistanceToMaskBoundary/DistanceToMaskBoundary.cpp	(revision 20877)
@@ -18,5 +18,5 @@
 }/*}}}*/
 
-WRAPPER(DistanceToMaskBoundary){
+WRAPPER(DistanceToMaskBoundary_python){
 
 	/*input datasets: */
Index: /issm/trunk-jpl/src/wrappers/ElementConnectivity/ElementConnectivity.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/ElementConnectivity/ElementConnectivity.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/ElementConnectivity/ElementConnectivity.cpp	(revision 20877)
@@ -10,5 +10,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(ElementConnectivity){
+WRAPPER(ElementConnectivity_python){
 
 	/*inputs: */
Index: /issm/trunk-jpl/src/wrappers/EnumToString/EnumToString.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/EnumToString/EnumToString.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/EnumToString/EnumToString.cpp	(revision 20877)
@@ -10,5 +10,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(EnumToString){
+WRAPPER(EnumToString_python){
 
 	char *name = NULL;
Index: /issm/trunk-jpl/src/wrappers/Exp2Kml/Exp2Kml.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/Exp2Kml/Exp2Kml.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/Exp2Kml/Exp2Kml.cpp	(revision 20877)
@@ -28,5 +28,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(Exp2Kml){
+WRAPPER(Exp2Kml_python){
 
 	int i,verbose=1;
Index: /issm/trunk-jpl/src/wrappers/ExpSimplify/ExpSimplify.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/ExpSimplify/ExpSimplify.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/ExpSimplify/ExpSimplify.cpp	(revision 20877)
@@ -88,5 +88,5 @@
 
 }/*}}}*/
-WRAPPER(ExpSimplify){
+WRAPPER(ExpSimplify_python){
 
 	int i,verbose=1;
Index: /issm/trunk-jpl/src/wrappers/ExpToLevelSet/ExpToLevelSet.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/ExpToLevelSet/ExpToLevelSet.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/ExpToLevelSet/ExpToLevelSet.cpp	(revision 20877)
@@ -20,5 +20,5 @@
 	_printf_("\n");
 }/*}}}*/
-WRAPPER(ExpToLevelSet){
+WRAPPER(ExpToLevelSet_python){
 
 	/*diverse: */
Index: /issm/trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.cpp	(revision 20877)
@@ -25,5 +25,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(InterpFromGridToMesh){
+WRAPPER(InterpFromGridToMesh_python){
 
 	int i,j;
Index: /issm/trunk-jpl/src/wrappers/InterpFromMesh2d/InterpFromMesh2d.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/InterpFromMesh2d/InterpFromMesh2d.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/InterpFromMesh2d/InterpFromMesh2d.cpp	(revision 20877)
@@ -20,5 +20,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(InterpFromMesh2d){
+WRAPPER(InterpFromMesh2d_python){
 
 	/*input: */
Index: /issm/trunk-jpl/src/wrappers/InterpFromMeshToGrid/InterpFromMeshToGrid.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/InterpFromMeshToGrid/InterpFromMeshToGrid.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/InterpFromMeshToGrid/InterpFromMeshToGrid.cpp	(revision 20877)
@@ -20,5 +20,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(InterpFromMeshToGrid){
+WRAPPER(InterpFromMeshToGrid_python){
 
 	/*input datasets: */
Index: /issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp	(revision 20877)
@@ -28,5 +28,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(InterpFromMeshToMesh2d){
+WRAPPER(InterpFromMeshToMesh2d_python){
 
 	/*Intermediaties*/
Index: /issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp	(revision 20877)
@@ -26,5 +26,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(InterpFromMeshToMesh3d){
+WRAPPER(InterpFromMeshToMesh3d_python){
 
 	/*input: */
Index: /issm/trunk-jpl/src/wrappers/IssmConfig/IssmConfig.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/IssmConfig/IssmConfig.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/IssmConfig/IssmConfig.cpp	(revision 20877)
@@ -16,5 +16,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(IssmConfig){
+WRAPPER(IssmConfig_python){
 
 	/*input/output*/
Index: /issm/trunk-jpl/src/wrappers/KMLFileRead/KMLFileRead.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/KMLFileRead/KMLFileRead.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/KMLFileRead/KMLFileRead.cpp	(revision 20877)
@@ -25,5 +25,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(KMLFileRead){
+WRAPPER(KMLFileRead_python){
 
 	int i,j,nnodes=0,verbose=1;
Index: /issm/trunk-jpl/src/wrappers/KMLMeshWrite/KMLMeshWrite.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/KMLMeshWrite/KMLMeshWrite.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/KMLMeshWrite/KMLMeshWrite.cpp	(revision 20877)
@@ -29,5 +29,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(KMLMeshWrite){
+WRAPPER(KMLMeshWrite_python){
 
 	int i,j,nnodes=0,verbose=1;
Index: /issm/trunk-jpl/src/wrappers/KMLOverlay/KMLOverlay.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/KMLOverlay/KMLOverlay.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/KMLOverlay/KMLOverlay.cpp	(revision 20877)
@@ -25,5 +25,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(KMLOverlay){
+WRAPPER(KMLOverlay_python){
 
 	int i,verbose=1;
Index: /issm/trunk-jpl/src/wrappers/Kml2Exp/Kml2Exp.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/Kml2Exp/Kml2Exp.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/Kml2Exp/Kml2Exp.cpp	(revision 20877)
@@ -27,5 +27,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(Kml2Exp){
+WRAPPER(Kml2Exp_python){
 
 	int i,verbose=1;
Index: /issm/trunk-jpl/src/wrappers/Kriging/Kriging.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/Kriging/Kriging.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/Kriging/Kriging.cpp	(revision 20877)
@@ -28,5 +28,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(Kriging){
+WRAPPER(Kriging_python){
 
 	/*Outputs*/
Index: /issm/trunk-jpl/src/wrappers/Ll2xy/Ll2xy.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/Ll2xy/Ll2xy.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/Ll2xy/Ll2xy.cpp	(revision 20877)
@@ -28,5 +28,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(Ll2xy){
+WRAPPER(Ll2xy_python){
 
 	int i,verbose=1;
Index: /issm/trunk-jpl/src/wrappers/M1qn3/M1qn3.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/M1qn3/M1qn3.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/M1qn3/M1qn3.cpp	(revision 20877)
@@ -36,5 +36,5 @@
 }/*}}}*/
 #endif
-WRAPPER(M1qn3){
+WRAPPER(M1qn3_python){
 
 #ifdef _HAVE_M1QN3_
Index: /issm/trunk-jpl/src/wrappers/MeshPartition/MeshPartition.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/MeshPartition/MeshPartition.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/MeshPartition/MeshPartition.cpp	(revision 20877)
@@ -13,5 +13,5 @@
 	_printf_("\n");
 }/*}}}*/
-WRAPPER(MeshPartition){
+WRAPPER(MeshPartition_python){
 
 	/*Indexing: */
Index: /issm/trunk-jpl/src/wrappers/MeshProfileIntersection/MeshProfileIntersection.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/MeshProfileIntersection/MeshProfileIntersection.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/MeshProfileIntersection/MeshProfileIntersection.cpp	(revision 20877)
@@ -30,5 +30,5 @@
 	_printf_("        mesh.\n");
 }/*}}}*/
-WRAPPER(MeshProfileIntersection){
+WRAPPER(MeshProfileIntersection_python){
 
 	int i,j;
Index: /issm/trunk-jpl/src/wrappers/NodeConnectivity/NodeConnectivity.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/NodeConnectivity/NodeConnectivity.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/NodeConnectivity/NodeConnectivity.cpp	(revision 20877)
@@ -10,5 +10,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(NodeConnectivity){
+WRAPPER(NodeConnectivity_python){
 
 	/*inputs: */
Index: /issm/trunk-jpl/src/wrappers/PointCloudFindNeighbors/PointCloudFindNeighbors.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/PointCloudFindNeighbors/PointCloudFindNeighbors.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/PointCloudFindNeighbors/PointCloudFindNeighbors.cpp	(revision 20877)
@@ -15,5 +15,5 @@
 	_printf_("\n");
 }/*}}}*/
-WRAPPER(PointCloudFindNeighbors){
+WRAPPER(PointCloudFindNeighbors_python){
 
 	int i,j;
Index: /issm/trunk-jpl/src/wrappers/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp	(revision 20877)
@@ -10,5 +10,5 @@
 	_printf_("\n");
 }/*}}}*/
-WRAPPER(PropagateFlagsFromConnectivity){
+WRAPPER(PropagateFlagsFromConnectivity_python){
 
 	/*input/output datasets: */
Index: /issm/trunk-jpl/src/wrappers/Shp2Kml/Shp2Kml.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/Shp2Kml/Shp2Kml.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/Shp2Kml/Shp2Kml.cpp	(revision 20877)
@@ -34,5 +34,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(Shp2Kml){
+WRAPPER(Shp2Kml_python){
 
 	int i,verbose=1;
Index: /issm/trunk-jpl/src/wrappers/ShpRead/ShpRead.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/ShpRead/ShpRead.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/ShpRead/ShpRead.cpp	(revision 20877)
@@ -26,5 +26,5 @@
 	_printf0_("      ShpRead('file.shp');\n");
 }/*}}}*/
-WRAPPER(ShpRead){
+WRAPPER(ShpRead_python){
 
 	/*input: */
Index: /issm/trunk-jpl/src/wrappers/StringToEnum/StringToEnum.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/StringToEnum/StringToEnum.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/StringToEnum/StringToEnum.cpp	(revision 20877)
@@ -10,5 +10,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(StringToEnum){
+WRAPPER(StringToEnum_python){
 
 	char *name = NULL;
Index: /issm/trunk-jpl/src/wrappers/TriMesh/TriMesh.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/TriMesh/TriMesh.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/TriMesh/TriMesh.cpp	(revision 20877)
@@ -14,5 +14,5 @@
 	_printf_("\n");
 }/*}}}*/
-WRAPPER(TriMesh){
+WRAPPER(TriMesh_python){
 	
 	/*intermediary: */
Index: /issm/trunk-jpl/src/wrappers/TriMeshProcessRifts/TriMeshProcessRifts.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/TriMeshProcessRifts/TriMeshProcessRifts.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/TriMeshProcessRifts/TriMeshProcessRifts.cpp	(revision 20877)
@@ -11,5 +11,5 @@
 	_printf_("      index2,x2,y2,segments2,segmentmarkers2,rifts2 is the resulting triangulation where rifts have been processed.\n");
 }/*}}}*/
-WRAPPER(TriMeshProcessRifts){
+WRAPPER(TriMeshProcessRifts_python){
 
 	/* returned quantities: */
Index: /issm/trunk-jpl/src/wrappers/Xy2ll/Xy2ll.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/Xy2ll/Xy2ll.cpp	(revision 20876)
+++ /issm/trunk-jpl/src/wrappers/Xy2ll/Xy2ll.cpp	(revision 20877)
@@ -28,5 +28,5 @@
 	_printf0_("\n");
 }/*}}}*/
-WRAPPER(Xy2ll){
+WRAPPER(Xy2ll_python){
 
 	int i,verbose=1;