From 68065b5f96617f2fbc62edeea85730a6114e7830 Mon Sep 17 00:00:00 2001
From: 0o-de-lally <1364012+0o-de-lally@users.noreply.github.com>
Date: Sat, 5 Oct 2024 13:12:10 -0400
Subject: [PATCH] names

---
 .../src/{version_five => deprecated}/ancestry_legacy.rs     | 0
 .../version_five/{account_blob.rs => account_blob_v5.rs}    | 2 +-
 compatibility/src/version_five/diem_account_v5.rs           | 2 +-
 .../version_five/{language_v5.rs => language_storage_v5.rs} | 0
 compatibility/src/version_five/mod.rs                       | 5 ++---
 compatibility/src/version_five/state_snapshot_v5.rs         | 6 +++---
 6 files changed, 7 insertions(+), 8 deletions(-)
 rename compatibility/src/{version_five => deprecated}/ancestry_legacy.rs (100%)
 rename compatibility/src/version_five/{account_blob.rs => account_blob_v5.rs} (98%)
 rename compatibility/src/version_five/{language_v5.rs => language_storage_v5.rs} (100%)

diff --git a/compatibility/src/version_five/ancestry_legacy.rs b/compatibility/src/deprecated/ancestry_legacy.rs
similarity index 100%
rename from compatibility/src/version_five/ancestry_legacy.rs
rename to compatibility/src/deprecated/ancestry_legacy.rs
diff --git a/compatibility/src/version_five/account_blob.rs b/compatibility/src/version_five/account_blob_v5.rs
similarity index 98%
rename from compatibility/src/version_five/account_blob.rs
rename to compatibility/src/version_five/account_blob_v5.rs
index 1c53934a2..08ffe5021 100644
--- a/compatibility/src/version_five/account_blob.rs
+++ b/compatibility/src/version_five/account_blob_v5.rs
@@ -3,7 +3,7 @@
 
 use crate::version_five::{
     core_account_v5::AccountResourceV5, diem_account_v5::DiemAccountResourceV5,
-    language_v5::StructTagV5, legacy_address_v5::LegacyAddressV5,
+    language_storage_v5::StructTagV5, legacy_address_v5::LegacyAddressV5,
 };
 use anyhow::bail;
 use anyhow::{Context, Result};
diff --git a/compatibility/src/version_five/diem_account_v5.rs b/compatibility/src/version_five/diem_account_v5.rs
index 25376705d..24a89b371 100644
--- a/compatibility/src/version_five/diem_account_v5.rs
+++ b/compatibility/src/version_five/diem_account_v5.rs
@@ -1,7 +1,7 @@
 // Copyright (c) The Diem Core Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::version_five::language_v5::StructTagV5;
+use crate::version_five::language_storage_v5::StructTagV5;
 use crate::version_five::legacy_address_v5::LegacyAddressV5;
 use crate::version_five::event_v5::EventHandleV5;
 
diff --git a/compatibility/src/version_five/language_v5.rs b/compatibility/src/version_five/language_storage_v5.rs
similarity index 100%
rename from compatibility/src/version_five/language_v5.rs
rename to compatibility/src/version_five/language_storage_v5.rs
diff --git a/compatibility/src/version_five/mod.rs b/compatibility/src/version_five/mod.rs
index cf30ea096..67a449637 100644
--- a/compatibility/src/version_five/mod.rs
+++ b/compatibility/src/version_five/mod.rs
@@ -2,11 +2,10 @@ pub mod core_account_v5;
 pub mod diem_account_v5;
 pub mod legacy_address_v5;
 pub mod state_snapshot_v5;
-// pub mod struct_tag_v5;
-mod account_blob;
+mod account_blob_v5;
 mod balance_v5;
 mod event_v5;
 mod freezing_v5;
 mod hash_value_v5;
-mod language_v5;
+mod language_storage_v5;
 mod safe_serialize_v5;
diff --git a/compatibility/src/version_five/state_snapshot_v5.rs b/compatibility/src/version_five/state_snapshot_v5.rs
index 6bdf846d3..4cf406db2 100644
--- a/compatibility/src/version_five/state_snapshot_v5.rs
+++ b/compatibility/src/version_five/state_snapshot_v5.rs
@@ -1,6 +1,6 @@
 //! read-archive
 
-use crate::version_five::{account_blob::AccountStateBlob, hash_value_v5::HashValue};
+use crate::version_five::{account_blob_v5::AccountStateBlob, hash_value_v5::HashValue};
 
 use anyhow::{anyhow, Context, Error, Result};
 use diem_backup_cli::{
@@ -104,7 +104,7 @@ pub async fn v5_accounts_from_snapshot_backup(
 
 #[test]
 fn test_string() {
-    use super::account_blob::AccountStateV5;
+    use super::account_blob_v5::AccountStateV5;
 
     use super::balance_v5::BalanceResource;
     use super::freezing_v5::FreezingBit;
@@ -164,7 +164,7 @@ fn sanity_test() {
 
 #[test]
 fn decode_encode_struct_tag() {
-    use super::language_v5::StructTagV5;
+    use super::language_storage_v5::StructTagV5;
     use super::legacy_address_v5::LEGACY_CORE_CODE_ADDRESS;
     use move_core_types::ident_str;
     let s = StructTagV5 {