diff --git a/DeployMacros.cmake b/DeployMacros.cmake
index 1d0845f..3f67822 100644
--- a/DeployMacros.cmake
+++ b/DeployMacros.cmake
@@ -108,10 +108,10 @@ RESOURCES, PLUGINS and FILES - list of directories and files, copied to:
 
 |           | Windows |             Linux           |    Linux  (DEB_USR_DIR)   |            MacOS            |
 |-----------|---------|-----------------------------|---------------------------|-----------------------------|
-| RESOURCES |  root   | /opt/COMPANY/target         | /usr/share/COMPANY/target | <*.app>/Contents/Resources  |
-| PLUGINS   |  root   | /opt/COMPANY/target/plugins | /usr/lib/COMPANY/target   | <*.app>/Contents/PlugIns    |
-| FILES     |  root   | /opt/COMPANY/target         | /usr/bin                  | <*.app>/Contents/MacOS      |
-| LIBS      |  root   | /opt/COMPANY/target/lib     | /usr/lib                  | <*.app>/Contents/Frameworks |
+| RESOURCES |  root   | /opt/FULLNAME               | /usr/share/FULLNAME       | <*.app>/Contents/Resources  |
+| PLUGINS   |  root   | /opt/FULLNAME/plugins       | /usr/lib/FULLNAME         | <*.app>/Contents/PlugIns    |
+| FILES     |  root   | /opt/FULLNAME               | /usr/bin                  | <*.app>/Contents/MacOS      |
+| LIBS      |  root   | /opt/FULLNAME/lib           | /usr/lib                  | <*.app>/Contents/Frameworks |
 
 Relative paths are taken from DEPLOY_DIR
 Also check library dependencies from PLUGINS and FILES
@@ -142,7 +142,7 @@ If DEB_ADD_SERVICE then <T>-service.deb package will be created.
 This package use contents of CMAKE_CURRENT_SOURCE_DIR/debian-service directory:
   * CMAKE_CURRENT_SOURCE_DIR/debian-service/DEBIAN/
   * CMAKE_CURRENT_SOURCE_DIR/debian-service/*.service
-.service file placed in /opt/COMPANY/target, you should copy it to system with script
+.service file placed in /opt/FULLNAME, you should copy it to system with script
 You can use "postinst,postrm,preinst,prerm,config" files to configure service
 
 ]]
@@ -688,6 +688,11 @@ macro(deploy_target _T)
 		elseif("_${MY_ARCH}" STREQUAL "_ia64")
 			set(_DEB_ARCH "ia64")
 		endif()
+		if (NOT "x${${_T}_FULLNAME}" STREQUAL "x")
+			set(_app_dir "${${_T}_FULLNAME}")
+		else()
+			set(_app_dir "${_T}")
+		endif()
 		set(_DEB "${_TV}_deb_${_DEB_ARCH}")
 		set(_AGD "${_DEPLOY_DIR}/${_DEB}")
 		set(_C_echof ">" "${_AGD}/DEBIAN/control")
@@ -696,19 +701,19 @@ macro(deploy_target _T)
 		set(_D_echo ">>" "${_AGD}/usr/share/applications/${_DEBNAME}.desktop")
 		set(_bin_path "${_AGD}/usr/bin")
 		set(_lib_path "${_AGD}/usr/lib")
-		set(_pli_path "${_AGD}/usr/lib/${${_T}_COMPANY}/${_T}")
-		set(_res_path "${_AGD}/usr/share/${${_T}_COMPANY}/${_T}")
+		set(_pli_path "${_AGD}/usr/lib/${_app_dir}")
+		set(_res_path "${_AGD}/usr/share/${_app_dir}")
 		set(_ico_path "${_AGD}/usr/share/pixmaps")
 		set(_app_bin_path "/usr/bin")
 		set(_app_ico_path "/usr/share/pixmaps")
 		if(_DEB_OPT)
-			set(_bin_path "${_AGD}/opt/${${_T}_COMPANY}/${_T}")
-			set(_lib_path "${_AGD}/opt/${${_T}_COMPANY}/${_T}/lib")
-			set(_pli_path "${_AGD}/opt/${${_T}_COMPANY}/${_T}/plugins")
-			set(_res_path "${_AGD}/opt/${${_T}_COMPANY}/${_T}")
-			set(_ico_path "${_AGD}/opt/${${_T}_COMPANY}/${_T}/pixmaps")
-			set(_app_bin_path "/opt/${${_T}_COMPANY}/${_T}")
-			set(_app_ico_path "/opt/${${_T}_COMPANY}/${_T}/pixmaps")
+			set(_bin_path "${_AGD}/opt/${_app_dir}")
+			set(_lib_path "${_AGD}/opt/${_app_dir}/lib")
+			set(_pli_path "${_AGD}/opt/${_app_dir}/plugins")
+			set(_res_path "${_AGD}/opt/${_app_dir}")
+			set(_ico_path "${_AGD}/opt/${_app_dir}/pixmaps")
+			set(_app_bin_path "/opt/${_app_dir}")
+			set(_app_ico_path "/opt/${_app_dir}/pixmaps")
 		endif()
 		set(_CMD_ ${_CMD_} COMMAND mkdir ${_VERB} -p "${_bin_path}")
 		set(_CMD_ ${_CMD_} COMMAND mkdir ${_VERB} -p "${_lib_path}")