diff --git a/virtualizationservice/src/aidl_vs.rs b/virtualizationservice/src/aidl.rs
similarity index 99%
rename from virtualizationservice/src/aidl_vs.rs
rename to virtualizationservice/src/aidl.rs
index 1266ff20..43b7616b 100644
--- a/virtualizationservice/src/aidl_vs.rs
+++ b/virtualizationservice/src/aidl.rs
@@ -15,7 +15,7 @@
 //! Implementation of the AIDL interface of the VirtualizationService.
 
 use crate::{get_calling_pid, get_calling_uid};
-use crate::atom_vs::{forward_vm_booted_atom, forward_vm_creation_atom, forward_vm_exited_atom};
+use crate::atom::{forward_vm_booted_atom, forward_vm_creation_atom, forward_vm_exited_atom};
 use android_os_permissions_aidl::aidl::android::os::IPermissionController;
 use android_system_virtualizationservice::aidl::android::system::virtualizationservice::VirtualMachineDebugInfo::VirtualMachineDebugInfo;
 use android_system_virtualizationservice_internal::aidl::android::system::virtualizationservice_internal::{
diff --git a/virtualizationservice/src/atom_vs.rs b/virtualizationservice/src/atom.rs
similarity index 100%
rename from virtualizationservice/src/atom_vs.rs
rename to virtualizationservice/src/atom.rs
diff --git a/virtualizationservice/src/main.rs b/virtualizationservice/src/main.rs
index 00c86f3e..64ccb13d 100644
--- a/virtualizationservice/src/main.rs
+++ b/virtualizationservice/src/main.rs
@@ -14,10 +14,10 @@
 
 //! Android VirtualizationService
 
-mod aidl_vs;
-mod atom_vs;
+mod aidl;
+mod atom;
 
-use crate::aidl_vs::{
+use crate::aidl::{
     remove_temporary_dir, BINDER_SERVICE_IDENTIFIER, TEMPORARY_DIRECTORY,
     VirtualizationServiceInternal
 };