diff --git a/service_vm/client_apk/Android.bp b/service_vm/test_apk/Android.bp
similarity index 95%
rename from service_vm/client_apk/Android.bp
rename to service_vm/test_apk/Android.bp
index d94489d..4da3f81 100644
--- a/service_vm/client_apk/Android.bp
+++ b/service_vm/test_apk/Android.bp
@@ -3,7 +3,7 @@
 }
 
 android_app {
-    name: "ServiceVmClientApp",
+    name: "ServiceVmClientTestApp",
     installable: true,
     jni_libs: ["libservice_vm_client"],
     jni_uses_platform_apis: true,
diff --git a/service_vm/client_apk/AndroidManifest.xml b/service_vm/test_apk/AndroidManifest.xml
similarity index 100%
rename from service_vm/client_apk/AndroidManifest.xml
rename to service_vm/test_apk/AndroidManifest.xml
diff --git a/service_vm/client_apk/assets/config.json b/service_vm/test_apk/assets/config.json
similarity index 100%
rename from service_vm/client_apk/assets/config.json
rename to service_vm/test_apk/assets/config.json
diff --git a/service_vm/client_apk/src/main.rs b/service_vm/test_apk/src/main.rs
similarity index 97%
rename from service_vm/client_apk/src/main.rs
rename to service_vm/test_apk/src/main.rs
index bd48dc3..7d8416f 100644
--- a/service_vm/client_apk/src/main.rs
+++ b/service_vm/test_apk/src/main.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Main executable of Service VM client.
+//! Main executable of Service VM client for manual testing.
 
 use anyhow::Result;
 use log::{error, info};
diff --git a/vm_payload/Android.bp b/vm_payload/Android.bp
index d2ac7ee..b5322a8 100644
--- a/vm_payload/Android.bp
+++ b/vm_payload/Android.bp
@@ -35,7 +35,7 @@
     apex_available: ["com.android.compos"],
     visibility: [
         "//packages/modules/Virtualization/compos",
-        "//packages/modules/Virtualization/service_vm/client_apk",
+        "//packages/modules/Virtualization/service_vm/test_apk",
     ],
     shared_libs: [
         "libvm_payload#current",