diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp
index 2e02382..2093579 100644
--- a/cmds/app_process/app_main.cpp
+++ b/cmds/app_process/app_main.cpp
@@ -299,8 +299,9 @@
     }
 
     if (!niceName.isEmpty()) {
-        runtime.setArgv0(niceName.string());
-        set_process_name(niceName.string());
+        const char* procName = niceName.string();
+        pthread_setname_np(pthread_self(), procName);
+        runtime.setArgv0(procName);
     }
 
     if (zygote) {
diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp
index ee8fb19..1c8eea7 100644
--- a/core/jni/android_util_Process.cpp
+++ b/core/jni/android_util_Process.cpp
@@ -411,9 +411,9 @@
         env->ReleaseStringCritical(name, str);
     }
 
-    if (name8.size() > 0) {
+    if (!name8.isEmpty()) {
         const char* procName = name8.string();
-        set_process_name(procName);
+        pthread_setname_np(pthread_self(), procName);
         AndroidRuntime::getRuntime()->setArgv0(procName);
     }
 }