diff --git a/CMake/otbcli.sh.in b/CMake/otbcli.sh.in
index 0a2dc965b089ee8f6f1055a1c55aa6e83da83b23..0b0cd0aed50e8f34a62cc7e8ec815ddf81a9815d 100755
--- a/CMake/otbcli.sh.in
+++ b/CMake/otbcli.sh.in
@@ -9,7 +9,7 @@ CURRENT_SCRIPT=$0
 CURRENT_SCRIPT_DIR=`dirname $0`
 
 OTB_CLI_LAUNCHER=$CURRENT_SCRIPT_DIR/otbApplicationLauncherCommandLine
-OTB_APP_PATH=$CURRENT_SCRIPT_DIR/../lib/otbapp
+OTB_APP_PATH=$CURRENT_SCRIPT_DIR/../lib/otb/applications
 
 $OTB_CLI_LAUNCHER @APPLICATION_NAME@ --modulePath $OTB_APP_PATH "$@"
 
diff --git a/CMake/otbgui.sh.in b/CMake/otbgui.sh.in
index 5ee3eae6b9cf1c8c35898e9fe2a129c4a2ef0d91..f9a21ebbab8567cc802ee0842131a43d1d12dfaf 100755
--- a/CMake/otbgui.sh.in
+++ b/CMake/otbgui.sh.in
@@ -9,7 +9,7 @@ CURRENT_SCRIPT=$0
 CURRENT_SCRIPT_DIR=`dirname $0`
 
 OTB_GUI_LAUNCHER=$CURRENT_SCRIPT_DIR/otbApplicationLauncherQt
-OTB_APP_PATH=$CURRENT_SCRIPT_DIR/../lib/otbapp
+OTB_APP_PATH=$CURRENT_SCRIPT_DIR/../lib/otb/applications
 
 $OTB_GUI_LAUNCHER @APPLICATION_NAME@ $OTB_APP_PATH "$@"
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a09713c480a1d58d551ca068d7a02eee895b0a7..0aae03b7275c93de1a93b6d9c21b738622c35d60 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,7 +153,7 @@ IF(NOT OTB_INSTALL_LIB_DIR)
 ENDIF(NOT OTB_INSTALL_LIB_DIR)
 
 IF(NOT OTB_INSTALL_APP_DIR)
-  SET(OTB_INSTALL_APP_DIR "/lib/otbapp")
+  SET(OTB_INSTALL_APP_DIR "/lib/otb/applications")
 ENDIF(NOT OTB_INSTALL_APP_DIR)
 
 IF(NOT OTB_INSTALL_LIB_DIR)