Rename Omnitrace to ROCm Systems Profiler (#4)

The Omnitrace program is being renamed. Full name: "ROCm Systems Profiler" Package name: "rocprofiler-systems" Binary / Library names: "rocprof-sys-*" --------- Co-authored-by: Xuan Chen <xuchen@amd.com> Signed-off-by: David Galiffi <David.Galiffi@amd.com> [ROCm/rocprofiler-systems commit: d07bf508a9]
2024-10-15 11:20:40 -04:00
parent c444ba6131
commit 489eda995d
@@ -1,27 +1,27 @@
 #
-#   omnitrace tests
+#   rocprofiler-systems tests
 #
 include_guard(GLOBAL)

-include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-testing.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/rocprof-sys-testing.cmake)

 # test groups
-include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-config-tests.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-instrument-tests.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-pthread-tests.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-rocm-tests.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-user-api-tests.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-mpi-tests.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-kokkos-tests.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-openmp-tests.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-code-coverage-tests.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-fork-tests.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-time-window-tests.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-attach-tests.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-rccl-tests.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-overflow-tests.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-annotate-tests.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-causal-tests.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-python-tests.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/rocprof-sys-config-tests.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/rocprof-sys-instrument-tests.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/rocprof-sys-pthread-tests.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/rocprof-sys-rocm-tests.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/rocprof-sys-user-api-tests.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/rocprof-sys-mpi-tests.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/rocprof-sys-kokkos-tests.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/rocprof-sys-openmp-tests.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/rocprof-sys-code-coverage-tests.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/rocprof-sys-fork-tests.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/rocprof-sys-time-window-tests.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/rocprof-sys-attach-tests.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/rocprof-sys-rccl-tests.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/rocprof-sys-overflow-tests.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/rocprof-sys-annotate-tests.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/rocprof-sys-causal-tests.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/rocprof-sys-python-tests.cmake)

 add_subdirectory(source)
@@ -4,17 +4,17 @@
 #
 # -------------------------------------------------------------------------------------- #

-if(OMNITRACE_USE_PAPI
-   AND (omnitrace_perf_event_paranoid LESS_EQUAL 3
-        OR omnitrace_cap_sys_admin EQUAL 0
-        OR omnitrace_cap_perfmon EQUAL 0))
+if(ROCPROFSYS_USE_PAPI
+   AND (rocprofiler_systems_perf_event_paranoid LESS_EQUAL 3
+        OR rocprofiler_systems_cap_sys_admin EQUAL 0
+        OR rocprofiler_systems_cap_perfmon EQUAL 0))
    set(_annotate_environment
        "${_base_environment}"
-        "OMNITRACE_TIMEMORY_COMPONENTS=thread_cpu_clock papi_array"
-        "OMNITRACE_PAPI_EVENTS=perf::PERF_COUNT_SW_CPU_CLOCK"
-        "OMNITRACE_USE_SAMPLING=OFF")
+        "ROCPROFSYS_TIMEMORY_COMPONENTS=thread_cpu_clock papi_array"
+        "ROCPROFSYS_PAPI_EVENTS=perf::PERF_COUNT_SW_CPU_CLOCK"
+        "ROCPROFSYS_USE_SAMPLING=OFF")

-    omnitrace_add_test(
+    rocprofiler_systems_add_test(
        SKIP_BASELINE SKIP_RUNTIME
        NAME annotate
        TARGET parallel-overhead
@@ -38,23 +38,23 @@ if(OMNITRACE_USE_PAPI
        ENVIRONMENT "${_annotate_environment}"
        LABELS "annotate;papi")

-    omnitrace_add_validation_test(
+    rocprofiler_systems_add_validation_test(
        NAME annotate-binary-rewrite
        PERFETTO_FILE "perfetto-trace.proto"
        LABELS "annotate;papi"
        ARGS --key-names perf::PERF_COUNT_SW_CPU_CLOCK thread_cpu_clock --key-counts 8 8)

-    omnitrace_add_validation_test(
+    rocprofiler_systems_add_validation_test(
        NAME annotate-sampling
        PERFETTO_FILE "perfetto-trace.proto"
        LABELS "papi"
        ARGS --key-names thread_cpu_clock --key-counts 6)
 else()
    set(_annotate_environment
-        "${_base_environment}" "OMNITRACE_TIMEMORY_COMPONENTS=thread_cpu_clock"
-        "OMNITRACE_USE_SAMPLING=OFF")
+        "${_base_environment}" "ROCPROFSYS_TIMEMORY_COMPONENTS=thread_cpu_clock"
+        "ROCPROFSYS_USE_SAMPLING=OFF")

-    omnitrace_add_test(
+    rocprofiler_systems_add_test(
        SKIP_BASELINE SKIP_RUNTIME
        NAME annotate
        TARGET parallel-overhead
@@ -78,13 +78,13 @@ else()
        ENVIRONMENT "${_annotate_environment}"
        LABELS "annotate")

-    omnitrace_add_validation_test(
+    rocprofiler_systems_add_validation_test(
        NAME annotate-binary-rewrite
        PERFETTO_FILE "perfetto-trace.proto"
        LABELS "annotate"
        ARGS --key-names thread_cpu_clock --key-counts 8)

-    omnitrace_add_validation_test(
+    rocprofiler_systems_add_validation_test(
        NAME annotate-sampling
        PERFETTO_FILE "perfetto-trace.proto"
        LABELS "annotate"
@@ -13,7 +13,7 @@ if(EXISTS "/proc/sys/kernel/yama/ptrace_scope")
        set(_VALID_PTRACE_SCOPE ON)
    endif()
 else()
-    omnitrace_message(
+    rocprofiler_systems_message(
        AUTHOR_WARNING
        "Disabling attach tests. Run 'echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope' to enable attaching to process"
        )
@@ -30,14 +30,14 @@ endif()
 add_test(
    NAME parallel-overhead-attach
    COMMAND
-        ${CMAKE_CURRENT_LIST_DIR}/run-omnitrace-pid.sh $<TARGET_FILE:omnitrace-instrument>
-        -ME "\.c$" -E fib -e -v 1 --label return args file -l --
-        $<TARGET_FILE:parallel-overhead> 30 8 1000
+        ${CMAKE_CURRENT_LIST_DIR}/run-rocprofiler-systems-pid.sh
+        $<TARGET_FILE:rocprofiler-systems-instrument> -ME "\.c$" -E fib -e -v 1 --label
+        return args file -l -- $<TARGET_FILE:parallel-overhead> 30 8 1000
    WORKING_DIRECTORY ${PROJECT_BINARY_DIR})

 set(_parallel_overhead_attach_environ
-    "${_attach_environment}" "OMNITRACE_OUTPUT_PATH=omnitrace-tests-output"
-    "OMNITRACE_OUTPUT_PREFIX=parallel-overhead-attach/")
+    "${_attach_environment}" "ROCPROFSYS_OUTPUT_PATH=rocprof-sys-tests-output"
+    "ROCPROFSYS_OUTPUT_PREFIX=parallel-overhead-attach/")

 set_tests_properties(
    parallel-overhead-attach
@@ -353,7 +353,7 @@ int
 main(int argc, char** argv)
 {
    const auto* _usage = R"usage(
-usage: omnitrace-capchk <capability-name> <capability-set> <pid>
+usage: rocprof-sys-capchk <capability-name> <capability-set> <pid>

    Description:
        Simple tool for checking the effective capabilities of a running process
@@ -382,10 +382,10 @@ usage: omnitrace-capchk <capability-name> <capability-set> <pid>
        3 if the capability set name is not supported

    Examples:
-        $ omnitrace-capchk CAP_SYS_ADMIN
+        $ rocprof-sys-capchk CAP_SYS_ADMIN
            Check if this exe (self) has CAP_SYS_ADMIN capability in the (default) effective capability set

-        $ omnitrace-capchk sys_admin bounding 423032
+        $ rocprof-sys-capchk sys_admin bounding 423032
            Check if process 423032 has CAP_SYS_ADMIN capability in the bounding capability set
    )usage";

@@ -4,7 +4,7 @@
 #
 # -------------------------------------------------------------------------------------- #

-omnitrace_add_causal_test(
+rocprofiler_systems_add_causal_test(
    NAME cpu-omni-func
    TARGET causal-cpu-omni
    RUN_ARGS 70 10 432525 1000000000
@@ -13,7 +13,7 @@ omnitrace_add_causal_test(
        "Starting causal experiment #1(.*)causal/experiments.json(.*)causal/experiments.coz"
    )

-omnitrace_add_causal_test(
+rocprofiler_systems_add_causal_test(
    SKIP_BASELINE
    NAME cpu-omni-func-ndebug
    TARGET causal-cpu-omni-ndebug
@@ -23,7 +23,7 @@ omnitrace_add_causal_test(
        "Starting causal experiment #1(.*)causal/experiments.json(.*)causal/experiments.coz"
    )

-omnitrace_add_causal_test(
+rocprofiler_systems_add_causal_test(
    SKIP_BASELINE
    NAME cpu-omni-line
    TARGET causal-cpu-omni
@@ -33,7 +33,7 @@ omnitrace_add_causal_test(
        "Starting causal experiment #1(.*)causal/experiments.json(.*)causal/experiments.coz"
    )

-omnitrace_add_causal_test(
+rocprofiler_systems_add_causal_test(
    NAME both-omni-func
    TARGET causal-both-omni
    RUN_ARGS 70 10 432525 400000000
@@ -47,19 +47,19 @@ omnitrace_add_causal_test(
        3
        --monochrome
        -g
-        ${CMAKE_BINARY_DIR}/omnitrace-tests-config/causal-both-omni-func
+        ${CMAKE_BINARY_DIR}/rocprof-sys-tests-config/causal-both-omni-func
        -l
        causal-both-omni
        -v
        3
        -b
        timer
-    ENVIRONMENT "OMNITRACE_STRICT_CONFIG=OFF"
+    ENVIRONMENT "ROCPROFSYS_STRICT_CONFIG=OFF"
    CAUSAL_PASS_REGEX
        "Starting causal experiment #1(.*)causal/experiments.json(.*)causal/experiments.coz"
    )

-omnitrace_add_causal_test(
+rocprofiler_systems_add_causal_test(
    NAME lulesh-func
    TARGET lulesh-omni
    RUN_ARGS -i 35 -s 50 -p
@@ -69,7 +69,7 @@ omnitrace_add_causal_test(
        "Starting causal experiment #1(.*)causal/experiments.json(.*)causal/experiments.coz"
    )

-omnitrace_add_causal_test(
+rocprofiler_systems_add_causal_test(
    SKIP_BASELINE
    NAME lulesh-func-ndebug
    TARGET lulesh-omni-ndebug
@@ -80,7 +80,7 @@ omnitrace_add_causal_test(
        "Starting causal experiment #1(.*)causal/experiments.json(.*)causal/experiments.coz"
    )

-omnitrace_add_causal_test(
+rocprofiler_systems_add_causal_test(
    SKIP_BASELINE
    NAME lulesh-line
    TARGET lulesh-omni
@@ -108,12 +108,12 @@ macro(
    _V30
    _TOL # tolerance for virtual speedup
    )
-    # arguments to omnitrace-causal
+    # arguments to rocprofiler-systems-causal
    set(${_NAME}_args "${_causal_common_args} ${_MODE} ${_EXPER}")

    # arguments to validate-causal-json.py
    set(${_NAME}_valid
-        "-n 0 -i omnitrace-tests-output/causal-cpu-omni-${_TEST}-e2e/causal/experiments.json -v ${_EXPER} $<TARGET_FILE_BASE_NAME:causal-cpu-omni> 10 ${_V10} ${_TOL} ${_EXPER} $<TARGET_FILE_BASE_NAME:causal-cpu-omni> 20 ${_V20} ${_TOL} ${_EXPER} $<TARGET_FILE_BASE_NAME:causal-cpu-omni> 30 ${_V30} ${_TOL}"
+        "-n 0 -i rocprof-sys-tests-output/causal-cpu-omni-${_TEST}-e2e/causal/experiments.json -v ${_EXPER} $<TARGET_FILE_BASE_NAME:causal-cpu-omni> 10 ${_V10} ${_TOL} ${_EXPER} $<TARGET_FILE_BASE_NAME:causal-cpu-omni> 20 ${_V20} ${_TOL} ${_EXPER} $<TARGET_FILE_BASE_NAME:causal-cpu-omni> 30 ${_V30} ${_TOL}"
        )

    # patch string for command-line
@@ -127,13 +127,13 @@ causal_e2e_args_and_validation(_causal_fast_func fast-func "-F" "cpu_fast_func"
 causal_e2e_args_and_validation(_causal_line_100 line-100 "-S" "causal.cpp:100" 10 20 20 5)
 causal_e2e_args_and_validation(_causal_line_110 line-110 "-S" "causal.cpp:110" 0 0 0 5)

-if(OMNITRACE_BUILD_NUMBER GREATER 1)
+if(ROCPROFSYS_BUILD_NUMBER GREATER 1)
    set(_causal_e2e_environment)
 else()
-    set(_causal_e2e_environment "OMNITRACE_VERBOSE=0")
+    set(_causal_e2e_environment "ROCPROFSYS_VERBOSE=0")
 endif()

-omnitrace_add_causal_test(
+rocprofiler_systems_add_causal_test(
    SKIP_BASELINE
    NAME cpu-omni-slow-func-e2e
    TARGET causal-cpu-omni
@@ -147,7 +147,7 @@ omnitrace_add_causal_test(
    ENVIRONMENT "${_causal_e2e_environment}"
    PROPERTIES PROCESSORS 2 PROCESSOR_AFFINITY OFF)

-omnitrace_add_causal_test(
+rocprofiler_systems_add_causal_test(
    SKIP_BASELINE
    NAME cpu-omni-fast-func-e2e
    TARGET causal-cpu-omni
@@ -161,7 +161,7 @@ omnitrace_add_causal_test(
    ENVIRONMENT "${_causal_e2e_environment}"
    PROPERTIES PROCESSORS 2 PROCESSOR_AFFINITY OFF)

-omnitrace_add_causal_test(
+rocprofiler_systems_add_causal_test(
    SKIP_BASELINE
    NAME cpu-omni-line-100-e2e
    TARGET causal-cpu-omni
@@ -175,7 +175,7 @@ omnitrace_add_causal_test(
    ENVIRONMENT "${_causal_e2e_environment}"
    PROPERTIES PROCESSORS 2 PROCESSOR_AFFINITY OFF)

-omnitrace_add_causal_test(
+rocprofiler_systems_add_causal_test(
    SKIP_BASELINE
    NAME cpu-omni-line-110-e2e
    TARGET causal-cpu-omni
@@ -4,7 +4,7 @@
 #
 # -------------------------------------------------------------------------------------- #

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_BASELINE SKIP_SAMPLING
    NAME code-coverage
    TARGET code-coverage
@@ -43,7 +43,7 @@ omnitrace_add_test(
    RUNTIME_PASS_REGEX "(\\\[[0-9]+\\\]) code coverage     ::  66.67%"
    REWRITE_RUN_PASS_REGEX "(\\\[[0-9]+\\\]) code coverage     ::  66.67%")

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_BASELINE SKIP_SAMPLING
    NAME code-coverage-hybrid
    TARGET code-coverage
@@ -70,7 +70,7 @@ omnitrace_add_test(
    RUNTIME_PASS_REGEX "(\\\[[0-9]+\\\]) code coverage     ::  66.67%"
    REWRITE_RUN_PASS_REGEX "(\\\[[0-9]+\\\]) code coverage     ::  66.67%")

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_BASELINE SKIP_SAMPLING
    NAME code-coverage-basic-blocks
    TARGET code-coverage
@@ -109,7 +109,7 @@ omnitrace_add_test(
    RUNTIME_PASS_REGEX "(\\\[[0-9]+\\\]) function coverage ::  66.67%"
    REWRITE_RUN_PASS_REGEX "(\\\[[0-9]+\\\]) function coverage ::  66.67%")

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_BASELINE SKIP_SAMPLING
    NAME code-coverage-basic-blocks-hybrid
    TARGET code-coverage
@@ -7,7 +7,7 @@
 file(
    WRITE ${CMAKE_CURRENT_BINARY_DIR}/invalid.cfg
    "
-OMNITRACE_CONFIG_FILE =
+ROCPROFSYS_CONFIG_FILE =
 FOOBAR = ON
 ")

@@ -18,15 +18,15 @@ else()
 endif()

 add_test(
-    NAME omnitrace-invalid-config
-    COMMAND $<TARGET_FILE:omnitrace-instrument> -- ${_CONFIG_TEST_EXE}
+    NAME rocprofiler-systems-invalid-config
+    COMMAND $<TARGET_FILE:rocprofiler-systems-instrument> -- ${_CONFIG_TEST_EXE}
    WORKING_DIRECTORY ${PROJECT_BINARY_DIR})

 set_tests_properties(
-    omnitrace-invalid-config
+    rocprofiler-systems-invalid-config
    PROPERTIES
        ENVIRONMENT
-        "OMNITRACE_CONFIG_FILE=${CMAKE_CURRENT_BINARY_DIR}/invalid.cfg;OMNITRACE_CI=ON;OMNITRACE_CI_TIMEOUT=120"
+        "ROCPROFSYS_CONFIG_FILE=${CMAKE_CURRENT_BINARY_DIR}/invalid.cfg;ROCPROFSYS_CI=ON;ROCPROFSYS_CI_TIMEOUT=120"
        TIMEOUT
        120
        LABELS
@@ -35,15 +35,15 @@ set_tests_properties(
        ON)

 add_test(
-    NAME omnitrace-missing-config
-    COMMAND $<TARGET_FILE:omnitrace-instrument> -- ${_CONFIG_TEST_EXE}
+    NAME rocprofiler-systems-missing-config
+    COMMAND $<TARGET_FILE:rocprofiler-systems-instrument> -- ${_CONFIG_TEST_EXE}
    WORKING_DIRECTORY ${PROJECT_BINARY_DIR})

 set_tests_properties(
-    omnitrace-missing-config
+    rocprofiler-systems-missing-config
    PROPERTIES
        ENVIRONMENT
-        "OMNITRACE_CONFIG_FILE=${CMAKE_CURRENT_BINARY_DIR}/missing.cfg;OMNITRACE_CI=ON;OMNITRACE_CI_TIMEOUT=120"
+        "ROCPROFSYS_CONFIG_FILE=${CMAKE_CURRENT_BINARY_DIR}/missing.cfg;ROCPROFSYS_CI=ON;ROCPROFSYS_CI_TIMEOUT=120"
        TIMEOUT
        120
        LABELS
@@ -4,16 +4,16 @@
 #
 # -------------------------------------------------------------------------------------- #

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    NAME fork
    TARGET fork-example
    REWRITE_ARGS -e -v 2 --print-instrumented modules -i 16
    RUNTIME_ARGS -e -v 1 --label file -i 16
    ENVIRONMENT
-        "${_base_environment};OMNITRACE_SAMPLING_FREQ=250;OMNITRACE_SAMPLING_REALTIME=ON"
+        "${_base_environment};ROCPROFSYS_SAMPLING_FREQ=250;ROCPROFSYS_SAMPLING_REALTIME=ON"
    SAMPLING_PASS_REGEX "fork.. called on PID"
    RUNTIME_PASS_REGEX "fork.. called on PID"
    REWRITE_RUN_PASS_REGEX "fork.. called on PID"
-    SAMPLING_FAIL_REGEX "(${OMNITRACE_ABORT_FAIL_REGEX})"
-    RUNTIME_FAIL_REGEX "(${OMNITRACE_ABORT_FAIL_REGEX})"
-    REWRITE_RUN_FAIL_REGEX "(${OMNITRACE_ABORT_FAIL_REGEX})")
+    SAMPLING_FAIL_REGEX "(${ROCPROFSYS_ABORT_FAIL_REGEX})"
+    RUNTIME_FAIL_REGEX "(${ROCPROFSYS_ABORT_FAIL_REGEX})"
+    REWRITE_RUN_FAIL_REGEX "(${ROCPROFSYS_ABORT_FAIL_REGEX})")
@@ -4,7 +4,7 @@
 #
 # -------------------------------------------------------------------------------------- #

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_SAMPLING SKIP_RUNTIME
    NAME rewrite-caller
    TARGET rewrite-caller
@@ -20,12 +20,12 @@ omnitrace_add_test(
        --print-instrumented
        functions
    RUN_ARGS 17
-    ENVIRONMENT "${_base_environment};OMNITRACE_COUT_OUTPUT=ON"
+    ENVIRONMENT "${_base_environment};ROCPROFSYS_COUT_OUTPUT=ON"
    BASELINE_PASS_REGEX "number of calls made = 17"
    REWRITE_PASS_REGEX "\\[function\\]\\[Forcing\\] caller-include-regex :: 'outer'"
    REWRITE_RUN_PASS_REGEX ">>> ._outer ([ \\|]+) 17")

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    NAME parallel-overhead
    TARGET parallel-overhead
    REWRITE_ARGS -e -v 2 --min-instructions=8
@@ -42,7 +42,7 @@ omnitrace_add_test(
    RUN_ARGS 10 ${NUM_THREADS} 1000
    ENVIRONMENT "${_base_environment}")

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_BASELINE SKIP_RUNTIME
    NAME parallel-overhead-locks-perfetto
    TARGET parallel-overhead-locks
@@ -50,5 +50,5 @@ omnitrace_add_test(
    REWRITE_ARGS -e -v 2 --min-instructions=8
    RUN_ARGS 10 4 1000
    ENVIRONMENT
-        "${_lock_environment};OMNITRACE_FLAT_PROFILE=ON;OMNITRACE_PROFILE=OFF;OMNITRACE_TRACE=ON;OMNITRACE_SAMPLING_KEEP_INTERNAL=OFF"
+        "${_lock_environment};ROCPROFSYS_FLAT_PROFILE=ON;ROCPROFSYS_PROFILE=OFF;ROCPROFSYS_TRACE=ON;ROCPROFSYS_SAMPLING_KEEP_INTERNAL=OFF"
    )
@@ -4,7 +4,7 @@
 #
 # -------------------------------------------------------------------------------------- #

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    NAME lulesh
    TARGET lulesh
    MPI ${LULESH_USE_MPI}
@@ -26,13 +26,13 @@ omnitrace_add_test(
    LABELS "kokkos;kokkos-profile-library"
    RUN_ARGS -i 25 -s 20 -p
    ENVIRONMENT
-        "${_base_environment};OMNITRACE_USE_KOKKOSP=ON;OMNITRACE_COUT_OUTPUT=ON;OMNITRACE_SAMPLING_FREQ=50;OMNITRACE_KOKKOSP_PREFIX=[kokkos];KOKKOS_PROFILE_LIBRARY=libomnitrace-dl.so"
+        "${_base_environment};ROCPROFSYS_USE_KOKKOSP=ON;ROCPROFSYS_COUT_OUTPUT=ON;ROCPROFSYS_SAMPLING_FREQ=50;ROCPROFSYS_KOKKOSP_PREFIX=[kokkos];KOKKOS_PROFILE_LIBRARY=librocprof-sys-dl.so"
    REWRITE_RUN_PASS_REGEX "\\|_\\[kokkos\\] [a-zA-Z]"
    RUNTIME_PASS_REGEX "\\|_\\[kokkos\\] [a-zA-Z]")

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_RUNTIME SKIP_REWRITE
-    NAME lulesh-baseline-kokkosp-libomnitrace
+    NAME lulesh-baseline-kokkosp-librocprofiler-systems
    TARGET lulesh
    MPI ${LULESH_USE_MPI}
    GPU ${LULESH_USE_GPU}
@@ -40,12 +40,12 @@ omnitrace_add_test(
    LABELS "kokkos;kokkos-profile-library"
    RUN_ARGS -i 10 -s 20 -p
    ENVIRONMENT
-        "${_base_environment};OMNITRACE_USE_KOKKOSP=ON;OMNITRACE_COUT_OUTPUT=ON;OMNITRACE_SAMPLING_FREQ=50;OMNITRACE_KOKKOSP_PREFIX=[kokkos];KOKKOS_PROFILE_LIBRARY=libomnitrace.so"
+        "${_base_environment};ROCPROFSYS_USE_KOKKOSP=ON;ROCPROFSYS_COUT_OUTPUT=ON;ROCPROFSYS_SAMPLING_FREQ=50;ROCPROFSYS_KOKKOSP_PREFIX=[kokkos];KOKKOS_PROFILE_LIBRARY=librocprof-sys.so"
    BASELINE_PASS_REGEX "\\|_\\[kokkos\\] [a-zA-Z]")

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_RUNTIME SKIP_REWRITE
-    NAME lulesh-baseline-kokkosp-libomnitrace-dl
+    NAME lulesh-baseline-kokkosp-librocprofiler-systems-dl
    TARGET lulesh
    MPI ${LULESH_USE_MPI}
    GPU ${LULESH_USE_GPU}
@@ -53,10 +53,10 @@ omnitrace_add_test(
    LABELS "kokkos;kokkos-profile-library"
    RUN_ARGS -i 10 -s 20 -p
    ENVIRONMENT
-        "${_base_environment};OMNITRACE_USE_KOKKOSP=ON;OMNITRACE_COUT_OUTPUT=ON;OMNITRACE_SAMPLING_FREQ=50;OMNITRACE_KOKKOSP_PREFIX=[kokkos];KOKKOS_PROFILE_LIBRARY=libomnitrace-dl.so"
+        "${_base_environment};ROCPROFSYS_USE_KOKKOSP=ON;ROCPROFSYS_COUT_OUTPUT=ON;ROCPROFSYS_SAMPLING_FREQ=50;ROCPROFSYS_KOKKOSP_PREFIX=[kokkos];KOKKOS_PROFILE_LIBRARY=librocprof-sys-dl.so"
    BASELINE_PASS_REGEX "\\|_\\[kokkos\\] [a-zA-Z]")

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_BASELINE
    NAME lulesh-kokkosp
    TARGET lulesh
@@ -77,9 +77,9 @@ omnitrace_add_test(
        -ME
        [==[lib(gomp|m-)]==]
    RUN_ARGS -i 10 -s 20 -p
-    ENVIRONMENT "${_base_environment};OMNITRACE_USE_KOKKOSP=ON")
+    ENVIRONMENT "${_base_environment};ROCPROFSYS_USE_KOKKOSP=ON")

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_BASELINE
    NAME lulesh-perfetto
    TARGET lulesh
@@ -99,9 +99,9 @@ omnitrace_add_test(
        -ME
        [==[libgomp]==]
    RUN_ARGS -i 10 -s 20 -p
-    ENVIRONMENT "${_perfetto_environment};OMNITRACE_USE_KOKKOSP=OFF")
+    ENVIRONMENT "${_perfetto_environment};ROCPROFSYS_USE_KOKKOSP=OFF")

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    NAME lulesh-timemory
    TARGET lulesh
    MPI ${LULESH_USE_MPI}
@@ -118,7 +118,7 @@ omnitrace_add_test(
        -ME
        [==[libgomp]==]
        --env
-        OMNITRACE_TIMEMORY_COMPONENTS="wall_clock peak_rss"
+        ROCPROFSYS_TIMEMORY_COMPONENTS="wall_clock peak_rss"
    RUN_ARGS -i 10 -s 20 -p
-    ENVIRONMENT "${_timemory_environment};OMNITRACE_USE_KOKKOSP=OFF"
+    ENVIRONMENT "${_timemory_environment};ROCPROFSYS_USE_KOKKOSP=OFF"
    REWRITE_FAIL_REGEX "0 instrumented loops in procedure")
@@ -4,11 +4,11 @@
 #
 # -------------------------------------------------------------------------------------- #

-if(NOT OMNITRACE_USE_MPI AND NOT OMNITRACE_USE_MPI_HEADERS)
+if(NOT ROCPROFSYS_USE_MPI AND NOT ROCPROFSYS_USE_MPI_HEADERS)
    return()
 endif()

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_RUNTIME
    NAME "mpi"
    TARGET mpi-example
@@ -25,14 +25,14 @@ omnitrace_add_test(
        args
        --min-instructions
        0
-    ENVIRONMENT "${_base_environment};OMNITRACE_VERBOSE=1"
+    ENVIRONMENT "${_base_environment};ROCPROFSYS_VERBOSE=1"
    REWRITE_RUN_PASS_REGEX
        "(/[A-Za-z-]+/perfetto-trace-0.proto).*(/[A-Za-z-]+/wall_clock-0.txt')"
    REWRITE_RUN_FAIL_REGEX
-        "(perfetto-trace|trip_count|sampling_percent|sampling_cpu_clock|sampling_wall_clock|wall_clock)-[0-9][0-9]+.(json|txt|proto)|OMNITRACE_ABORT_FAIL_REGEX"
+        "(perfetto-trace|trip_count|sampling_percent|sampling_cpu_clock|sampling_wall_clock|wall_clock)-[0-9][0-9]+.(json|txt|proto)|ROCPROFSYS_ABORT_FAIL_REGEX"
    )

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_RUNTIME
    NAME "mpi-flat-mpip"
    TARGET mpi-example
@@ -50,12 +50,12 @@ omnitrace_add_test(
        --min-instructions
        0
    ENVIRONMENT
-        "${_flat_environment};OMNITRACE_USE_SAMPLING=OFF;OMNITRACE_STRICT_CONFIG=OFF;OMNITRACE_USE_MPIP=ON"
+        "${_flat_environment};ROCPROFSYS_USE_SAMPLING=OFF;ROCPROFSYS_STRICT_CONFIG=OFF;ROCPROFSYS_USE_MPIP=ON"
    REWRITE_RUN_PASS_REGEX
        ">>> mpi-flat-mpip.inst(.*\n.*)>>> MPI_Init_thread(.*\n.*)>>> pthread_create(.*\n.*)>>> MPI_Comm_size(.*\n.*)>>> MPI_Comm_rank(.*\n.*)>>> MPI_Barrier(.*\n.*)>>> MPI_Alltoall"
    )

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_RUNTIME
    NAME "mpi-flat"
    TARGET mpi-example
@@ -72,36 +72,36 @@ omnitrace_add_test(
        args
        --min-instructions
        0
-    ENVIRONMENT "${_flat_environment};OMNITRACE_USE_SAMPLING=OFF"
+    ENVIRONMENT "${_flat_environment};ROCPROFSYS_USE_SAMPLING=OFF"
    REWRITE_RUN_PASS_REGEX
        ">>> mpi-flat.inst(.*\n.*)>>> MPI_Init_thread(.*\n.*)>>> pthread_create(.*\n.*)>>> MPI_Comm_size(.*\n.*)>>> MPI_Comm_rank(.*\n.*)>>> MPI_Barrier(.*\n.*)>>> MPI_Alltoall"
    )

 set(_mpip_environment
-    "OMNITRACE_TRACE=ON"
-    "OMNITRACE_PROFILE=ON"
-    "OMNITRACE_USE_SAMPLING=OFF"
-    "OMNITRACE_USE_PROCESS_SAMPLING=OFF"
-    "OMNITRACE_TIME_OUTPUT=OFF"
-    "OMNITRACE_FILE_OUTPUT=ON"
-    "OMNITRACE_USE_MPIP=ON"
-    "OMNITRACE_DEBUG=OFF"
-    "OMNITRACE_VERBOSE=2"
-    "OMNITRACE_DL_VERBOSE=2"
+    "ROCPROFSYS_TRACE=ON"
+    "ROCPROFSYS_PROFILE=ON"
+    "ROCPROFSYS_USE_SAMPLING=OFF"
+    "ROCPROFSYS_USE_PROCESS_SAMPLING=OFF"
+    "ROCPROFSYS_TIME_OUTPUT=OFF"
+    "ROCPROFSYS_FILE_OUTPUT=ON"
+    "ROCPROFSYS_USE_MPIP=ON"
+    "ROCPROFSYS_DEBUG=OFF"
+    "ROCPROFSYS_VERBOSE=2"
+    "ROCPROFSYS_DL_VERBOSE=2"
    "${_test_openmp_env}"
    "${_test_library_path}")

 set(_mpip_all2all_environment
-    "OMNITRACE_TRACE=ON"
-    "OMNITRACE_PROFILE=ON"
-    "OMNITRACE_USE_SAMPLING=OFF"
-    "OMNITRACE_USE_PROCESS_SAMPLING=OFF"
-    "OMNITRACE_TIME_OUTPUT=OFF"
-    "OMNITRACE_FILE_OUTPUT=ON"
-    "OMNITRACE_USE_MPIP=ON"
-    "OMNITRACE_DEBUG=ON"
-    "OMNITRACE_VERBOSE=3"
-    "OMNITRACE_DL_VERBOSE=3"
+    "ROCPROFSYS_TRACE=ON"
+    "ROCPROFSYS_PROFILE=ON"
+    "ROCPROFSYS_USE_SAMPLING=OFF"
+    "ROCPROFSYS_USE_PROCESS_SAMPLING=OFF"
+    "ROCPROFSYS_TIME_OUTPUT=OFF"
+    "ROCPROFSYS_FILE_OUTPUT=ON"
+    "ROCPROFSYS_USE_MPIP=ON"
+    "ROCPROFSYS_DEBUG=ON"
+    "ROCPROFSYS_VERBOSE=3"
+    "ROCPROFSYS_DL_VERBOSE=3"
    "${_test_openmp_env}"
    "${_test_library_path}")

@@ -109,7 +109,7 @@ foreach(_EXAMPLE all2all allgather allreduce bcast reduce scatter-gather send-re
    if("${_mpip_${_EXAMPLE}_environment}" STREQUAL "")
        set(_mpip_${_EXAMPLE}_environment "${_mpip_environment}")
    endif()
-    omnitrace_add_test(
+    rocprofiler_systems_add_test(
        SKIP_RUNTIME SKIP_SAMPLING
        NAME "mpi-${_EXAMPLE}"
        TARGET mpi-${_EXAMPLE}
@@ -4,13 +4,13 @@
 #
 # -------------------------------------------------------------------------------------- #

-if(OMNITRACE_OPENMP_USING_LIBOMP_LIBRARY AND OMNITRACE_USE_OMPT)
+if(ROCPROFSYS_OPENMP_USING_LIBOMP_LIBRARY AND ROCPROFSYS_USE_OMPT)
    set(_OMPT_PASS_REGEX "\\|_ompt_")
 else()
    set(_OMPT_PASS_REGEX "")
 endif()

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    NAME openmp-cg
    TARGET openmp-cg
    LABELS "openmp"
@@ -18,12 +18,13 @@ omnitrace_add_test(
    RUNTIME_ARGS -e -v 1 --label return args
    REWRITE_TIMEOUT 180
    RUNTIME_TIMEOUT 360
-    ENVIRONMENT "${_ompt_environment};OMNITRACE_USE_SAMPLING=OFF;OMNITRACE_COUT_OUTPUT=ON"
+    ENVIRONMENT
+        "${_ompt_environment};ROCPROFSYS_USE_SAMPLING=OFF;ROCPROFSYS_COUT_OUTPUT=ON"
    REWRITE_RUN_PASS_REGEX "${_OMPT_PASS_REGEX}"
    RUNTIME_PASS_REGEX "${_OMPT_PASS_REGEX}"
    REWRITE_FAIL_REGEX "0 instrumented loops in procedure")

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_RUNTIME
    NAME openmp-lu
    TARGET openmp-lu
@@ -33,36 +34,36 @@ omnitrace_add_test(
    REWRITE_TIMEOUT 180
    RUNTIME_TIMEOUT 360
    ENVIRONMENT
-        "${_ompt_environment};OMNITRACE_USE_SAMPLING=ON;OMNITRACE_SAMPLING_FREQ=50;OMNITRACE_COUT_OUTPUT=ON"
+        "${_ompt_environment};ROCPROFSYS_USE_SAMPLING=ON;ROCPROFSYS_SAMPLING_FREQ=50;ROCPROFSYS_COUT_OUTPUT=ON"
    REWRITE_RUN_PASS_REGEX "${_OMPT_PASS_REGEX}"
    REWRITE_FAIL_REGEX "0 instrumented loops in procedure")

 set(_ompt_sampling_environ
    "${_ompt_environment}"
-    "OMNITRACE_VERBOSE=2"
-    "OMNITRACE_USE_OMPT=OFF"
-    "OMNITRACE_USE_SAMPLING=ON"
-    "OMNITRACE_USE_PROCESS_SAMPLING=OFF"
-    "OMNITRACE_SAMPLING_FREQ=100"
-    "OMNITRACE_SAMPLING_DELAY=0.1"
-    "OMNITRACE_SAMPLING_DURATION=0.25"
-    "OMNITRACE_SAMPLING_CPUTIME=ON"
-    "OMNITRACE_SAMPLING_REALTIME=ON"
-    "OMNITRACE_SAMPLING_CPUTIME_FREQ=1000"
-    "OMNITRACE_SAMPLING_REALTIME_FREQ=500"
-    "OMNITRACE_MONOCHROME=ON")
+    "ROCPROFSYS_VERBOSE=2"
+    "ROCPROFSYS_USE_OMPT=OFF"
+    "ROCPROFSYS_USE_SAMPLING=ON"
+    "ROCPROFSYS_USE_PROCESS_SAMPLING=OFF"
+    "ROCPROFSYS_SAMPLING_FREQ=100"
+    "ROCPROFSYS_SAMPLING_DELAY=0.1"
+    "ROCPROFSYS_SAMPLING_DURATION=0.25"
+    "ROCPROFSYS_SAMPLING_CPUTIME=ON"
+    "ROCPROFSYS_SAMPLING_REALTIME=ON"
+    "ROCPROFSYS_SAMPLING_CPUTIME_FREQ=1000"
+    "ROCPROFSYS_SAMPLING_REALTIME_FREQ=500"
+    "ROCPROFSYS_MONOCHROME=ON")

 set(_ompt_sample_no_tmpfiles_environ
    "${_ompt_environment}"
-    "OMNITRACE_VERBOSE=2"
-    "OMNITRACE_USE_OMPT=OFF"
-    "OMNITRACE_USE_SAMPLING=ON"
-    "OMNITRACE_USE_PROCESS_SAMPLING=OFF"
-    "OMNITRACE_SAMPLING_CPUTIME=ON"
-    "OMNITRACE_SAMPLING_REALTIME=OFF"
-    "OMNITRACE_SAMPLING_CPUTIME_FREQ=700"
-    "OMNITRACE_USE_TEMPORARY_FILES=OFF"
-    "OMNITRACE_MONOCHROME=ON")
+    "ROCPROFSYS_VERBOSE=2"
+    "ROCPROFSYS_USE_OMPT=OFF"
+    "ROCPROFSYS_USE_SAMPLING=ON"
+    "ROCPROFSYS_USE_PROCESS_SAMPLING=OFF"
+    "ROCPROFSYS_SAMPLING_CPUTIME=ON"
+    "ROCPROFSYS_SAMPLING_REALTIME=OFF"
+    "ROCPROFSYS_SAMPLING_CPUTIME_FREQ=700"
+    "ROCPROFSYS_USE_TEMPORARY_FILES=OFF"
+    "ROCPROFSYS_MONOCHROME=ON")

 set(_ompt_sampling_samp_regex
    "Sampler for thread 0 will be triggered 1000.0x per second of CPU-time(.*)Sampler for thread 0 will be triggered 500.0x per second of wall-time(.*)Sampling will be disabled after 0.250000 seconds(.*)Sampling duration of 0.250000 seconds has elapsed. Shutting down sampling"
@@ -74,7 +75,7 @@ set(_notmp_sampling_file_regex
    "sampling-no-tmp-files-sampling/sampling_percent.(json|txt)(.*)sampling-no-tmp-files-sampling/sampling_cpu_clock.(json|txt)(.*)sampling-no-tmp-files-sampling/sampling_wall_clock.(json|txt)"
    )

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_BASELINE SKIP_RUNTIME SKIP_REWRITE
    NAME openmp-cg-sampling-duration
    TARGET openmp-cg
@@ -82,7 +83,7 @@ omnitrace_add_test(
    ENVIRONMENT "${_ompt_sampling_environ}"
    SAMPLING_PASS_REGEX "${_ompt_sampling_samp_regex}(.*)${_ompt_sampling_file_regex}")

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_BASELINE SKIP_RUNTIME SKIP_REWRITE
    NAME openmp-lu-sampling-duration
    TARGET openmp-lu
@@ -90,7 +91,7 @@ omnitrace_add_test(
    ENVIRONMENT "${_ompt_sampling_environ}"
    SAMPLING_PASS_REGEX "${_ompt_sampling_samp_regex}(.*)${_ompt_sampling_file_regex}")

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_BASELINE SKIP_RUNTIME SKIP_REWRITE
    NAME openmp-cg-sampling-no-tmp-files
    TARGET openmp-cg
@@ -6,18 +6,18 @@

 set(_overflow_environment
    "${_base_environment}"
-    "OMNITRACE_VERBOSE=2"
-    "OMNITRACE_SAMPLING_CPUTIME=OFF"
-    "OMNITRACE_SAMPLING_REALTIME=OFF"
-    "OMNITRACE_SAMPLING_OVERFLOW=ON"
-    "OMNITRACE_SAMPLING_OVERFLOW_EVENT=PERF_COUNT_SW_CPU_CLOCK"
-    "OMNITRACE_SAMPLING_OVERFLOW_FREQ=10000"
-    "OMNITRACE_DEBUG_THREADING_GET_ID=ON")
+    "ROCPROFSYS_VERBOSE=2"
+    "ROCPROFSYS_SAMPLING_CPUTIME=OFF"
+    "ROCPROFSYS_SAMPLING_REALTIME=OFF"
+    "ROCPROFSYS_SAMPLING_OVERFLOW=ON"
+    "ROCPROFSYS_SAMPLING_OVERFLOW_EVENT=PERF_COUNT_SW_CPU_CLOCK"
+    "ROCPROFSYS_SAMPLING_OVERFLOW_FREQ=10000"
+    "ROCPROFSYS_DEBUG_THREADING_GET_ID=ON")

-if(omnitrace_perf_event_paranoid LESS_EQUAL 3
-   OR omnitrace_cap_sys_admin EQUAL 0
-   OR omnitrace_cap_perfmon EQUAL 0)
-    omnitrace_add_test(
+if(rocprofiler_systems_perf_event_paranoid LESS_EQUAL 3
+   OR rocprofiler_systems_cap_sys_admin EQUAL 0
+   OR rocprofiler_systems_cap_perfmon EQUAL 0)
+    rocprofiler_systems_add_test(
        SKIP_BASELINE
        NAME overflow
        TARGET parallel-overhead
@@ -4,7 +4,7 @@
 #
 # -------------------------------------------------------------------------------------- #

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    NAME parallel-overhead-locks
    TARGET parallel-overhead-locks
    LABELS "locks"
@@ -12,14 +12,14 @@ omnitrace_add_test(
    RUNTIME_ARGS -e -i 256
    RUN_ARGS 30 4 1000
    ENVIRONMENT
-        "${_lock_environment};OMNITRACE_PROFILE=ON;OMNITRACE_TRACE=ON;OMNITRACE_COLLAPSE_THREADS=OFF;OMNITRACE_SAMPLING_REALTIME=ON;OMNITRACE_SAMPLING_REALTIME_FREQ=10;OMNITRACE_SAMPLING_REALTIME_TIDS=0;OMNITRACE_SAMPLING_KEEP_INTERNAL=OFF"
+        "${_lock_environment};ROCPROFSYS_PROFILE=ON;ROCPROFSYS_TRACE=ON;ROCPROFSYS_COLLAPSE_THREADS=OFF;ROCPROFSYS_SAMPLING_REALTIME=ON;ROCPROFSYS_SAMPLING_REALTIME_FREQ=10;ROCPROFSYS_SAMPLING_REALTIME_TIDS=0;ROCPROFSYS_SAMPLING_KEEP_INTERNAL=OFF"
    REWRITE_RUN_PASS_REGEX
        "wall_clock .*\\|_pthread_create .* 4 .*\\|_pthread_mutex_lock .* 1000 .*\\|_pthread_mutex_unlock .* 1000 .*\\|_pthread_mutex_lock .* 1000 .*\\|_pthread_mutex_unlock .* 1000 .*\\|_pthread_mutex_lock .* 1000 .*\\|_pthread_mutex_unlock .* 1000 .*\\|_pthread_mutex_lock .* 1000 .*\\|_pthread_mutex_unlock .* 1000"
    RUNTIME_PASS_REGEX
        "wall_clock .*\\|_pthread_create .* 4 .*\\|_pthread_mutex_lock .* 1000 .*\\|_pthread_mutex_unlock .* 1000 .*\\|_pthread_mutex_lock .* 1000 .*\\|_pthread_mutex_unlock .* 1000 .*\\|_pthread_mutex_lock .* 1000 .*\\|_pthread_mutex_unlock .* 1000 .*\\|_pthread_mutex_lock .* 1000 .*\\|_pthread_mutex_unlock .* 1000"
    )

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_RUNTIME
    NAME parallel-overhead-locks-timemory
    TARGET parallel-overhead-locks
@@ -28,7 +28,7 @@ omnitrace_add_test(
                 TrampRecursive
    RUN_ARGS 10 4 1000
    ENVIRONMENT
-        "${_lock_environment};OMNITRACE_FLAT_PROFILE=ON;OMNITRACE_PROFILE=ON;OMNITRACE_TRACE=OFF;OMNITRACE_SAMPLING_KEEP_INTERNAL=OFF"
+        "${_lock_environment};ROCPROFSYS_FLAT_PROFILE=ON;ROCPROFSYS_PROFILE=ON;ROCPROFSYS_TRACE=OFF;ROCPROFSYS_SAMPLING_KEEP_INTERNAL=OFF"
    REWRITE_RUN_PASS_REGEX
        "start_thread (.*) 4 (.*) pthread_mutex_lock (.*) 4000 (.*) pthread_mutex_unlock (.*) 4000"
    )
@@ -6,14 +6,14 @@

 set(_INDEX 0)

-foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS})
-    if(NOT OMNITRACE_USE_PYTHON)
+foreach(_VERSION ${ROCPROFSYS_PYTHON_VERSIONS})
+    if(NOT ROCPROFSYS_USE_PYTHON)
        continue()
    endif()

-    list(GET OMNITRACE_PYTHON_ROOT_DIRS ${_INDEX} _PYTHON_ROOT_DIR)
+    list(GET ROCPROFSYS_PYTHON_ROOT_DIRS ${_INDEX} _PYTHON_ROOT_DIR)

-    omnitrace_find_python(
+    rocprofiler_systems_find_python(
        _PYTHON
        ROOT_DIR "${_PYTHON_ROOT_DIR}"
        COMPONENTS Interpreter)
@@ -21,7 +21,7 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS})
    # ---------------------------------------------------------------------------------- #
    # python tests
    # ---------------------------------------------------------------------------------- #
-    omnitrace_add_python_test(
+    rocprofiler_systems_add_python_test(
        NAME python-external
        PYTHON_EXECUTABLE ${_PYTHON_EXECUTABLE}
        PYTHON_VERSION ${_VERSION}
@@ -30,7 +30,7 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS})
        RUN_ARGS -v 10 -n 5
        ENVIRONMENT "${_python_environment}")

-    omnitrace_add_python_test(
+    rocprofiler_systems_add_python_test(
        NAME python-external-exclude-inefficient
        PYTHON_EXECUTABLE ${_PYTHON_EXECUTABLE}
        PYTHON_VERSION ${_VERSION}
@@ -39,7 +39,7 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS})
        RUN_ARGS -v 10 -n 5
        ENVIRONMENT "${_python_environment}")

-    omnitrace_add_python_test(
+    rocprofiler_systems_add_python_test(
        NAME python-builtin
        PYTHON_EXECUTABLE ${_PYTHON_EXECUTABLE}
        PYTHON_VERSION ${_VERSION}
@@ -48,7 +48,7 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS})
        RUN_ARGS -v 10 -n 5
        ENVIRONMENT "${_python_environment}")

-    omnitrace_add_python_test(
+    rocprofiler_systems_add_python_test(
        NAME python-builtin-noprofile
        PYTHON_EXECUTABLE ${_PYTHON_EXECUTABLE}
        PYTHON_VERSION ${_VERSION}
@@ -57,7 +57,7 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS})
        RUN_ARGS -v 15 -n 5
        ENVIRONMENT "${_python_environment}")

-    omnitrace_add_python_test(
+    rocprofiler_systems_add_python_test(
        STANDALONE
        NAME python-source
        PYTHON_EXECUTABLE ${_PYTHON_EXECUTABLE}
@@ -66,7 +66,7 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS})
        RUN_ARGS -v 5 -n 5 -s 3
        ENVIRONMENT "${_python_environment}")

-    omnitrace_add_python_test(
+    rocprofiler_systems_add_python_test(
        STANDALONE
        NAME python-code-coverage
        PYTHON_EXECUTABLE ${_PYTHON_EXECUTABLE}
@@ -74,10 +74,10 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS})
        FILE ${CMAKE_SOURCE_DIR}/examples/code-coverage/code-coverage.py
        RUN_ARGS
            -i
-            ${PROJECT_BINARY_DIR}/omnitrace-tests-output/code-coverage-basic-blocks-binary-rewrite/coverage.json
-            ${PROJECT_BINARY_DIR}/omnitrace-tests-output/code-coverage-basic-blocks-hybrid-runtime-instrument/coverage.json
+            ${PROJECT_BINARY_DIR}/rocprof-sys-tests-output/code-coverage-basic-blocks-binary-rewrite/coverage.json
+            ${PROJECT_BINARY_DIR}/rocprof-sys-tests-output/code-coverage-basic-blocks-hybrid-runtime-instrument/coverage.json
            -o
-            ${PROJECT_BINARY_DIR}/omnitrace-tests-output/code-coverage-basic-blocks-summary/coverage.json
+            ${PROJECT_BINARY_DIR}/rocprof-sys-tests-output/code-coverage-basic-blocks-summary/coverage.json
        DEPENDS code-coverage-basic-blocks-binary-rewrite
                code-coverage-basic-blocks-binary-rewrite-run
                code-coverage-basic-blocks-hybrid-runtime-instrument
@@ -89,90 +89,90 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS})
    # ---------------------------------------------------------------------------------- #
    if(CMAKE_VERSION VERSION_LESS "3.18.0")
        find_program(
-            OMNITRACE_CAT_EXE
+            ROCPROFSYS_CAT_EXE
            NAMES cat
            PATH_SUFFIXES bin)

-        if(OMNITRACE_CAT_EXE)
-            set(OMNITRACE_CAT_COMMAND ${OMNITRACE_CAT_EXE})
+        if(ROCPROFSYS_CAT_EXE)
+            set(ROCPROFSYS_CAT_COMMAND ${ROCPROFSYS_CAT_EXE})
        endif()
    else()
-        set(OMNITRACE_CAT_COMMAND ${CMAKE_COMMAND} -E cat)
+        set(ROCPROFSYS_CAT_COMMAND ${CMAKE_COMMAND} -E cat)
    endif()

-    if(OMNITRACE_CAT_COMMAND)
-        omnitrace_add_python_test(
+    if(ROCPROFSYS_CAT_COMMAND)
+        rocprofiler_systems_add_python_test(
            NAME python-external-check
-            COMMAND ${OMNITRACE_CAT_COMMAND}
+            COMMAND ${ROCPROFSYS_CAT_COMMAND}
            PYTHON_VERSION ${_VERSION}
-            FILE omnitrace-tests-output/python-external/${_VERSION}/trip_count.txt
+            FILE rocprof-sys-tests-output/python-external/${_VERSION}/trip_count.txt
            PASS_REGEX
                "(\\\[compile\\\]).*(\\\| \\\|0>>> \\\[run\\\]\\\[external.py\\\]).*(\\\| \\\|0>>> \\\|_\\\[fib\\\]\\\[external.py\\\]).*(\\\| \\\|0>>> \\\|_\\\[inefficient\\\]\\\[external.py\\\])"
            DEPENDS python-external-${_VERSION}
            ENVIRONMENT "${_python_environment}")

-        omnitrace_add_python_test(
+        rocprofiler_systems_add_python_test(
            NAME python-external-exclude-inefficient-check
-            COMMAND ${OMNITRACE_CAT_COMMAND}
+            COMMAND ${ROCPROFSYS_CAT_COMMAND}
            PYTHON_VERSION ${_VERSION}
-            FILE omnitrace-tests-output/python-external-exclude-inefficient/${_VERSION}/trip_count.txt
-            FAIL_REGEX "(\\\|_inefficient).*(\\\|_sum)|OMNITRACE_ABORT_FAIL_REGEX"
+            FILE rocprof-sys-tests-output/python-external-exclude-inefficient/${_VERSION}/trip_count.txt
+            FAIL_REGEX "(\\\|_inefficient).*(\\\|_sum)|ROCPROFSYS_ABORT_FAIL_REGEX"
            DEPENDS python-external-exclude-inefficient-${_VERSION}
            ENVIRONMENT "${_python_environment}")

-        omnitrace_add_python_test(
+        rocprofiler_systems_add_python_test(
            NAME python-builtin-check
-            COMMAND ${OMNITRACE_CAT_COMMAND}
+            COMMAND ${ROCPROFSYS_CAT_COMMAND}
            PYTHON_VERSION ${_VERSION}
-            FILE omnitrace-tests-output/python-builtin/${_VERSION}/trip_count.txt
+            FILE rocprof-sys-tests-output/python-builtin/${_VERSION}/trip_count.txt
            PASS_REGEX "\\\[inefficient\\\]\\\[builtin.py:14\\\]"
            DEPENDS python-builtin-${_VERSION}
            ENVIRONMENT "${_python_environment}")

-        omnitrace_add_python_test(
+        rocprofiler_systems_add_python_test(
            NAME python-builtin-noprofile-check
-            COMMAND ${OMNITRACE_CAT_COMMAND}
+            COMMAND ${ROCPROFSYS_CAT_COMMAND}
            PYTHON_VERSION ${_VERSION}
-            FILE omnitrace-tests-output/python-builtin-noprofile/${_VERSION}/trip_count.txt
+            FILE rocprof-sys-tests-output/python-builtin-noprofile/${_VERSION}/trip_count.txt
            PASS_REGEX ".(run)..(noprofile.py)."
-            FAIL_REGEX ".(fib|inefficient)..(noprofile.py).|OMNITRACE_ABORT_FAIL_REGEX"
+            FAIL_REGEX ".(fib|inefficient)..(noprofile.py).|ROCPROFSYS_ABORT_FAIL_REGEX"
            DEPENDS python-builtin-noprofile-${_VERSION}
            ENVIRONMENT "${_python_environment}")
    else()
-        omnitrace_message(
+        rocprofiler_systems_message(
            WARNING
            "Neither 'cat' nor 'cmake -E cat' are available. Python source checks are disabled"
            )
    endif()

-    function(OMNITRACE_ADD_PYTHON_VALIDATION_TEST)
+    function(ROCPROFILER_SYSTEMS_ADD_PYTHON_VALIDATION_TEST)
        cmake_parse_arguments(
            TEST "" "NAME;TIMEMORY_METRIC;TIMEMORY_FILE;PERFETTO_METRIC;PERFETTO_FILE"
            "ARGS" ${ARGN})

-        omnitrace_add_python_test(
+        rocprofiler_systems_add_python_test(
            NAME ${TEST_NAME}-validate-timemory
            COMMAND
                ${_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/validate-timemory-json.py
                -m ${TEST_TIMEMORY_METRIC} ${TEST_ARGS} -i
            PYTHON_VERSION ${_VERSION}
-            FILE omnitrace-tests-output/${TEST_NAME}/${_VERSION}/${TEST_TIMEMORY_FILE}
+            FILE rocprof-sys-tests-output/${TEST_NAME}/${_VERSION}/${TEST_TIMEMORY_FILE}
            DEPENDS ${TEST_NAME}-${_VERSION}
            PASS_REGEX
-                "omnitrace-tests-output/${TEST_NAME}/${_VERSION}/${TEST_TIMEMORY_FILE} validated"
+                "rocprof-sys-tests-output/${TEST_NAME}/${_VERSION}/${TEST_TIMEMORY_FILE} validated"
            ENVIRONMENT "${_python_environment}")

-        omnitrace_add_python_test(
+        rocprofiler_systems_add_python_test(
            NAME ${TEST_NAME}-validate-perfetto
            COMMAND
                ${_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/validate-perfetto-proto.py
                -m ${TEST_PERFETTO_METRIC} ${TEST_ARGS} -p -t
                /opt/trace_processor/bin/trace_processor_shell -i
            PYTHON_VERSION ${_VERSION}
-            FILE omnitrace-tests-output/${TEST_NAME}/${_VERSION}/${TEST_PERFETTO_FILE}
+            FILE rocprof-sys-tests-output/${TEST_NAME}/${_VERSION}/${TEST_PERFETTO_FILE}
            DEPENDS ${TEST_NAME}-${_VERSION}
            PASS_REGEX
-                "omnitrace-tests-output/${TEST_NAME}/${_VERSION}/${TEST_PERFETTO_FILE} validated"
+                "rocprof-sys-tests-output/${TEST_NAME}/${_VERSION}/${TEST_PERFETTO_FILE} validated"
            ENVIRONMENT "${_python_environment}")
    endfunction()

@@ -207,7 +207,7 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS})
        2
        3)

-    omnitrace_add_python_validation_test(
+    rocprofiler_systems_add_python_validation_test(
        NAME python-source
        TIMEMORY_METRIC "trip_count"
        TIMEMORY_FILE "trip_count.json"
@@ -256,7 +256,7 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS})
        10
        1)

-    omnitrace_add_python_validation_test(
+    rocprofiler_systems_add_python_validation_test(
        NAME python-builtin
        TIMEMORY_METRIC "trip_count"
        TIMEMORY_FILE "trip_count.json"
@@ -7,7 +7,7 @@
 foreach(_TARGET ${RCCL_TEST_TARGETS})
    string(REPLACE "rccl-tests::" "" _NAME "${_TARGET}")
    string(REPLACE "_" "-" _NAME "${_NAME}")
-    omnitrace_add_test(
+    rocprofiler_systems_add_test(
        NAME rccl-test-${_NAME}
        TARGET ${_TARGET}
        LABELS "rccl-tests;rcclp"
@@ -4,11 +4,11 @@
 #
 # -------------------------------------------------------------------------------------- #

-set(OMNITRACE_ROCM_EVENTS_TEST
+set(ROCPROFSYS_ROCM_EVENTS_TEST
    "GRBM_COUNT,GPUBusy,SQ_WAVES,SQ_INSTS_VALU,VALUInsts,TCC_HIT_sum,TA_TA_BUSY[0]:device=0,TA_TA_BUSY[11]:device=0"
    )

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    NAME transpose
    TARGET transpose
    MPI ${TRANSPOSE_USE_MPI}
@@ -28,7 +28,7 @@ omnitrace_add_test(
        uniform_int_distribution
    ENVIRONMENT "${_base_environment}")

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_REWRITE SKIP_RUNTIME
    NAME transpose-two-kernels
    TARGET transpose
@@ -37,10 +37,10 @@ omnitrace_add_test(
    NUM_PROCS 1
    RUN_ARGS 1 2 2
    ENVIRONMENT
-        "${_base_environment};OMNITRACE_ROCTRACER_HSA_ACTIVITY=OFF;OMNITRACE_ROCTRACER_HSA_API=OFF"
+        "${_base_environment};ROCPROFSYS_ROCTRACER_HSA_ACTIVITY=OFF;ROCPROFSYS_ROCTRACER_HSA_API=OFF"
    )

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_BASELINE SKIP_RUNTIME
    NAME transpose-loops
    TARGET transpose
@@ -64,8 +64,8 @@ omnitrace_add_test(
    ENVIRONMENT "${_base_environment}"
    REWRITE_FAIL_REGEX "0 instrumented loops in procedure transpose")

-if(OMNITRACE_USE_ROCPROFILER)
-    omnitrace_add_test(
+if(ROCPROFSYS_USE_ROCPROFILER)
+    rocprofiler_systems_add_test(
        SKIP_BASELINE SKIP_RUNTIME
        NAME transpose-rocprofiler
        TARGET transpose
@@ -75,12 +75,12 @@ if(OMNITRACE_USE_ROCPROFILER)
        NUM_PROCS ${NUM_PROCS}
        REWRITE_ARGS -e -v 2 -E uniform_int_distribution
        ENVIRONMENT
-            "${_base_environment};OMNITRACE_ROCM_EVENTS=${OMNITRACE_ROCM_EVENTS_TEST}"
+            "${_base_environment};ROCPROFSYS_ROCM_EVENTS=${ROCPROFSYS_ROCM_EVENTS_TEST}"
        REWRITE_RUN_PASS_REGEX
            "rocprof-device-0-GRBM_COUNT.txt(.*)rocprof-device-0-GPUBusy.txt(.*)rocprof-device-0-SQ_WAVES.txt(.*)rocprof-device-0-SQ_INSTS_VALU.txt(.*)rocprof-device-0-VALUInsts.txt(.*)rocprof-device-0-TCC_HIT_sum.txt(.*)rocprof-device-0-TA_TA_BUSY_0.txt(.*)rocprof-device-0-TA_TA_BUSY_11.txt"
        )

-    omnitrace_add_test(
+    rocprofiler_systems_add_test(
        SKIP_BASELINE SKIP_RUNTIME
        NAME transpose-rocprofiler-no-roctracer
        TARGET transpose
@@ -90,8 +90,8 @@ if(OMNITRACE_USE_ROCPROFILER)
        NUM_PROCS ${NUM_PROCS}
        REWRITE_ARGS -e -v 2 -E uniform_int_distribution
        ENVIRONMENT
-            "${_base_environment};OMNITRACE_USE_ROCTRACER=OFF;OMNITRACE_ROCM_EVENTS=${OMNITRACE_ROCM_EVENTS_TEST}"
+            "${_base_environment};ROCPROFSYS_USE_ROCTRACER=OFF;ROCPROFSYS_ROCM_EVENTS=${ROCPROFSYS_ROCM_EVENTS_TEST}"
        REWRITE_RUN_PASS_REGEX
            "rocprof-device-0-GRBM_COUNT.txt(.*)rocprof-device-0-GPUBusy.txt(.*)rocprof-device-0-SQ_WAVES.txt(.*)rocprof-device-0-SQ_INSTS_VALU.txt(.*)rocprof-device-0-VALUInsts.txt(.*)rocprof-device-0-TCC_HIT_sum.txt(.*)rocprof-device-0-TA_TA_BUSY_0.txt(.*)rocprof-device-0-TA_TA_BUSY_11.txt"
-        REWRITE_RUN_FAIL_REGEX "roctracer.txt|OMNITRACE_ABORT_FAIL_REGEX")
+        REWRITE_RUN_FAIL_REGEX "roctracer.txt|ROCPROFSYS_ABORT_FAIL_REGEX")
 endif()
@@ -15,7 +15,7 @@ if(EXISTS /etc/os-release AND NOT IS_DIRECTORY /etc/os-release)
    unset(_OS_RELEASE_RAW)
 endif()

-omnitrace_message(STATUS "OS release: ${_OS_RELEASE}")
+rocprofiler_systems_message(STATUS "OS release: ${_OS_RELEASE}")

 include(ProcessorCount)
 if(NOT DEFINED NUM_PROCS_REAL)
@@ -36,7 +36,7 @@ if(NUM_THREADS GREATER 12)
    set(NUM_THREADS 12)
 endif()

-math(EXPR MAX_CAUSAL_ITERATIONS "(${OMNITRACE_MAX_THREADS} - 1) / 2")
+math(EXPR MAX_CAUSAL_ITERATIONS "(${ROCPROFSYS_MAX_THREADS} - 1) / 2")
 if(MAX_CAUSAL_ITERATIONS GREATER 100)
    set(MAX_CAUSAL_ITERATIONS 100)
 endif()
@@ -46,118 +46,118 @@ set(_test_library_path
 set(_test_openmp_env "OMP_PROC_BIND=spread" "OMP_PLACES=threads" "OMP_NUM_THREADS=2")

 set(_base_environment
-    "OMNITRACE_TRACE=ON" "OMNITRACE_PROFILE=ON" "OMNITRACE_USE_SAMPLING=ON"
-    "OMNITRACE_USE_PROCESS_SAMPLING=ON" "OMNITRACE_TIME_OUTPUT=OFF"
-    "OMNITRACE_FILE_OUTPUT=ON" "${_test_openmp_env}" "${_test_library_path}")
+    "ROCPROFSYS_TRACE=ON" "ROCPROFSYS_PROFILE=ON" "ROCPROFSYS_USE_SAMPLING=ON"
+    "ROCPROFSYS_USE_PROCESS_SAMPLING=ON" "ROCPROFSYS_TIME_OUTPUT=OFF"
+    "ROCPROFSYS_FILE_OUTPUT=ON" "${_test_openmp_env}" "${_test_library_path}")

 set(_flat_environment
-    "OMNITRACE_TRACE=ON"
-    "OMNITRACE_PROFILE=ON"
-    "OMNITRACE_TIME_OUTPUT=OFF"
-    "OMNITRACE_COUT_OUTPUT=ON"
-    "OMNITRACE_FLAT_PROFILE=ON"
-    "OMNITRACE_TIMELINE_PROFILE=OFF"
-    "OMNITRACE_COLLAPSE_PROCESSES=ON"
-    "OMNITRACE_COLLAPSE_THREADS=ON"
-    "OMNITRACE_SAMPLING_FREQ=50"
-    "OMNITRACE_TIMEMORY_COMPONENTS=wall_clock,trip_count"
+    "ROCPROFSYS_TRACE=ON"
+    "ROCPROFSYS_PROFILE=ON"
+    "ROCPROFSYS_TIME_OUTPUT=OFF"
+    "ROCPROFSYS_COUT_OUTPUT=ON"
+    "ROCPROFSYS_FLAT_PROFILE=ON"
+    "ROCPROFSYS_TIMELINE_PROFILE=OFF"
+    "ROCPROFSYS_COLLAPSE_PROCESSES=ON"
+    "ROCPROFSYS_COLLAPSE_THREADS=ON"
+    "ROCPROFSYS_SAMPLING_FREQ=50"
+    "ROCPROFSYS_TIMEMORY_COMPONENTS=wall_clock,trip_count"
    "${_test_openmp_env}"
    "${_test_library_path}")

 set(_lock_environment
-    "OMNITRACE_USE_SAMPLING=ON"
-    "OMNITRACE_USE_PROCESS_SAMPLING=OFF"
-    "OMNITRACE_SAMPLING_FREQ=750"
-    "OMNITRACE_COLLAPSE_THREADS=ON"
-    "OMNITRACE_TRACE_THREAD_LOCKS=ON"
-    "OMNITRACE_TRACE_THREAD_SPIN_LOCKS=ON"
-    "OMNITRACE_TRACE_THREAD_RW_LOCKS=ON"
-    "OMNITRACE_COUT_OUTPUT=ON"
-    "OMNITRACE_TIME_OUTPUT=OFF"
-    "OMNITRACE_TIMELINE_PROFILE=OFF"
-    "OMNITRACE_VERBOSE=2"
+    "ROCPROFSYS_USE_SAMPLING=ON"
+    "ROCPROFSYS_USE_PROCESS_SAMPLING=OFF"
+    "ROCPROFSYS_SAMPLING_FREQ=750"
+    "ROCPROFSYS_COLLAPSE_THREADS=ON"
+    "ROCPROFSYS_TRACE_THREAD_LOCKS=ON"
+    "ROCPROFSYS_TRACE_THREAD_SPIN_LOCKS=ON"
+    "ROCPROFSYS_TRACE_THREAD_RW_LOCKS=ON"
+    "ROCPROFSYS_COUT_OUTPUT=ON"
+    "ROCPROFSYS_TIME_OUTPUT=OFF"
+    "ROCPROFSYS_TIMELINE_PROFILE=OFF"
+    "ROCPROFSYS_VERBOSE=2"
    "${_test_library_path}")

 set(_ompt_environment
-    "OMNITRACE_TRACE=ON"
-    "OMNITRACE_PROFILE=ON"
-    "OMNITRACE_TIME_OUTPUT=OFF"
-    "OMNITRACE_USE_OMPT=ON"
-    "OMNITRACE_TIMEMORY_COMPONENTS=wall_clock,trip_count,peak_rss"
+    "ROCPROFSYS_TRACE=ON"
+    "ROCPROFSYS_PROFILE=ON"
+    "ROCPROFSYS_TIME_OUTPUT=OFF"
+    "ROCPROFSYS_USE_OMPT=ON"
+    "ROCPROFSYS_TIMEMORY_COMPONENTS=wall_clock,trip_count,peak_rss"
    "${_test_openmp_env}"
    "${_test_library_path}")

 set(_perfetto_environment
-    "OMNITRACE_TRACE=ON"
-    "OMNITRACE_PROFILE=OFF"
-    "OMNITRACE_USE_SAMPLING=ON"
-    "OMNITRACE_USE_PROCESS_SAMPLING=ON"
-    "OMNITRACE_TIME_OUTPUT=OFF"
-    "OMNITRACE_PERFETTO_BACKEND=inprocess"
-    "OMNITRACE_PERFETTO_FILL_POLICY=ring_buffer"
+    "ROCPROFSYS_TRACE=ON"
+    "ROCPROFSYS_PROFILE=OFF"
+    "ROCPROFSYS_USE_SAMPLING=ON"
+    "ROCPROFSYS_USE_PROCESS_SAMPLING=ON"
+    "ROCPROFSYS_TIME_OUTPUT=OFF"
+    "ROCPROFSYS_PERFETTO_BACKEND=inprocess"
+    "ROCPROFSYS_PERFETTO_FILL_POLICY=ring_buffer"
    "${_test_openmp_env}"
    "${_test_library_path}")

 set(_timemory_environment
-    "OMNITRACE_TRACE=OFF"
-    "OMNITRACE_PROFILE=ON"
-    "OMNITRACE_USE_SAMPLING=ON"
-    "OMNITRACE_USE_PROCESS_SAMPLING=ON"
-    "OMNITRACE_TIME_OUTPUT=OFF"
-    "OMNITRACE_TIMEMORY_COMPONENTS=wall_clock,trip_count,peak_rss"
+    "ROCPROFSYS_TRACE=OFF"
+    "ROCPROFSYS_PROFILE=ON"
+    "ROCPROFSYS_USE_SAMPLING=ON"
+    "ROCPROFSYS_USE_PROCESS_SAMPLING=ON"
+    "ROCPROFSYS_TIME_OUTPUT=OFF"
+    "ROCPROFSYS_TIMEMORY_COMPONENTS=wall_clock,trip_count,peak_rss"
    "${_test_openmp_env}"
    "${_test_library_path}")

 set(_test_environment ${_base_environment})

 set(_causal_environment
-    "${_test_openmp_env}" "${_test_library_path}" "OMNITRACE_TIME_OUTPUT=OFF"
-    "OMNITRACE_FILE_OUTPUT=ON" "OMNITRACE_CAUSAL_RANDOM_SEED=1342342")
+    "${_test_openmp_env}" "${_test_library_path}" "ROCPROFSYS_TIME_OUTPUT=OFF"
+    "ROCPROFSYS_FILE_OUTPUT=ON" "ROCPROFSYS_CAUSAL_RANDOM_SEED=1342342")

 set(_python_environment
-    "OMNITRACE_TRACE=ON"
-    "OMNITRACE_PROFILE=ON"
-    "OMNITRACE_USE_SAMPLING=OFF"
-    "OMNITRACE_USE_PROCESS_SAMPLING=ON"
-    "OMNITRACE_TIME_OUTPUT=OFF"
-    "OMNITRACE_TREE_OUTPUT=OFF"
-    "OMNITRACE_USE_PID=OFF"
-    "OMNITRACE_TIMEMORY_COMPONENTS=wall_clock,trip_count"
+    "ROCPROFSYS_TRACE=ON"
+    "ROCPROFSYS_PROFILE=ON"
+    "ROCPROFSYS_USE_SAMPLING=OFF"
+    "ROCPROFSYS_USE_PROCESS_SAMPLING=ON"
+    "ROCPROFSYS_TIME_OUTPUT=OFF"
+    "ROCPROFSYS_TREE_OUTPUT=OFF"
+    "ROCPROFSYS_USE_PID=OFF"
+    "ROCPROFSYS_TIMEMORY_COMPONENTS=wall_clock,trip_count"
    "${_test_library_path}"
    "PYTHONPATH=${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}")

 set(_attach_environment
-    "OMNITRACE_TRACE=ON"
-    "OMNITRACE_PROFILE=ON"
-    "OMNITRACE_USE_SAMPLING=OFF"
-    "OMNITRACE_USE_PROCESS_SAMPLING=ON"
-    "OMNITRACE_USE_OMPT=ON"
-    "OMNITRACE_USE_KOKKOSP=ON"
-    "OMNITRACE_TIME_OUTPUT=OFF"
-    "OMNITRACE_USE_PID=OFF"
-    "OMNITRACE_TIMEMORY_COMPONENTS=wall_clock,trip_count"
+    "ROCPROFSYS_TRACE=ON"
+    "ROCPROFSYS_PROFILE=ON"
+    "ROCPROFSYS_USE_SAMPLING=OFF"
+    "ROCPROFSYS_USE_PROCESS_SAMPLING=ON"
+    "ROCPROFSYS_USE_OMPT=ON"
+    "ROCPROFSYS_USE_KOKKOSP=ON"
+    "ROCPROFSYS_TIME_OUTPUT=OFF"
+    "ROCPROFSYS_USE_PID=OFF"
+    "ROCPROFSYS_TIMEMORY_COMPONENTS=wall_clock,trip_count"
    "OMP_NUM_THREADS=${NUM_PROCS_REAL}"
    "${_test_library_path}")

 set(_rccl_environment
-    "OMNITRACE_TRACE=ON"
-    "OMNITRACE_PROFILE=ON"
-    "OMNITRACE_USE_SAMPLING=OFF"
-    "OMNITRACE_USE_PROCESS_SAMPLING=ON"
-    "OMNITRACE_USE_RCCLP=ON"
-    "OMNITRACE_TIME_OUTPUT=OFF"
-    "OMNITRACE_USE_PID=OFF"
+    "ROCPROFSYS_TRACE=ON"
+    "ROCPROFSYS_PROFILE=ON"
+    "ROCPROFSYS_USE_SAMPLING=OFF"
+    "ROCPROFSYS_USE_PROCESS_SAMPLING=ON"
+    "ROCPROFSYS_USE_RCCLP=ON"
+    "ROCPROFSYS_TIME_OUTPUT=OFF"
+    "ROCPROFSYS_USE_PID=OFF"
    "${_test_openmp_env}"
    "${_test_library_path}")

 set(_window_environment
-    "OMNITRACE_TRACE=ON"
-    "OMNITRACE_PROFILE=ON"
-    "OMNITRACE_USE_SAMPLING=OFF"
-    "OMNITRACE_USE_PROCESS_SAMPLING=OFF"
-    "OMNITRACE_TIME_OUTPUT=OFF"
-    "OMNITRACE_FILE_OUTPUT=ON"
-    "OMNITRACE_VERBOSE=2"
+    "ROCPROFSYS_TRACE=ON"
+    "ROCPROFSYS_PROFILE=ON"
+    "ROCPROFSYS_USE_SAMPLING=OFF"
+    "ROCPROFSYS_USE_PROCESS_SAMPLING=OFF"
+    "ROCPROFSYS_TIME_OUTPUT=OFF"
+    "ROCPROFSYS_FILE_OUTPUT=ON"
+    "ROCPROFSYS_VERBOSE=2"
    "${_test_openmp_env}"
    "${_test_library_path}")

@@ -165,11 +165,11 @@ set(_window_environment

 set(MPIEXEC_EXECUTABLE_ARGS)
 option(
-    OMNITRACE_CI_MPI_RUN_AS_ROOT
+    ROCPROFSYS_CI_MPI_RUN_AS_ROOT
    "Enabled --allow-run-as-root in MPI tests with OpenMPI. Enable with care! Should only be in docker containers"
    OFF)
-mark_as_advanced(OMNITRACE_CI_MPI_RUN_AS_ROOT)
-if(OMNITRACE_CI_MPI_RUN_AS_ROOT)
+mark_as_advanced(ROCPROFSYS_CI_MPI_RUN_AS_ROOT)
+if(ROCPROFSYS_CI_MPI_RUN_AS_ROOT)
    execute_process(
        COMMAND ${MPIEXEC_EXECUTABLE} --allow-run-as-root --help
        RESULT_VARIABLE _mpiexec_allow_run_as_root
@@ -184,39 +184,40 @@ execute_process(
    RESULT_VARIABLE _mpiexec_oversubscribe
    OUTPUT_QUIET ERROR_QUIET)

-set(omnitrace_perf_event_paranoid "4")
-set(omnitrace_cap_sys_admin "1")
-set(omnitrace_cap_perfmon "1")
+set(rocprofiler_systems_perf_event_paranoid "4")
+set(rocprofiler_systems_cap_sys_admin "1")
+set(rocprofiler_systems_cap_perfmon "1")

 if(EXISTS "/proc/sys/kernel/perf_event_paranoid")
-    file(STRINGS "/proc/sys/kernel/perf_event_paranoid" omnitrace_perf_event_paranoid
-         LIMIT_COUNT 1)
+    file(STRINGS "/proc/sys/kernel/perf_event_paranoid"
+         rocprofiler_systems_perf_event_paranoid LIMIT_COUNT 1)
 endif()

 execute_process(
    COMMAND ${CMAKE_CXX_COMPILER} -O2 -g -std=c++17
-            ${CMAKE_CURRENT_LIST_DIR}/omnitrace-capchk.cpp -o omnitrace-capchk
+            ${CMAKE_CURRENT_LIST_DIR}/rocprof-sys-capchk.cpp -o rocprof-sys-capchk
    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/bin
    RESULT_VARIABLE _capchk_compile
    OUTPUT_QUIET ERROR_QUIET)

 if(_capchk_compile EQUAL 0)
    execute_process(
-        COMMAND ${PROJECT_BINARY_DIR}/bin/omnitrace-capchk CAP_SYS_ADMIN effective
+        COMMAND ${PROJECT_BINARY_DIR}/bin/rocprof-sys-capchk CAP_SYS_ADMIN effective
        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-        RESULT_VARIABLE omnitrace_cap_sys_admin
+        RESULT_VARIABLE rocprofiler_systems_cap_sys_admin
        OUTPUT_QUIET ERROR_QUIET)

    execute_process(
-        COMMAND ${PROJECT_BINARY_DIR}/bin/omnitrace-capchk CAP_PERFMON effective
+        COMMAND ${PROJECT_BINARY_DIR}/bin/rocprof-sys-capchk CAP_PERFMON effective
        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-        RESULT_VARIABLE omnitrace_cap_perfmon
+        RESULT_VARIABLE rocprofiler_systems_cap_perfmon
        OUTPUT_QUIET ERROR_QUIET)
 endif()

-omnitrace_message(STATUS "perf_event_paranoid: ${omnitrace_perf_event_paranoid}")
-omnitrace_message(STATUS "CAP_SYS_ADMIN: ${omnitrace_cap_sys_admin}")
-omnitrace_message(STATUS "CAP_PERFMON: ${omnitrace_cap_perfmon}")
+rocprofiler_systems_message(
+    STATUS "perf_event_paranoid: ${rocprofiler_systems_perf_event_paranoid}")
+rocprofiler_systems_message(STATUS "CAP_SYS_ADMIN: ${rocprofiler_systems_cap_sys_admin}")
+rocprofiler_systems_message(STATUS "CAP_PERFMON: ${rocprofiler_systems_cap_perfmon}")

 if(_mpiexec_oversubscribe EQUAL 0)
    list(APPEND MPIEXEC_EXECUTABLE_ARGS --oversubscribe)
@@ -225,17 +226,17 @@ endif()
 # -------------------------------------------------------------------------------------- #

 set(_VALID_GPU OFF)
-if(OMNITRACE_USE_HIP AND (NOT DEFINED OMNITRACE_CI_GPU OR OMNITRACE_CI_GPU))
+if(ROCPROFSYS_USE_HIP AND (NOT DEFINED ROCPROFSYS_CI_GPU OR ROCPROFSYS_CI_GPU))
    set(_VALID_GPU ON)
    find_program(
-        OMNITRACE_ROCM_SMI_EXE
+        ROCPROFSYS_ROCM_SMI_EXE
        NAMES rocm-smi
        HINTS ${ROCmVersion_DIR}
        PATHS ${ROCmVersion_DIR}
        PATH_SUFFIXES bin)
-    if(OMNITRACE_ROCM_SMI_EXE)
+    if(ROCPROFSYS_ROCM_SMI_EXE)
        execute_process(
-            COMMAND ${OMNITRACE_ROCM_SMI_EXE}
+            COMMAND ${ROCPROFSYS_ROCM_SMI_EXE}
            OUTPUT_VARIABLE _RSMI_OUT
            ERROR_VARIABLE _RSMI_ERR
            RESULT_VARIABLE _RSMI_RET)
@@ -248,8 +249,8 @@ if(OMNITRACE_USE_HIP AND (NOT DEFINED OMNITRACE_CI_GPU OR OMNITRACE_CI_GPU))
        endif()
    endif()
    if(NOT _VALID_GPU)
-        omnitrace_message(AUTHOR_WARNING
-                          "rocm-smi did not successfully run. Disabling GPU tests...")
+        rocprofiler_systems_message(
+            AUTHOR_WARNING "rocm-smi did not successfully run. Disabling GPU tests...")
    endif()
 endif()

@@ -260,68 +261,68 @@ endif()

 # -------------------------------------------------------------------------------------- #

-macro(OMNITRACE_CHECK_PASS_FAIL_REGEX NAME PASS FAIL)
+macro(ROCPROFILER_SYSTEMS_CHECK_PASS_FAIL_REGEX NAME PASS FAIL)
    if(NOT "${${PASS}}" STREQUAL ""
       AND NOT "${${FAIL}}" STREQUAL ""
-       AND NOT "${${FAIL}}" MATCHES "\\|OMNITRACE_ABORT_FAIL_REGEX"
-       AND NOT "${${FAIL}}" MATCHES "${OMNITRACE_ABORT_FAIL_REGEX}")
-        omnitrace_message(
+       AND NOT "${${FAIL}}" MATCHES "\\|ROCPROFSYS_ABORT_FAIL_REGEX"
+       AND NOT "${${FAIL}}" MATCHES "${ROCPROFSYS_ABORT_FAIL_REGEX}")
+        rocprofiler_systems_message(
            FATAL_ERROR
-            "${NAME} has set pass and fail regexes but fail regex does not include '|OMNITRACE_ABORT_FAIL_REGEX'"
+            "${NAME} has set pass and fail regexes but fail regex does not include '|ROCPROFSYS_ABORT_FAIL_REGEX'"
            )
    endif()

    if("${${FAIL}}" STREQUAL "")
-        set(${FAIL} "(${OMNITRACE_ABORT_FAIL_REGEX})")
+        set(${FAIL} "(${ROCPROFSYS_ABORT_FAIL_REGEX})")
    else()
-        string(REPLACE "|OMNITRACE_ABORT_FAIL_REGEX" "|${OMNITRACE_ABORT_FAIL_REGEX}"
+        string(REPLACE "|ROCPROFSYS_ABORT_FAIL_REGEX" "|${ROCPROFSYS_ABORT_FAIL_REGEX}"
                       ${FAIL} "${${FAIL}}")
    endif()
 endmacro()

 # -------------------------------------------------------------------------------------- #

-function(OMNITRACE_WRITE_TEST_CONFIG _FILE _ENV)
+function(ROCPROFILER_SYSTEMS_WRITE_TEST_CONFIG _FILE _ENV)
    set(_ENV_ONLY
-        "OMNITRACE_(CI|CI_TIMEOUT|MODE|USE_MPIP|DEBUG_[A-Z_]+|FORCE_ROCPROFILER_INIT|DEFAULT_MIN_INSTRUCTIONS|MONOCHROME|VERBOSE)="
+        "ROCPROFSYS_(CI|CI_TIMEOUT|MODE|USE_MPIP|DEBUG_[A-Z_]+|FORCE_ROCPROFILER_INIT|DEFAULT_MIN_INSTRUCTIONS|MONOCHROME|VERBOSE)="
        )
    set(_FILE_CONTENTS)
    set(_ENV_CONTENTS)

    set(_DEBUG_SETTINGS ON)
    foreach(_VAL ${${_ENV}})
-        if("${_VAL}" MATCHES "^OMNITRACE_DEBUG_SETTINGS=")
+        if("${_VAL}" MATCHES "^ROCPROFSYS_DEBUG_SETTINGS=")
            set(_DEBUG_SETTINGS OFF)
        endif()
-        if("${_VAL}" MATCHES "^OMNITRACE_" AND NOT "${_VAL}" MATCHES "${_ENV_ONLY}")
+        if("${_VAL}" MATCHES "^ROCPROFSYS_" AND NOT "${_VAL}" MATCHES "${_ENV_ONLY}")
            set(_FILE_CONTENTS "${_FILE_CONTENTS}${_VAL}\n")
        else()
            list(APPEND _ENV_CONTENTS "${_VAL}")
        endif()
    endforeach()

-    set(_CONFIG_FILE ${PROJECT_BINARY_DIR}/omnitrace-tests-config/${_FILE})
+    set(_CONFIG_FILE ${PROJECT_BINARY_DIR}/rocprof-sys-tests-config/${_FILE})
    file(
        WRITE ${_CONFIG_FILE}
        "# auto-generated by cmake

 # default values
-OMNITRACE_CI                     = ON
-OMNITRACE_VERBOSE                = 1
-OMNITRACE_DL_VERBOSE             = 1
-OMNITRACE_SAMPLING_FREQ          = 300
-OMNITRACE_SAMPLING_DELAY         = 0.05
-OMNITRACE_SAMPLING_CPUS          = 0-${NUM_SAMPLING_PROCS}
-OMNITRACE_SAMPLING_GPUS          = $env:HIP_VISIBLE_DEVICES
-OMNITRACE_ROCTRACER_HSA_API      = ON
-OMNITRACE_ROCTRACER_HSA_ACTIVITY = ON
+ROCPROFSYS_CI                     = ON
+ROCPROFSYS_VERBOSE                = 1
+ROCPROFSYS_DL_VERBOSE             = 1
+ROCPROFSYS_SAMPLING_FREQ          = 300
+ROCPROFSYS_SAMPLING_DELAY         = 0.05
+ROCPROFSYS_SAMPLING_CPUS          = 0-${NUM_SAMPLING_PROCS}
+ROCPROFSYS_SAMPLING_GPUS          = $env:HIP_VISIBLE_DEVICES
+ROCPROFSYS_ROCTRACER_HSA_API      = ON
+ROCPROFSYS_ROCTRACER_HSA_ACTIVITY = ON

 # test-specific values
 ${_FILE_CONTENTS}
 ")
-    list(APPEND _ENV_CONTENTS "OMNITRACE_CONFIG_FILE=${_CONFIG_FILE}")
+    list(APPEND _ENV_CONTENTS "ROCPROFSYS_CONFIG_FILE=${_CONFIG_FILE}")
    if(_DEBUG_SETTINGS)
-        list(APPEND _ENV_CONTENTS "OMNITRACE_DEBUG_SETTINGS=1")
+        list(APPEND _ENV_CONTENTS "ROCPROFSYS_DEBUG_SETTINGS=1")
    endif()
    set(${_ENV}
        "${_ENV_CONTENTS}"
@@ -330,8 +331,8 @@ endfunction()

 # -------------------------------------------------------------------------------------- #
 # extends the timeout when sanitizers are used due to slowdown
-function(OMNITRACE_ADJUST_TIMEOUT_FOR_SANITIZER _VAR)
-    if(OMNITRACE_USE_SANITIZER)
+function(ROCPROFILER_SYSTEMS_ADJUST_TIMEOUT_FOR_SANITIZER _VAR)
+    if(ROCPROFSYS_USE_SANITIZER)
        math(EXPR _timeout_v "2 * ${${_VAR}}")
        set(${_VAR}
            "${_timeout_v}"
@@ -341,20 +342,20 @@ endfunction()

 # -------------------------------------------------------------------------------------- #
 # extends the timeout when sanitizers are used due to slowdown
-macro(OMNITRACE_PATCH_SANITIZER_ENVIRONMENT _VAR)
-    if(OMNITRACE_USE_SANITIZER)
-        if(OMNITRACE_USE_SANITIZER)
-            if(OMNITRACE_SANITIZER_TYPE MATCHES "address")
+macro(ROCPROFILER_SYSTEMS_PATCH_SANITIZER_ENVIRONMENT _VAR)
+    if(ROCPROFSYS_USE_SANITIZER)
+        if(ROCPROFSYS_USE_SANITIZER)
+            if(ROCPROFSYS_SANITIZER_TYPE MATCHES "address")
                if(NOT ASAN_LIBRARY)
-                    omnitrace_message(
+                    rocprofiler_systems_message(
                        FATAL_ERROR
                        "Please define the realpath to the address sanitizer library in variable ASAN_LIBRARY"
                        )
                endif()
                list(APPEND ${_VAR} "LD_PRELOAD=${ASAN_LIBRARY}")
-            elseif(OMNITRACE_SANITIZER_TYPE MATCHES "thread")
+            elseif(ROCPROFSYS_SANITIZER_TYPE MATCHES "thread")
                if(NOT TSAN_LIBRARY)
-                    omnitrace_message(
+                    rocprofiler_systems_message(
                        FATAL_ERROR
                        "Please define the realpath to the thread sanitizer library in variable TSAN_LIBRARY"
                        )
@@ -367,7 +368,7 @@ endmacro()

 # -------------------------------------------------------------------------------------- #

-function(OMNITRACE_ADD_TEST)
+function(ROCPROFILER_SYSTEMS_ADD_TEST)
    foreach(_PREFIX SAMPLING RUNTIME REWRITE REWRITE_RUN BASELINE)
        foreach(_TYPE PASS FAIL SKIP)
            list(APPEND _REGEX_OPTS "${_PREFIX}_${_TYPE}_REGEX")
@@ -383,13 +384,13 @@ function(OMNITRACE_ADD_TEST)

    foreach(_PREFIX SAMPLING RUNTIME REWRITE REWRITE_RUN BASELINE)
        if("${${_PREFIX}_FAIL_REGEX}" STREQUAL "")
-            set(${_PREFIX}_FAIL_REGEX "(${OMNITRACE_ABORT_FAIL_REGEX})")
+            set(${_PREFIX}_FAIL_REGEX "(${ROCPROFSYS_ABORT_FAIL_REGEX})")
        endif()
    endforeach()

    if(TEST_GPU AND NOT _VALID_GPU)
-        omnitrace_message(STATUS
-                          "${TEST_NAME} requires a GPU and no valid GPUs were found")
+        rocprofiler_systems_message(
+            STATUS "${TEST_NAME} requires a GPU and no valid GPUs were found")
        return()
    endif()

@@ -424,31 +425,31 @@ function(OMNITRACE_ADD_TEST)
        set(TEST_ENVIRONMENT "${_test_environment}")
    endif()

-    list(APPEND TEST_ENVIRONMENT "OMNITRACE_CI=ON")
+    list(APPEND TEST_ENVIRONMENT "ROCPROFSYS_CI=ON")

    if(TEST_GPU)
        list(APPEND TEST_LABELS "gpu")

-        if(NOT "OMNITRACE_USE_ROCTRACER=OFF" IN_LIST TEST_ENVIRONMENT)
+        if(NOT "ROCPROFSYS_USE_ROCTRACER=OFF" IN_LIST TEST_ENVIRONMENT)
            list(APPEND TEST_LABELS "roctracer")
        endif()

-        if(NOT "OMNITRACE_USE_ROCM_SMI=OFF" IN_LIST TEST_ENVIRONMENT)
+        if(NOT "ROCPROFSYS_USE_ROCM_SMI=OFF" IN_LIST TEST_ENVIRONMENT)
            list(APPEND TEST_LABELS "rocm-smi")
        endif()
    endif()

-    if("OMNITRACE_USE_ROCTRACER=ON" IN_LIST TEST_ENVIRONMENT AND NOT "roctracer" IN_LIST
-                                                                 TEST_ENVIRONMENT)
+    if("ROCPROFSYS_USE_ROCTRACER=ON" IN_LIST TEST_ENVIRONMENT AND NOT "roctracer" IN_LIST
+                                                                  TEST_ENVIRONMENT)
        list(APPEND TEST_LABELS "roctracer")
    endif()

-    if("OMNITRACE_USE_ROCM_SMI=ON" IN_LIST TEST_ENVIRONMENT AND NOT "rocm-smi" IN_LIST
-                                                                TEST_ENVIRONMENT)
+    if("ROCPROFSYS_USE_ROCM_SMI=ON" IN_LIST TEST_ENVIRONMENT AND NOT "rocm-smi" IN_LIST
+                                                                 TEST_ENVIRONMENT)
        list(APPEND TEST_LABELS "rocm-smi")
    endif()

-    if("OMNITRACE_USE_ROCPROFILER=ON" IN_LIST TEST_ENVIRONMENT
+    if("ROCPROFSYS_USE_ROCPROFILER=ON" IN_LIST TEST_ENVIRONMENT
       AND NOT "rocprofiler" IN_LIST TEST_ENVIRONMENT)
        list(APPEND TEST_LABELS "rocprofiler")
    endif()
@@ -467,10 +468,10 @@ function(OMNITRACE_ADD_TEST)
                                   ${MPIEXEC_NUMPROC_FLAG} 1)
            endif()
        else()
-            list(APPEND TEST_ENVIRONMENT "OMNITRACE_USE_PID=OFF")
+            list(APPEND TEST_ENVIRONMENT "ROCPROFSYS_USE_PID=OFF")
        endif()

-        if(NOT TEST_SKIP_BASELINE AND NOT OMNITRACE_USE_SANITIZER)
+        if(NOT TEST_SKIP_BASELINE AND NOT ROCPROFSYS_USE_SANITIZER)
            add_test(
                NAME ${TEST_NAME}-baseline
                COMMAND ${COMMAND_PREFIX} $<TARGET_FILE:${TEST_TARGET}> ${TEST_RUN_ARGS}
@@ -481,8 +482,8 @@ function(OMNITRACE_ADD_TEST)
            add_test(
                NAME ${TEST_NAME}-sampling
                COMMAND
-                    ${COMMAND_PREFIX} $<TARGET_FILE:omnitrace-sample> ${TEST_SAMPLE_ARGS}
-                    -- $<TARGET_FILE:${TEST_TARGET}> ${TEST_RUN_ARGS}
+                    ${COMMAND_PREFIX} $<TARGET_FILE:rocprofiler-systems-sample>
+                    ${TEST_SAMPLE_ARGS} -- $<TARGET_FILE:${TEST_TARGET}> ${TEST_RUN_ARGS}
                WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
        endif()

@@ -490,7 +491,7 @@ function(OMNITRACE_ADD_TEST)
            add_test(
                NAME ${TEST_NAME}-binary-rewrite
                COMMAND
-                    $<TARGET_FILE:omnitrace-instrument> -o
+                    $<TARGET_FILE:rocprofiler-systems-instrument> -o
                    $<TARGET_FILE_DIR:${TEST_TARGET}>/${TEST_NAME}.inst
                    ${TEST_REWRITE_ARGS} -- $<TARGET_FILE:${TEST_TARGET}>
                WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
@@ -498,16 +499,16 @@ function(OMNITRACE_ADD_TEST)
            add_test(
                NAME ${TEST_NAME}-binary-rewrite-run
                COMMAND
-                    ${COMMAND_PREFIX} $<TARGET_FILE:omnitrace-run> --
+                    ${COMMAND_PREFIX} $<TARGET_FILE:rocprofiler-systems-run> --
                    $<TARGET_FILE_DIR:${TEST_TARGET}>/${TEST_NAME}.inst ${TEST_RUN_ARGS}
                WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
        endif()

-        if(NOT TEST_SKIP_RUNTIME AND NOT OMNITRACE_USE_SANITIZER)
+        if(NOT TEST_SKIP_RUNTIME AND NOT ROCPROFSYS_USE_SANITIZER)
            add_test(
                NAME ${TEST_NAME}-runtime-instrument
-                COMMAND $<TARGET_FILE:omnitrace-instrument> ${TEST_RUNTIME_ARGS} --
-                        $<TARGET_FILE:${TEST_TARGET}> ${TEST_RUN_ARGS}
+                COMMAND $<TARGET_FILE:rocprofiler-systems-instrument> ${TEST_RUNTIME_ARGS}
+                        -- $<TARGET_FILE:${TEST_TARGET}> ${TEST_RUN_ARGS}
                WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
        endif()

@@ -529,9 +530,9 @@ function(OMNITRACE_ADD_TEST)
            endif()

            set(_environ
-                "OMNITRACE_DEFAULT_MIN_INSTRUCTIONS=64" "${TEST_ENVIRONMENT}"
-                "OMNITRACE_OUTPUT_PATH=${PROJECT_BINARY_DIR}/omnitrace-tests-output"
-                "OMNITRACE_OUTPUT_PREFIX=${_prefix}")
+                "ROCPROFSYS_DEFAULT_MIN_INSTRUCTIONS=64" "${TEST_ENVIRONMENT}"
+                "ROCPROFSYS_OUTPUT_PATH=${PROJECT_BINARY_DIR}/rocprof-sys-tests-output"
+                "ROCPROFSYS_OUTPUT_PREFIX=${_prefix}")

            set(_timeout ${TEST_REWRITE_TIMEOUT})
            if("${_TEST}" MATCHES "sampling")
@@ -563,10 +564,10 @@ function(OMNITRACE_ADD_TEST)
            endif()

            if("${_TEST}" MATCHES "binary-rewrite-run|runtime-instrument|sampling")
-                omnitrace_patch_sanitizer_environment(_environ)
+                rocprofiler_systems_patch_sanitizer_environment(_environ)
            endif()

-            omnitrace_adjust_timeout_for_sanitizer(_timeout)
+            rocprofiler_systems_adjust_timeout_for_sanitizer(_timeout)

            foreach(_TYPE PASS FAIL SKIP)
                if(_REGEX_VAR)
@@ -576,12 +577,12 @@ function(OMNITRACE_ADD_TEST)
                endif()
            endforeach()

-            list(APPEND _environ "OMNITRACE_CI_TIMEOUT=${_timeout}")
+            list(APPEND _environ "ROCPROFSYS_CI_TIMEOUT=${_timeout}")

-            omnitrace_check_pass_fail_regex("${TEST_NAME}-${_TEST}" "${_PASS_REGEX}"
-                                            "${_FAIL_REGEX}")
+            rocprofiler_systems_check_pass_fail_regex("${TEST_NAME}-${_TEST}"
+                                                      "${_PASS_REGEX}" "${_FAIL_REGEX}")
            if(TEST ${TEST_NAME}-${_TEST})
-                omnitrace_write_test_config(${TEST_NAME}-${_TEST}.cfg _environ)
+                rocprofiler_systems_write_test_config(${TEST_NAME}-${_TEST}.cfg _environ)
                set_tests_properties(
                    ${TEST_NAME}-${_TEST}
                    PROPERTIES ENVIRONMENT
@@ -604,7 +605,7 @@ endfunction()

 # -------------------------------------------------------------------------------------- #

-function(OMNITRACE_ADD_CAUSAL_TEST)
+function(ROCPROFILER_SYSTEMS_ADD_CAUSAL_TEST)
    foreach(_PREFIX CAUSAL CAUSAL_VALIDATE)
        foreach(_TYPE PASS FAIL SKIP)
            list(APPEND _REGEX_OPTS "${_PREFIX}_${_TYPE}_REGEX")
@@ -620,7 +621,8 @@ function(OMNITRACE_ADD_CAUSAL_TEST)
        ${ARGN})

    if(NOT DEFINED TEST_CAUSAL_MODE)
-        omnitrace_message(FATAL_ERROR "${TEST_NAME} :: CAUSAL_MODE must be defined")
+        rocprofiler_systems_message(FATAL_ERROR
+                                    "${TEST_NAME} :: CAUSAL_MODE must be defined")
    endif()

    if(NOT TEST_CAUSAL_TIMEOUT)
@@ -632,12 +634,12 @@ function(OMNITRACE_ADD_CAUSAL_TEST)
    endif()

    if("${TEST_CAUSAL_FAIL_REGEX}" STREQUAL "")
-        set(TEST_CAUSAL_FAIL_REGEX "(${OMNITRACE_ABORT_FAIL_REGEX})")
+        set(TEST_CAUSAL_FAIL_REGEX "(${ROCPROFSYS_ABORT_FAIL_REGEX})")
    endif()

    if(TARGET ${TEST_TARGET})
-        set(COMMAND_PREFIX $<TARGET_FILE:omnitrace-causal> --reset -m ${TEST_CAUSAL_MODE}
-                           ${TEST_CAUSAL_ARGS} --)
+        set(COMMAND_PREFIX $<TARGET_FILE:rocprofiler-systems-causal> --reset -m
+                           ${TEST_CAUSAL_MODE} ${TEST_CAUSAL_ARGS} --)

        if(NOT TEST_SKIP_BASELINE)
            add_test(
@@ -652,7 +654,7 @@ function(OMNITRACE_ADD_CAUSAL_TEST)
            WORKING_DIRECTORY ${PROJECT_BINARY_DIR})

        if(NOT "${TEST_CAUSAL_VALIDATE_ARGS}" STREQUAL "")
-            if("$ENV{OMNITRACE_CI}" MATCHES "ON|on|1|true|TRUE"
+            if("$ENV{ROCPROFSYS_CI}" MATCHES "ON|on|1|true|TRUE"
               OR "$ENV{CI}" MATCHES "true"
               OR NOT "$ENV{GITHUB_RUN_ID}" STREQUAL "")
                set(_VALIDATE_EXTRA "--ci")
@@ -697,19 +699,19 @@ function(OMNITRACE_ADD_CAUSAL_TEST)

            set(_environ
                "${_causal_environment}"
-                "OMNITRACE_OUTPUT_PATH=${PROJECT_BINARY_DIR}/omnitrace-tests-output"
-                "OMNITRACE_OUTPUT_PREFIX=${_prefix}"
-                "OMNITRACE_CI=ON"
-                "OMNITRACE_USE_PID=OFF"
-                "OMNITRACE_THREAD_POOL_SIZE=0"
-                "OMNITRACE_VERBOSE=1"
-                "OMNITRACE_DL_VERBOSE=0"
-                "OMNITRACE_DEBUG_SETTINGS=0"
+                "ROCPROFSYS_OUTPUT_PATH=${PROJECT_BINARY_DIR}/rocprof-sys-tests-output"
+                "ROCPROFSYS_OUTPUT_PREFIX=${_prefix}"
+                "ROCPROFSYS_CI=ON"
+                "ROCPROFSYS_USE_PID=OFF"
+                "ROCPROFSYS_THREAD_POOL_SIZE=0"
+                "ROCPROFSYS_VERBOSE=1"
+                "ROCPROFSYS_DL_VERBOSE=0"
+                "ROCPROFSYS_DEBUG_SETTINGS=0"
                "${TEST_ENVIRONMENT}")

            set(_timeout ${TEST_CAUSAL_TIMEOUT})

-            omnitrace_adjust_timeout_for_sanitizer(_timeout)
+            rocprofiler_systems_adjust_timeout_for_sanitizer(_timeout)

            if("${_TEST}" MATCHES "validate-causal")
                set(_timeout ${TEST_CAUSAL_VALIDATE_TIMEOUT})
@@ -733,9 +735,10 @@ function(OMNITRACE_ADD_CAUSAL_TEST)
                endif()
            endforeach()

-            list(APPEND _environ "OMNITRACE_CI_TIMEOUT=${_timeout}")
-            omnitrace_write_test_config(${_NAME}.cfg _environ)
-            omnitrace_check_pass_fail_regex("${_NAME}" "${_PASS_REGEX}" "${_FAIL_REGEX}")
+            list(APPEND _environ "ROCPROFSYS_CI_TIMEOUT=${_timeout}")
+            rocprofiler_systems_write_test_config(${_NAME}.cfg _environ)
+            rocprofiler_systems_check_pass_fail_regex("${_NAME}" "${_PASS_REGEX}"
+                                                      "${_FAIL_REGEX}")
            set_tests_properties(
                ${_NAME}
                PROPERTIES ENVIRONMENT
@@ -757,8 +760,8 @@ endfunction()

 # -------------------------------------------------------------------------------------- #

-function(OMNITRACE_ADD_PYTHON_TEST)
-    if(NOT OMNITRACE_USE_PYTHON)
+function(ROCPROFILER_SYSTEMS_ADD_PYTHON_TEST)
+    if(NOT ROCPROFSYS_USE_PYTHON)
        return()
    endif()

@@ -774,7 +777,7 @@ function(OMNITRACE_ADD_PYTHON_TEST)
        set(TEST_TIMEOUT 120)
    endif()

-    omnitrace_adjust_timeout_for_sanitizer(TEST_TIMEOUT)
+    rocprofiler_systems_adjust_timeout_for_sanitizer(TEST_TIMEOUT)

    set(PYTHON_EXECUTABLE "${TEST_PYTHON_EXECUTABLE}")

@@ -785,8 +788,8 @@ function(OMNITRACE_ADD_PYTHON_TEST)
    list(APPEND TEST_LABELS "python" "python-${TEST_PYTHON_VERSION}")

    if(NOT TEST_COMMAND)
-        list(APPEND TEST_ENVIRONMENT "OMNITRACE_CI=ON"
-             "OMNITRACE_OUTPUT_PATH=${PROJECT_BINARY_DIR}/omnitrace-tests-output")
+        list(APPEND TEST_ENVIRONMENT "ROCPROFSYS_CI=ON"
+             "ROCPROFSYS_OUTPUT_PATH=${PROJECT_BINARY_DIR}/rocprof-sys-tests-output")
        get_filename_component(_TEST_FILE "${TEST_FILE}" NAME)
        set(_TEST_FILE
            ${PROJECT_BINARY_DIR}/python/tests/${TEST_PYTHON_VERSION}/${_TEST_FILE})
@@ -799,12 +802,12 @@ function(OMNITRACE_ADD_PYTHON_TEST)
        else()
            add_test(
                NAME ${TEST_NAME}-${TEST_PYTHON_VERSION}
-                COMMAND ${TEST_PYTHON_EXECUTABLE} -m omnitrace ${TEST_PROFILE_ARGS} --
+                COMMAND ${TEST_PYTHON_EXECUTABLE} -m rocprofsys ${TEST_PROFILE_ARGS} --
                        ${_TEST_FILE} ${TEST_RUN_ARGS}
                WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
            add_test(
                NAME ${TEST_NAME}-${TEST_PYTHON_VERSION}-annotated
-                COMMAND ${TEST_PYTHON_EXECUTABLE} -m omnitrace ${TEST_PROFILE_ARGS}
+                COMMAND ${TEST_PYTHON_EXECUTABLE} -m rocprofsys ${TEST_PROFILE_ARGS}
                        --annotate-trace -- ${_TEST_FILE} ${TEST_RUN_ARGS}
                WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
        endif()
@@ -827,8 +830,8 @@ function(OMNITRACE_ADD_PYTHON_TEST)
                       "${_TEST}")
        set(_TEST_ENV
            "${TEST_ENVIRONMENT}"
-            "OMNITRACE_OUTPUT_PREFIX=${_TEST_DIR}/${TEST_PYTHON_VERSION}/"
-            "OMNITRACE_CI_TIMEOUT=${TEST_TIMEOUT}")
+            "ROCPROFSYS_OUTPUT_PREFIX=${_TEST_DIR}/${TEST_PYTHON_VERSION}/"
+            "ROCPROFSYS_CI_TIMEOUT=${TEST_TIMEOUT}")

        set(_TEST_PROPERTIES "${TEST_PROPERTIES}")
        # assign pass variable to pass regex
@@ -836,7 +839,8 @@ function(OMNITRACE_ADD_PYTHON_TEST)
        # assign fail variable to fail regex
        set(_FAIL_REGEX TEST_FAIL_REGEX)

-        omnitrace_check_pass_fail_regex("${_TEST}" "${_PASS_REGEX}" "${_FAIL_REGEX}")
+        rocprofiler_systems_check_pass_fail_regex("${_TEST}" "${_PASS_REGEX}"
+                                                  "${_FAIL_REGEX}")
        set_tests_properties(
            ${_TEST}
            PROPERTIES ENVIRONMENT
@@ -865,43 +869,43 @@ endfunction()
 #
 # -------------------------------------------------------------------------------------- #

-if(NOT OMNITRACE_USE_PYTHON)
+if(NOT ROCPROFSYS_USE_PYTHON)
    find_package(Python3 QUIET COMPONENTS Interpreter)

    if(Python3_FOUND)
-        set(OMNITRACE_VALIDATION_PYTHON ${Python3_EXECUTABLE})
+        set(ROCPROFSYS_VALIDATION_PYTHON ${Python3_EXECUTABLE})
        execute_process(COMMAND ${Python3_EXECUTABLE} -c "import perfetto"
-                        RESULT_VARIABLE OMNITRACE_VALIDATION_PYTHON_PERFETTO)
+                        RESULT_VARIABLE ROCPROFSYS_VALIDATION_PYTHON_PERFETTO)

-        if(NOT OMNITRACE_VALIDATION_PYTHON_PERFETTO EQUAL 0)
-            omnitrace_message(AUTHOR_WARNING
-                              "Python3 found but perfetto support is disabled")
+        if(NOT ROCPROFSYS_VALIDATION_PYTHON_PERFETTO EQUAL 0)
+            rocprofiler_systems_message(AUTHOR_WARNING
+                                        "Python3 found but perfetto support is disabled")
        endif()
    endif()
 else()
    set(_INDEX 0)
-    foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS})
-        if(NOT OMNITRACE_USE_PYTHON)
+    foreach(_VERSION ${ROCPROFSYS_PYTHON_VERSIONS})
+        if(NOT ROCPROFSYS_USE_PYTHON)
            continue()
        endif()

-        list(GET OMNITRACE_PYTHON_ROOT_DIRS ${_INDEX} _PYTHON_ROOT_DIR)
+        list(GET ROCPROFSYS_PYTHON_ROOT_DIRS ${_INDEX} _PYTHON_ROOT_DIR)

-        omnitrace_find_python(
+        rocprofiler_systems_find_python(
            _PYTHON
            ROOT_DIR "${_PYTHON_ROOT_DIR}"
            COMPONENTS Interpreter)

        if(_PYTHON_EXECUTABLE)
-            set(OMNITRACE_VALIDATION_PYTHON ${_PYTHON_EXECUTABLE})
+            set(ROCPROFSYS_VALIDATION_PYTHON ${_PYTHON_EXECUTABLE})
            execute_process(COMMAND ${_PYTHON_EXECUTABLE} -c "import perfetto"
-                            RESULT_VARIABLE OMNITRACE_VALIDATION_PYTHON_PERFETTO)
+                            RESULT_VARIABLE ROCPROFSYS_VALIDATION_PYTHON_PERFETTO)

            # prefer Python3 with perfetto support
-            if(OMNITRACE_VALIDATION_PYTHON_PERFETTO EQUAL 0)
+            if(ROCPROFSYS_VALIDATION_PYTHON_PERFETTO EQUAL 0)
                break()
            else()
-                omnitrace_message(
+                rocprofiler_systems_message(
                    AUTHOR_WARNING
                    "${_PYTHON_EXECUTABLE} found but perfetto support is disabled")
            endif()
@@ -911,9 +915,9 @@ else()
    endforeach()
 endif()

-if(NOT OMNITRACE_VALIDATION_PYTHON)
-    omnitrace_message(AUTHOR_WARNING
-                      "Python3 interpreter not found. Validation tests will be disabled")
+if(NOT ROCPROFSYS_VALIDATION_PYTHON)
+    rocprofiler_systems_message(
+        AUTHOR_WARNING "Python3 interpreter not found. Validation tests will be disabled")
 endif()

 # -------------------------------------------------------------------------------------- #
@@ -922,9 +926,9 @@ endif()
 #
 # -------------------------------------------------------------------------------------- #

-function(OMNITRACE_ADD_VALIDATION_TEST)
+function(ROCPROFILER_SYSTEMS_ADD_VALIDATION_TEST)

-    if(NOT OMNITRACE_VALIDATION_PYTHON)
+    if(NOT ROCPROFSYS_VALIDATION_PYTHON)
        return()
    endif()

@@ -936,7 +940,7 @@ function(OMNITRACE_ADD_VALIDATION_TEST)
        ${ARGN})

    if(NOT TEST "${TEST_NAME}")
-        omnitrace_message(
+        rocprofiler_systems_message(
            AUTHOR_WARNING
            "No validation test(s) for ${TEST_NAME} because test does not exist")
        return()
@@ -946,9 +950,9 @@ function(OMNITRACE_ADD_VALIDATION_TEST)
        set(TEST_TIMEOUT 30)
    endif()

-    omnitrace_adjust_timeout_for_sanitizer(TEST_TIMEOUT)
+    rocprofiler_systems_adjust_timeout_for_sanitizer(TEST_TIMEOUT)

-    set(PYTHON_EXECUTABLE "${OMNITRACE_VALIDATION_PYTHON}")
+    set(PYTHON_EXECUTABLE "${ROCPROFSYS_VALIDATION_PYTHON}")

    list(APPEND TEST_LABELS "validate")
    foreach(_DEP ${TEST_DEPENDS})
@@ -962,7 +966,7 @@ function(OMNITRACE_ADD_VALIDATION_TEST)

    if(NOT TEST_PASS_REGEX)
        set(TEST_PASS_REGEX
-            "omnitrace-tests-output/${TEST_NAME}/(${TEST_TIMEMORY_FILE}|${TEST_PERFETTO_FILE}) validated"
+            "rocprof-sys-tests-output/${TEST_NAME}/(${TEST_TIMEMORY_FILE}|${TEST_PERFETTO_FILE}) validated"
            )
    endif()

@@ -970,26 +974,26 @@ function(OMNITRACE_ADD_VALIDATION_TEST)
        add_test(
            NAME validate-${TEST_NAME}-timemory
            COMMAND
-                ${OMNITRACE_VALIDATION_PYTHON}
+                ${ROCPROFSYS_VALIDATION_PYTHON}
                ${CMAKE_CURRENT_LIST_DIR}/validate-timemory-json.py -m
                "${TEST_TIMEMORY_METRIC}" ${TEST_ARGS} -i
-                ${PROJECT_BINARY_DIR}/omnitrace-tests-output/${TEST_NAME}/${TEST_TIMEMORY_FILE}
+                ${PROJECT_BINARY_DIR}/rocprof-sys-tests-output/${TEST_NAME}/${TEST_TIMEMORY_FILE}
            WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
    endif()

-    if(OMNITRACE_VALIDATION_PYTHON_PERFETTO EQUAL 0 AND TEST_PERFETTO_FILE)
+    if(ROCPROFSYS_VALIDATION_PYTHON_PERFETTO EQUAL 0 AND TEST_PERFETTO_FILE)
        add_test(
            NAME validate-${TEST_NAME}-perfetto
            COMMAND
-                ${OMNITRACE_VALIDATION_PYTHON}
+                ${ROCPROFSYS_VALIDATION_PYTHON}
                ${CMAKE_CURRENT_LIST_DIR}/validate-perfetto-proto.py -m
                "${TEST_PERFETTO_METRIC}" ${TEST_ARGS} -i
-                ${PROJECT_BINARY_DIR}/omnitrace-tests-output/${TEST_NAME}/${TEST_PERFETTO_FILE}
+                ${PROJECT_BINARY_DIR}/rocprof-sys-tests-output/${TEST_NAME}/${TEST_PERFETTO_FILE}
                -t /opt/trace_processor/bin/trace_processor_shell
            WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
    endif()

-    list(APPEND TEST_ENVIRONMENT "OMNITRACE_CI_TIMEOUT=${TEST_TIMEOUT}")
+    list(APPEND TEST_ENVIRONMENT "ROCPROFSYS_CI_TIMEOUT=${TEST_TIMEOUT}")

    foreach(_TEST validate-${TEST_NAME}-timemory validate-${TEST_NAME}-perfetto)

@@ -997,7 +1001,8 @@ function(OMNITRACE_ADD_VALIDATION_TEST)
            continue()
        endif()

-        omnitrace_check_pass_fail_regex("${_TEST}" "TEST_PASS_REGEX" "TEST_FAIL_REGEX")
+        rocprofiler_systems_check_pass_fail_regex("${_TEST}" "TEST_PASS_REGEX"
+                                                  "TEST_FAIL_REGEX")
        set_tests_properties(
            ${_TEST}
            PROPERTIES ENVIRONMENT
@@ -4,27 +4,23 @@
 #
 # -------------------------------------------------------------------------------------- #

-if(_OS_RELEASE STREQUAL "ubuntu-18.04")
-    set(_TRACE_WINDOW_SKIP SKIP_RUNTIME)
-endif()
-
-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_BASELINE SKIP_SAMPLING ${_TRACE_WINDOW_SKIP}
    NAME trace-time-window
    TARGET trace-time-window
    REWRITE_ARGS -e -v 2 --caller-include inner -i 4096
    RUNTIME_ARGS -e -v 1 --caller-include inner -i 4096
    LABELS "time-window"
-    ENVIRONMENT "${_window_environment};OMNITRACE_TRACE_DURATION=1.25")
+    ENVIRONMENT "${_window_environment};ROCPROFSYS_TRACE_DURATION=1.25")

-omnitrace_add_validation_test(
+rocprofiler_systems_add_validation_test(
    NAME trace-time-window-binary-rewrite
    TIMEMORY_METRIC "wall_clock"
    TIMEMORY_FILE "wall_clock.json"
    PERFETTO_METRIC "host"
    PERFETTO_FILE "perfetto-trace.proto"
    LABELS "time-window"
-    FAIL_REGEX "outer_d|OMNITRACE_ABORT_FAIL_REGEX"
+    FAIL_REGEX "outer_d|ROCPROFSYS_ABORT_FAIL_REGEX"
    ARGS -l
         trace-time-window.inst
         outer_a
@@ -42,14 +38,14 @@ omnitrace_add_validation_test(
         1
         -p)

-omnitrace_add_validation_test(
+rocprofiler_systems_add_validation_test(
    NAME trace-time-window-runtime-instrument
    TIMEMORY_METRIC "wall_clock"
    TIMEMORY_FILE "wall_clock.json"
    PERFETTO_METRIC "host"
    PERFETTO_FILE "perfetto-trace.proto"
    LABELS "time-window"
-    FAIL_REGEX "outer_d|OMNITRACE_ABORT_FAIL_REGEX"
+    FAIL_REGEX "outer_d|ROCPROFSYS_ABORT_FAIL_REGEX"
    ARGS -l
         trace-time-window
         outer_a
@@ -67,7 +63,7 @@ omnitrace_add_validation_test(
         1
         -p)

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_BASELINE SKIP_SAMPLING ${_TRACE_WINDOW_SKIP}
    NAME trace-time-window-delay
    TARGET trace-time-window
@@ -75,9 +71,10 @@ omnitrace_add_test(
    RUNTIME_ARGS -e -v 1 --caller-include inner -i 4096
    LABELS "time-window"
    ENVIRONMENT
-        "${_window_environment};OMNITRACE_TRACE_DELAY=0.75;OMNITRACE_TRACE_DURATION=0.75")
+        "${_window_environment};ROCPROFSYS_TRACE_DELAY=0.75;ROCPROFSYS_TRACE_DURATION=0.75"
+    )

-omnitrace_add_validation_test(
+rocprofiler_systems_add_validation_test(
    NAME trace-time-window-delay-binary-rewrite
    TIMEMORY_METRIC "wall_clock"
    TIMEMORY_FILE "wall_clock.json"
@@ -95,7 +92,7 @@ omnitrace_add_validation_test(
         0
         -p)

-omnitrace_add_validation_test(
+rocprofiler_systems_add_validation_test(
    NAME trace-time-window-delay-runtime-instrument
    TIMEMORY_METRIC "wall_clock"
    TIMEMORY_FILE "wall_clock.json"
@@ -4,7 +4,7 @@
 #
 # -------------------------------------------------------------------------------------- #

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    NAME user-api
    TARGET user-api
    LABELS "loops"
@@ -7,7 +7,7 @@ cleanup()

 trap cleanup SIGABRT SIGQUIT

-OMNITRACE_COMMAND=""
+ROCPROFSYS_COMMAND=""
 APPLICATION_COMMAND=""

 while [[ $# -gt 0 ]]
@@ -16,7 +16,7 @@ do
        shift
        break
    else
-        OMNITRACE_COMMAND="${OMNITRACE_COMMAND}${1} "
+        ROCPROFSYS_COMMAND="${ROCPROFSYS_COMMAND}${1} "
        shift
    fi
 done
@@ -36,7 +36,7 @@ fi
 echo "PID: ${_PID}"
 echo ""

-${OMNITRACE_COMMAND} -p ${_PID} -- ${@}
+${ROCPROFSYS_COMMAND} -p ${_PID} -- ${@}
 RET=$?

 killall $(basename ${1}) &> /dev/null
@@ -5,22 +5,27 @@ add_library(tests-compile-options INTERFACE)
 target_compile_options(tests-compile-options INTERFACE -g)

 add_executable(thread-limit thread-limit.cpp)
-target_compile_definitions(thread-limit PRIVATE MAX_THREADS=${OMNITRACE_MAX_THREADS})
+target_compile_definitions(thread-limit PRIVATE MAX_THREADS=${ROCPROFSYS_MAX_THREADS})
 target_link_libraries(thread-limit PRIVATE Threads::Threads tests-compile-options)

 set(_thread_limit_environment
-    "${_base_environment}" "OMNITRACE_TRACE=ON" "OMNITRACE_PROFILE=ON"
-    "OMNITRACE_COUT_OUTPUT=ON" "OMNITRACE_USE_SAMPLING=ON" "OMNITRACE_SAMPLING_FREQ=250"
-    "OMNITRACE_VERBOSE=2" "OMNITRACE_TIMEMORY_COMPONENTS=wall_clock,peak_rss,page_rss")
+    "${_base_environment}"
+    "ROCPROFSYS_TRACE=ON"
+    "ROCPROFSYS_PROFILE=ON"
+    "ROCPROFSYS_COUT_OUTPUT=ON"
+    "ROCPROFSYS_USE_SAMPLING=ON"
+    "ROCPROFSYS_SAMPLING_FREQ=250"
+    "ROCPROFSYS_VERBOSE=2"
+    "ROCPROFSYS_TIMEMORY_COMPONENTS=wall_clock,peak_rss,page_rss")

-math(EXPR THREAD_LIMIT_TEST_VALUE "${OMNITRACE_MAX_THREADS} + 24")
+math(EXPR THREAD_LIMIT_TEST_VALUE "${ROCPROFSYS_MAX_THREADS} + 24")
 math(EXPR THREAD_LIMIT_TEST_VALUE_PLUS_ONE "${THREAD_LIMIT_TEST_VALUE} + 1")

 set(_thread_limit_pass_regex "\\|${THREAD_LIMIT_TEST_VALUE}>>>")
 set(_thread_limit_fail_regex
-    "\\|${THREAD_LIMIT_TEST_VALUE_PLUS_ONE}>>>|OMNITRACE_ABORT_FAIL_REGEX")
+    "\\|${THREAD_LIMIT_TEST_VALUE_PLUS_ONE}>>>|ROCPROFSYS_ABORT_FAIL_REGEX")

-omnitrace_add_test(
+rocprofiler_systems_add_test(
    SKIP_BASELINE
    NAME thread-limit
    TARGET thread-limit
@@ -266,7 +266,7 @@ class experiment_progress(object):
 def process_samples(data, _data):
    if not _data:
        return data
-    for record in _data["omnitrace"]["causal"]["records"]:
+    for record in _data["rocprofsys"]["causal"]["records"]:
        for samp in record["samples"]:
            _info = samp["info"]
            _count = samp["count"]
@@ -297,7 +297,7 @@ def process_data(data, _data, args):
    _selection_filter = re.compile(args.experiments)
    _progresspt_filter = re.compile(args.progress_points)

-    for record in _data["omnitrace"]["causal"]["records"]:
+    for record in _data["rocprofsys"]["causal"]["records"]:
        for exp in record["experiments"]:
            _speedup = exp["virtual_speedup"]
            _duration = exp["duration"]