Index: src/work/athos/lp/lp_base.h
===================================================================
--- src/work/athos/lp/lp_base.h	(revision 1295)
+++ src/work/athos/lp/lp_base.h	(revision 1303)
@@ -106,5 +106,5 @@
 
     ///\e
-    enum SolutionStatus {
+    enum SolveExitStatus {
       ///\e
       SOLVED = 0,
@@ -114,5 +114,5 @@
       
     ///\e
-    enum SolutionType {
+    enum SolutionStatus {
       ///Feasible solution has'n been found (but may exist).
 
@@ -391,7 +391,7 @@
     virtual void _setRowUpperBound(int i, Value value) = 0;
     virtual void _setObjCoeff(int i, Value obj_coef) = 0;
-    virtual SolutionStatus _solve() = 0;
+    virtual SolveExitStatus _solve() = 0;
     virtual Value _getPrimal(int i) = 0;
-    virtual SolutionType _getPrimalType() = 0;
+    virtual SolutionStatus _getPrimalType() = 0;
 
 
@@ -615,5 +615,5 @@
 
     ///\e
-    SolutionStatus solve() { return _solve(); }
+    SolveExitStatus solve() { return _solve(); }
     
     ///@}
@@ -624,5 +624,5 @@
 
     ///\e
-    SolutionType primalType() {
+    SolutionStatus primalType() {
       return _getPrimalType();
     }
Index: src/work/athos/lp/lp_cplex.cc
===================================================================
--- src/work/athos/lp/lp_cplex.cc	(revision 1299)
+++ src/work/athos/lp/lp_cplex.cc	(revision 1303)
@@ -92,5 +92,5 @@
   }
 
-  LpCplex::SolutionType LpCplex::_solve()
+  LpCplex::SolutionStatus LpCplex::_solve()
   {
     return OPTIMAL;
Index: src/work/athos/lp/lp_cplex.h
===================================================================
--- src/work/athos/lp/lp_cplex.h	(revision 1299)
+++ src/work/athos/lp/lp_cplex.h	(revision 1303)
@@ -109,5 +109,5 @@
     ///\bug Unimplemented
     ///
-    virtual SolutionType _solve();
+    virtual SolutionStatus _solve();
     ///\e
     
Index: src/work/athos/lp/lp_glpk.cc
===================================================================
--- src/work/athos/lp/lp_glpk.cc	(revision 1300)
+++ src/work/athos/lp/lp_glpk.cc	(revision 1303)
@@ -239,5 +239,5 @@
 
 
-  LpGlpk::SolutionStatus LpGlpk::_solve()
+  LpGlpk::SolveExitStatus LpGlpk::_solve()
   {
     int i=  lpx_simplex(lp);
@@ -257,5 +257,5 @@
   
  
-  LpGlpk::SolutionType LpGlpk::_getPrimalType()
+  LpGlpk::SolutionStatus LpGlpk::_getPrimalType()
   {
     int stat=  lpx_get_status(lp);
Index: src/work/athos/lp/lp_glpk.h
===================================================================
--- src/work/athos/lp/lp_glpk.h	(revision 1294)
+++ src/work/athos/lp/lp_glpk.h	(revision 1303)
@@ -71,5 +71,5 @@
     ///\bug Unimplemented
     ///
-    virtual SolutionStatus _solve();
+    virtual SolveExitStatus _solve();
     ///\e
     
@@ -81,5 +81,5 @@
     ///\bug Unimplemented
     ///
-    virtual SolutionType _getPrimalType();
+    virtual SolutionStatus _getPrimalType();
 
   };
Index: src/work/athos/lp/lp_solver_skeleton.cc
===================================================================
--- src/work/athos/lp/lp_solver_skeleton.cc	(revision 1294)
+++ src/work/athos/lp/lp_solver_skeleton.cc	(revision 1303)
@@ -66,5 +66,5 @@
   }
 
-  LpSolverSkeleton::SolutionStatus LpSolverSkeleton::_solve()
+  LpSolverSkeleton::SolveExitStatus LpSolverSkeleton::_solve()
   {
     return SOLVED;
@@ -76,5 +76,5 @@
   }
   
-  LpSolverSkeleton::SolutionType LpSolverSkeleton::_getPrimalType()
+  LpSolverSkeleton::SolutionStatus LpSolverSkeleton::_getPrimalType()
   {
     return OPTIMAL;
Index: src/work/athos/lp/lp_solver_skeleton.h
===================================================================
--- src/work/athos/lp/lp_solver_skeleton.h	(revision 1294)
+++ src/work/athos/lp/lp_solver_skeleton.h	(revision 1303)
@@ -83,5 +83,5 @@
     ///\bug Wrong interface
     ///
-    virtual SolutionStatus _solve();
+    virtual SolveExitStatus _solve();
 
     ///\e
@@ -94,5 +94,5 @@
     ///\bug Wrong interface
     ///
-    virtual SolutionType _getPrimalType();
+    virtual SolutionStatus _getPrimalType();
 
   public:
