diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 7ef08035..63c6459c 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -209,7 +209,7 @@ jobs:
           -DCUTTER_ENABLE_PYTHON_BINDINGS=ON ^
           -DCUTTER_ENABLE_PACKAGING=ON ^
           -DCUTTER_PACKAGE_DEPENDENCIES=ON ^
-          -DCUTTER_PACKAGE_R2GHIDRA=ON ^
+          -DCUTTER_PACKAGE_RZ_GHIDRA=ON ^
           -DCUTTER_PACKAGE_R2DEC=OFF ^
           -DCUTTER_ENABLE_DEPENDENCY_DOWNLOADS=ON ^
           -DCUTTER_ENABLE_CRASH_REPORTS=ON ^
diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt
index fe6bdc2d..3a6fce50 100644
--- a/dist/CMakeLists.txt
+++ b/dist/CMakeLists.txt
@@ -22,7 +22,7 @@ if(WIN32)
 	endif()
 	if (CUTTER_PACKAGE_R2DEC AND CUTTER_ENABLE_DEPENDENCY_DOWNLOADS)
 		install(CODE "
-			set(ENV{R_ALT_SRC_DIR} 1)
+			set(ENV{RZ_ALT_SRC_DIR} 1)
 			set(ENV{PATH} \"\${CMAKE_INSTALL_PREFIX};\$ENV{PATH}\")
 			execute_process(COMMAND powershell \"${CMAKE_CURRENT_SOURCE_DIR}/bundle_r2dec.ps1\" \"\${CMAKE_INSTALL_PREFIX}\"
 							WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
diff --git a/src/CutterApplication.cpp b/src/CutterApplication.cpp
index b515d357..476aecd8 100644
--- a/src/CutterApplication.cpp
+++ b/src/CutterApplication.cpp
@@ -100,7 +100,7 @@ CutterApplication::CutterApplication(int &argc, char **argv) : QApplication(argc
 
 #ifdef Q_OS_WIN
     // Redefine rz_sys_prefix() behaviour
-    qputenv("R_ALT_SRC_DIR", "1");
+    qputenv("RZ_ALT_SRC_DIR", "1");
 #endif
 
     Core()->initialize(clOptions.enableRizinPlugins);