Index: /issm/trunk/src/mex/ControlOptimization/ControlOptimization.cpp
===================================================================
--- /issm/trunk/src/mex/ControlOptimization/ControlOptimization.cpp	(revision 1809)
+++ /issm/trunk/src/mex/ControlOptimization/ControlOptimization.cpp	(revision 1810)
@@ -24,5 +24,5 @@
 
 	/*arguments to objectivefunctionC: */
-	mxArray* m=NULL;
+	mxArray* models=NULL;
 	mxArray* pg=NULL;
 	mxArray* grad_g=NULL;
@@ -43,5 +43,5 @@
 
 	optargs.function_name=function_name;
-	optargs.m=MODEL;
+	optargs.models=MODELS;
 	optargs.param_g=PG; 
 	optargs.inputs=INPUTS;
Index: /issm/trunk/src/mex/ControlOptimization/ControlOptimization.h
===================================================================
--- /issm/trunk/src/mex/ControlOptimization/ControlOptimization.h	(revision 1809)
+++ /issm/trunk/src/mex/ControlOptimization/ControlOptimization.h	(revision 1810)
@@ -21,5 +21,5 @@
 #define XMAX (mxArray*)prhs[2]
 #define OPTIONS (mxArray*)prhs[3]
-#define MODEL (mxArray*)prhs[4]
+#define MODELS (mxArray*)prhs[4]
 #define INPUTS (mxArray*)prhs[5]
 #define PG (mxArray*)prhs[6]
Index: /issm/trunk/src/mex/ModelProcessor/ModelProcessor.cpp
===================================================================
--- /issm/trunk/src/mex/ModelProcessor/ModelProcessor.cpp	(revision 1809)
+++ /issm/trunk/src/mex/ModelProcessor/ModelProcessor.cpp	(revision 1810)
@@ -20,5 +20,5 @@
 
 	/*input model: */
-	Model* model=NULL;
+	IoModel* iomodel=NULL;
 
 	/*Boot module: */
@@ -28,9 +28,9 @@
 	CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&ModelProcessorUsage);
 
-	/*Fill model with matlab workspace data: */
-	ModelInit(&model,MODEL); //this routine goes through the entire MODEL matlab class, and starts filling the corresponding "c" code model object.
+	/*Fill iomodel with matlab workspace data: */
+	IoModelInit(&iomodel,MODEL); //this routine goes through the entire MODEL matlab class, and starts filling the corresponding "c" code model object.
 
 	/*Create elements, nodes and materials: */
-	CreateDataSets(&elements,&nodes,&materials,&constraints, &loads, &parameters, model,MODEL);
+	CreateDataSets(&elements,&nodes,&materials,&constraints, &loads, &parameters, iomodel,MODEL);
 	
 	/*Write output data: */
@@ -44,5 +44,5 @@
 
 	/*Free ressources: */
-	DeleteModel(&model);
+	DeleteIoModel(&iomodel);
 	delete elements;
 	delete nodes;