diff --git a/projects/rocprofiler-systems/cmake/Templates/modulefile.in b/projects/rocprofiler-systems/cmake/Templates/modulefile.in
index f6f43ddeb1..3aa91e94ed 100644
--- a/projects/rocprofiler-systems/cmake/Templates/modulefile.in
+++ b/projects/rocprofiler-systems/cmake/Templates/modulefile.in
@@ -1,9 +1,9 @@
 #%Module1.0
 
-module-whatis "omnitrace (version @OMNITRACE_VERSION@)"
+module-whatis "@PROJECT_NAME@ (version @PROJECT_VERSION@)"
 
 proc ModulesHelp { } {
-puts stderr "Loads omnitrace v@OMNITRACE_VERSION@"
+puts stderr "Loads @PROJECT_NAME@ v@PROJECT_VERSION@"
 }
 
 set ROOT [file normalize [file dirname [file normalize ${ModulesCurrentModulefile}]]/../../..]
@@ -12,4 +12,4 @@ prepend-path CMAKE_PREFIX_PATH "${ROOT}"
 prepend-path PATH "${ROOT}/bin"
 prepend-path LD_LIBRARY_PATH "${ROOT}/@CMAKE_INSTALL_LIBDIR@"
 prepend-path PYTHONPATH "${ROOT}/@CMAKE_INSTALL_PYTHONDIR@"
-setenv @PROJECT_NAME@_DIR "${ROOT}/share/cmake/omnitrace"
+setenv @PROJECT_NAME@_DIR "${ROOT}/@CMAKE_INSTALL_DATAROOTDIR@/cmake/@PROJECT_NAME@"
diff --git a/projects/rocprofiler-systems/cmake/Templates/setup-env.sh.in b/projects/rocprofiler-systems/cmake/Templates/setup-env.sh.in
index de32706c5a..4eb307230a 100644
--- a/projects/rocprofiler-systems/cmake/Templates/setup-env.sh.in
+++ b/projects/rocprofiler-systems/cmake/Templates/setup-env.sh.in
@@ -10,8 +10,12 @@ fi
 
 PATH=${BASEDIR}/bin:${PATH}
 LD_LIBRARY_PATH=${BASEDIR}/@CMAKE_INSTALL_LIBDIR@:${LD_LIBRARY_PATH}
-PYTHONPATH=${BASE_DIR}/@CMAKE_INSTALL_PYTHONDIR@:${PYTHONPATH}
+PYTHONPATH=${BASEDIR}/@CMAKE_INSTALL_PYTHONDIR@:${PYTHONPATH}
+CMAKE_PREFIX_PATH=${BASEDIR}:${CMAKE_PREFIX_PATH}
+@PROJECT_NAME@_DIR=${BASEDIR}/@CMAKE_INSTALL_DATAROOTDIR@/cmake/@PROJECT_NAME@
 
 export PATH
 export LD_LIBRARY_PATH
 export PYTHONPATH
+export CMAKE_PREFIX_PATH
+export @PROJECT_NAME@_DIR