diff --git a/unsupported/Eigen/NonLinear b/unsupported/Eigen/NonLinearOptimization
similarity index 68%
rename from unsupported/Eigen/NonLinear
rename to unsupported/Eigen/NonLinearOptimization
index d4f18f077..774e37a20 100644
--- a/unsupported/Eigen/NonLinear
+++ b/unsupported/Eigen/NonLinearOptimization
@@ -34,26 +34,26 @@ namespace Eigen {
   * \defgroup NonLinearOptimization_Module Non linear optimization module
   *
   * \code
-  * #include <unsupported/Eigen/NonLinear>
+  * #include <unsupported/Eigen/NonLinearOptimization>
   * \endcode
   */
 //@{
 
-#include "src/NonLinear/qrsolv.h"
-#include "src/NonLinear/r1updt.h"
-#include "src/NonLinear/r1mpyq.h"
-#include "src/NonLinear/rwupdt.h"
-#include "src/NonLinear/qrfac.h"
-#include "src/NonLinear/fdjac1.h"
-#include "src/NonLinear/qform.h"
-#include "src/NonLinear/lmpar.h"
-#include "src/NonLinear/dogleg.h"
-#include "src/NonLinear/covar.h"
+#include "src/NonLinearOptimization/qrsolv.h"
+#include "src/NonLinearOptimization/r1updt.h"
+#include "src/NonLinearOptimization/r1mpyq.h"
+#include "src/NonLinearOptimization/rwupdt.h"
+#include "src/NonLinearOptimization/qrfac.h"
+#include "src/NonLinearOptimization/fdjac1.h"
+#include "src/NonLinearOptimization/qform.h"
+#include "src/NonLinearOptimization/lmpar.h"
+#include "src/NonLinearOptimization/dogleg.h"
+#include "src/NonLinearOptimization/covar.h"
 
-#include "src/NonLinear/chkder.h"
+#include "src/NonLinearOptimization/chkder.h"
 
-#include "src/NonLinear/HybridNonLinearSolver.h"
-#include "src/NonLinear/LevenbergMarquardt.h"
+#include "src/NonLinearOptimization/HybridNonLinearSolver.h"
+#include "src/NonLinearOptimization/LevenbergMarquardt.h"
 
 //@}
 
diff --git a/unsupported/Eigen/src/NonLinear/CMakeLists.txt b/unsupported/Eigen/src/NonLinearOptimization/CMakeLists.txt
similarity index 100%
rename from unsupported/Eigen/src/NonLinear/CMakeLists.txt
rename to unsupported/Eigen/src/NonLinearOptimization/CMakeLists.txt
diff --git a/unsupported/Eigen/src/NonLinear/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
similarity index 100%
rename from unsupported/Eigen/src/NonLinear/HybridNonLinearSolver.h
rename to unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
diff --git a/unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h b/unsupported/Eigen/src/NonLinearOptimization/LevenbergMarquardt.h
similarity index 100%
rename from unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h
rename to unsupported/Eigen/src/NonLinearOptimization/LevenbergMarquardt.h
diff --git a/unsupported/Eigen/src/NonLinear/chkder.h b/unsupported/Eigen/src/NonLinearOptimization/chkder.h
similarity index 100%
rename from unsupported/Eigen/src/NonLinear/chkder.h
rename to unsupported/Eigen/src/NonLinearOptimization/chkder.h
diff --git a/unsupported/Eigen/src/NonLinear/covar.h b/unsupported/Eigen/src/NonLinearOptimization/covar.h
similarity index 100%
rename from unsupported/Eigen/src/NonLinear/covar.h
rename to unsupported/Eigen/src/NonLinearOptimization/covar.h
diff --git a/unsupported/Eigen/src/NonLinear/dogleg.h b/unsupported/Eigen/src/NonLinearOptimization/dogleg.h
similarity index 100%
rename from unsupported/Eigen/src/NonLinear/dogleg.h
rename to unsupported/Eigen/src/NonLinearOptimization/dogleg.h
diff --git a/unsupported/Eigen/src/NonLinear/fdjac1.h b/unsupported/Eigen/src/NonLinearOptimization/fdjac1.h
similarity index 100%
rename from unsupported/Eigen/src/NonLinear/fdjac1.h
rename to unsupported/Eigen/src/NonLinearOptimization/fdjac1.h
diff --git a/unsupported/Eigen/src/NonLinear/lmpar.h b/unsupported/Eigen/src/NonLinearOptimization/lmpar.h
similarity index 100%
rename from unsupported/Eigen/src/NonLinear/lmpar.h
rename to unsupported/Eigen/src/NonLinearOptimization/lmpar.h
diff --git a/unsupported/Eigen/src/NonLinear/qform.h b/unsupported/Eigen/src/NonLinearOptimization/qform.h
similarity index 100%
rename from unsupported/Eigen/src/NonLinear/qform.h
rename to unsupported/Eigen/src/NonLinearOptimization/qform.h
diff --git a/unsupported/Eigen/src/NonLinear/qrfac.h b/unsupported/Eigen/src/NonLinearOptimization/qrfac.h
similarity index 100%
rename from unsupported/Eigen/src/NonLinear/qrfac.h
rename to unsupported/Eigen/src/NonLinearOptimization/qrfac.h
diff --git a/unsupported/Eigen/src/NonLinear/qrsolv.h b/unsupported/Eigen/src/NonLinearOptimization/qrsolv.h
similarity index 100%
rename from unsupported/Eigen/src/NonLinear/qrsolv.h
rename to unsupported/Eigen/src/NonLinearOptimization/qrsolv.h
diff --git a/unsupported/Eigen/src/NonLinear/r1mpyq.h b/unsupported/Eigen/src/NonLinearOptimization/r1mpyq.h
similarity index 100%
rename from unsupported/Eigen/src/NonLinear/r1mpyq.h
rename to unsupported/Eigen/src/NonLinearOptimization/r1mpyq.h
diff --git a/unsupported/Eigen/src/NonLinear/r1updt.h b/unsupported/Eigen/src/NonLinearOptimization/r1updt.h
similarity index 100%
rename from unsupported/Eigen/src/NonLinear/r1updt.h
rename to unsupported/Eigen/src/NonLinearOptimization/r1updt.h
diff --git a/unsupported/Eigen/src/NonLinear/rwupdt.h b/unsupported/Eigen/src/NonLinearOptimization/rwupdt.h
similarity index 100%
rename from unsupported/Eigen/src/NonLinear/rwupdt.h
rename to unsupported/Eigen/src/NonLinearOptimization/rwupdt.h
diff --git a/unsupported/test/NonLinear.cpp b/unsupported/test/NonLinear.cpp
index 6403bd457..bb37b2fa9 100644
--- a/unsupported/test/NonLinear.cpp
+++ b/unsupported/test/NonLinear.cpp
@@ -6,7 +6,7 @@
 #include <stdio.h>
 
 #include "main.h"
-#include <unsupported/Eigen/NonLinear>
+#include <unsupported/Eigen/NonLinearOptimization>
 
 int fcn_chkder(const VectorXd &x, VectorXd &fvec, MatrixXd &fjac, int iflag)
 {