diff --git a/README.md b/README.md
index 063d5ee2d5f1389794bf453e28ab2000a06fd620..476aeb2cfd6928b04de7c4c95d73e465d89f0ce7 100644
--- a/README.md
+++ b/README.md
@@ -212,17 +212,17 @@ and compile as usual.
 
 |                         |                         |
 |-------------------------|-------------------------|
-| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_ergodicControl_2D01.gif) <br> [demo\_demo\_ergodicControl\_2D01.cpp](./src/demo_ergodicControl_2D01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_GMR01.gif) <br> [demo\_GMR01.cpp](./src/demo_GMR01.cpp) |
-| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_GPR01.gif) <br> [demo\_GPR01.cpp](./src/demo_GPR01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_HSMM_batchLQR01.gif) <br> [demo\_HSMM\_batchLQR01.cpp](./src/demo_HSMM_batchLQR01.cpp) |
-| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_LWR_batch01.gif) <br> [demo\_LWR\_batch01.cpp](./src/demo_LWR_batch01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_LWR_iterative01.gif) <br> [demo\_LWR\_iterative01.cpp](./src/demo_LWR_iterative01.cpp) |
-| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_MPC_batch01.gif) <br> [demo\_OC\_LQT01.cpp](./src/demo_OC_LQT01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_MPC_iterative01.gif) <br> [demo\_MPC\_iterative01.cpp](./src/demo_MPC_iterative01.cpp) |
-| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_MPC_semitied01.gif) <br> [demo\_OC\_LQT\_semitied01.cpp](./src/demo_OC_LQT_semitied01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_MPC_velocity01.gif) <br> [demo\_MPC\_velocity01.cpp](./src/demo_MPC_velocity01.cpp) |
-| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_online_GMM01.gif) <br> [demo\_online\_GMM01.cpp](./src/demo_online_GMM01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_proMP01.gif) <br> [demo\_proMP01.cpp](./src/demo_proMP01.cpp) |
-| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_Riemannian_SPD_GMR01.gif) <br> [demo\_Riemannian\_SPD\_GMR01.cpp](./src/demo_Riemannian_SPD_GMR01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_Riemannian_SPD_interp02.gif) <br> [demo\_Riemannian\_SPD\_interp02.cpp](./src/demo_Riemannian_SPD_interp02.cpp) | 
-| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_Riemannian_pose_batchLQR01.gif) <br> [demo\_Riemannian\_pose\_batchLQR01.cpp](./src/demo_Riemannian_pose_batchLQR01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_Riemannian_pose_infHorLQR01.gif) <br> [demo\_Riemannian\_pose\_infHorLQR01.cpp](./src/demo_Riemannian_pose_infHorLQR01.cpp) |
-| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_Riemannian_S3_infHorLQR01.png) <br> [demo\_Riemannian\_S3\_infHorLQR01.cpp](./src/demo_Riemannian_S3_infHorLQR01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_Riemannian_S3_TPGMM01.gif) <br> [demo\_Riemannian\_S3\_TPGMM01.cpp](./src/demo_Riemannian_S3_TPGMM01.cpp) |
-| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_Riemannian_S2_GMM01.gif) <br> [demo\_Riemannian\_S2\_GMM01.cpp](./src/demo_Riemannian_S2_GMM01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_Riemannian_S2_infHorLQR01.gif) <br> [demo\_Riemannian\_S2\_infHorLQR01.cpp](./src/demo_Riemannian_S2_infHorLQR01.cpp) | 
-| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_Riemannian_S2_product01.gif) <br> [demo\_Riemannian\_S2\_product01.cpp](./src/demo_Riemannian_S2_product01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_Riemannian_S2_TPGMM01.gif) <br> [demo\_Riemannian\_S2\_TPGMM01.cpp](./src/demo_Riemannian_S2_TPGMM01.cpp) |
-| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_TPMPC01.gif) <br> [demo\_TPMPC01.cpp](./src/demo_TPMPC01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_TPGMMProduct01.gif) <br> [demo\_TPGMMProduct01.cpp](./src/demo_TPGMMProduct01.cpp) | 
-| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp-sandbox/raw/master/images/demo_TPGMR01.gif) <br> [demo\_TPGMR01.cpp](./src/demo_TPGMR01.cpp) | |
+| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_ergodicControl_2D01.gif) <br> [demo\_demo\_ergodicControl\_2D01.cpp](./src/demo_ergodicControl_2D01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_GMR01.gif) <br> [demo\_GMR01.cpp](./src/demo_GMR01.cpp) |
+| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_GPR01.gif) <br> [demo\_GPR01.cpp](./src/demo_GPR01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_HSMM_batchLQR01.gif) <br> [demo\_HSMM\_batchLQR01.cpp](./src/demo_HSMM_batchLQR01.cpp) |
+| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_LWR_batch01.gif) <br> [demo\_LWR\_batch01.cpp](./src/demo_LWR_batch01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_LWR_iterative01.gif) <br> [demo\_LWR\_iterative01.cpp](./src/demo_LWR_iterative01.cpp) |
+| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_OC_LQT01.gif) <br> [demo\_OC\_LQT01.cpp](./src/demo_OC_LQT01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_OC_LQT_recursive01.gif) <br> [demo\_OC\_LQT\_recursive01.cpp](./src/demo_OC_LQT_recursive01.cpp) |
+| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_OC_LQT_semitied01.gif) <br> [demo\_OC\_LQT\_semitied01.cpp](./src/demo_OC_LQT_semitied01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_OC_LQT_velocity01.gif) <br> [demo\_OC\_LQT\_velocity01.cpp](./src/demo_OC_LQT_velocity01.cpp) |
+| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_online_GMM01.gif) <br> [demo\_online\_GMM01.cpp](./src/demo_online_GMM01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_proMP01.gif) <br> [demo\_proMP01.cpp](./src/demo_proMP01.cpp) |
+| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_Riemannian_SPD_GMR01.gif) <br> [demo\_Riemannian\_SPD\_GMR01.cpp](./src/demo_Riemannian_SPD_GMR01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_Riemannian_SPD_interp02.gif) <br> [demo\_Riemannian\_SPD\_interp02.cpp](./src/demo_Riemannian_SPD_interp02.cpp) |
+| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_Riemannian_pose_batchLQR01.gif) <br> [demo\_Riemannian\_pose\_batchLQR01.cpp](./src/demo_Riemannian_pose_batchLQR01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_Riemannian_pose_infHorLQR01.gif) <br> [demo\_Riemannian\_pose\_infHorLQR01.cpp](./src/demo_Riemannian_pose_infHorLQR01.cpp) |
+| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_Riemannian_S3_infHorLQR01.png) <br> [demo\_Riemannian\_S3\_infHorLQR01.cpp](./src/demo_Riemannian_S3_infHorLQR01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_Riemannian_S3_TPGMM01.gif) <br> [demo\_Riemannian\_S3\_TPGMM01.cpp](./src/demo_Riemannian_S3_TPGMM01.cpp) |
+| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_Riemannian_S2_GMM01.gif) <br> [demo\_Riemannian\_S2\_GMM01.cpp](./src/demo_Riemannian_S2_GMM01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_Riemannian_S2_infHorLQR01.gif) <br> [demo\_Riemannian\_S2\_infHorLQR01.cpp](./src/demo_Riemannian_S2_infHorLQR01.cpp) |
+| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_Riemannian_S2_product01.gif) <br> [demo\_Riemannian\_S2\_product01.cpp](./src/demo_Riemannian_S2_product01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_Riemannian_S2_TPGMM01.gif) <br> [demo\_Riemannian\_S2\_TPGMM01.cpp](./src/demo_Riemannian_S2_TPGMM01.cpp) |
+| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_TPMPC01.gif) <br> [demo\_TPMPC01.cpp](./src/demo_TPMPC01.cpp) | ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_TPGMMProduct01.gif) <br> [demo\_TPGMMProduct01.cpp](./src/demo_TPGMMProduct01.cpp) |
+| ![](https://gitlab.idiap.ch/rli/pbdlib-cpp/raw/master/images/demo_TPGMR01.gif) <br> [demo\_TPGMR01.cpp](./src/demo_TPGMR01.cpp) | |
 
diff --git a/images/demo_MPC_batch01.gif b/images/demo_OC_LQT01.gif
similarity index 100%
rename from images/demo_MPC_batch01.gif
rename to images/demo_OC_LQT01.gif
diff --git a/images/demo_MPC_iterative01.gif b/images/demo_OC_LQT_recursive01.gif
similarity index 100%
rename from images/demo_MPC_iterative01.gif
rename to images/demo_OC_LQT_recursive01.gif
diff --git a/images/demo_MPC_semitied01.gif b/images/demo_OC_LQT_semitied01.gif
similarity index 100%
rename from images/demo_MPC_semitied01.gif
rename to images/demo_OC_LQT_semitied01.gif
diff --git a/images/demo_MPC_velocity01.gif b/images/demo_OC_LQT_velocity01.gif
similarity index 100%
rename from images/demo_MPC_velocity01.gif
rename to images/demo_OC_LQT_velocity01.gif