diff --git a/src/intel/common/intel_check.c b/src/intel/common/intel_check.c
index a8dfc74c878..45d8c73e22f 100644
--- a/src/intel/common/intel_check.c
+++ b/src/intel/common/intel_check.c
@@ -48,7 +48,7 @@ use_dgpu_render(char *target)
 {
    char dGPU_prop[BUF_SIZE];
    char vendor_buf[PROPERTY_VALUE_MAX];
-   snprintf(dGPU_prop, sizeof(dGPU_prop), "persist.vendor.intel.dGPUwSys.%s", target);
+   snprintf(dGPU_prop, sizeof(dGPU_prop), "persist.vendor.intel.dGPUwSys%s", target);
    if (property_get(dGPU_prop, vendor_buf, NULL) > 0) {
       if (vendor_buf[0] == '1') {
          return true;
@@ -81,7 +81,7 @@ is_target_process(const char *target)
       if (!strcmp(target, *ptr)) {
          char vendor_buf[PROPERTY_VALUE_MAX];
          char vendor_buf1[PROPERTY_VALUE_MAX];
-         if ((property_get("persist.vendor.intel.dGPUwSys.benchmark.auto",
+         if ((property_get("persist.vendor.intel.dGPUwSys.auto",
                           vendor_buf, NULL) > 0) ||
 	     (property_get("persist.vendor.intel.dGPUwLocal.auto",
                           vendor_buf1, NULL) > 0)) {
@@ -101,7 +101,9 @@ bool intel_is_dgpu_render(void)
 
    get_pid_name(process_id, process_name);
    char *app_name = strrchr(process_name, '.');
-   return (use_dgpu_render(process_name) || is_target_process(process_name) || use_dgpu_render(app_name));
+   if (app_name == NULL)
+      app_name = process_name;
+   return (use_dgpu_render(app_name) || is_target_process(app_name));
 }
 
 bool intel_lower_ctx_priority(void)
@@ -109,10 +111,13 @@ bool intel_lower_ctx_priority(void)
    pid_t process_id = getpid();
    char process_name[BUF_SIZE] = {0};
    get_pid_name(process_id, process_name);
+   char *app_name = strrchr(process_name, '.');
+   if (app_name == NULL)
+      app_name = process_name;
 
    char lower_pri[BUF_SIZE];
    char vendor_buf[PROPERTY_VALUE_MAX];
-   snprintf(lower_pri, sizeof(lower_pri), "persist.vendor.intel.lowPir.%s", process_name);
+   snprintf(lower_pri, sizeof(lower_pri), "persist.vendor.intel.lowPir%s", app_name);
    if (property_get(lower_pri, vendor_buf, NULL) > 0) {
       if (vendor_buf[0] == '1') {
          return true;