You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ra...@apache.org on 2021/04/23 05:13:47 UTC

[ozone] branch HDDS-2939 updated: HDDS-5106. [FSO] Avoid using V1 postfixes for prefix related classes (#2174)

This is an automated email from the ASF dual-hosted git repository.

rakeshr pushed a commit to branch HDDS-2939
in repository https://gitbox.apache.org/repos/asf/ozone.git


The following commit(s) were added to refs/heads/HDDS-2939 by this push:
     new e63d80a  HDDS-5106. [FSO] Avoid using V1 postfixes for prefix related classes (#2174)
e63d80a is described below

commit e63d80abd8b54212e8d0e54e8233b714c558f3f8
Author: Rakesh Radhakrishnan <ra...@apache.org>
AuthorDate: Fri Apr 23 10:43:28 2021 +0530

    HDDS-5106. [FSO] Avoid using V1 postfixes for prefix related classes (#2174)
---
 .../apache/hadoop/ozone/client/OzoneBucket.java    |   6 +-
 ...va => TestDirectoryDeletingServiceWithFSO.java} |   4 +-
 ...V1.java => TestOzoneFileInterfacesWithFSO.java} |   6 +-
 .../hadoop/fs/ozone/TestOzoneFileSystem.java       |   2 +-
 ...stemV1.java => TestOzoneFileSystemWithFSO.java} |   9 +-
 ....java => TestRootedOzoneFileSystemWithFSO.java} |   7 +-
 .../fs/ozone/contract/ITestOzoneContractUtils.java |  23 ++--
 ... => TestOzoneClientMultipartUploadWithFSO.java} |   4 +-
 ...java => TestHadoopDirTreeGeneratorWithFSO.java} |   5 +-
 ...ectStoreV1.java => TestObjectStoreWithFSO.java} |   2 +-
 ...FSOBucket.java => TestRecursiveAclWithFSO.java} |   2 +-
 .../hadoop/ozone/om/codec/OmKeyInfoCodec.java      |   2 +-
 .../org/apache/hadoop/ozone/om/KeyManagerImpl.java |  19 ++--
 .../hadoop/ozone/om/TrashOzoneFileSystem.java      |  10 +-
 .../om/ratis/utils/OzoneManagerRatisUtils.java     |  60 +++++------
 .../om/request/bucket/OMBucketCreateRequest.java   |   2 +-
 ...1.java => OMDirectoryCreateRequestWithFSO.java} |  25 ++---
 ...uestV1.java => OMFileCreateRequestWithFSO.java} |  40 +++----
 .../ozone/om/request/file/OMFileRequest.java       |  14 +--
 ...tV1.java => OMAllocateBlockRequestWithFSO.java} |  16 +--
 ...questV1.java => OMKeyCommitRequestWithFSO.java} |  17 ++-
 ...questV1.java => OMKeyCreateRequestWithFSO.java} |  55 +++++-----
 ...questV1.java => OMKeyDeleteRequestWithFSO.java} |  14 +--
 ...questV1.java => OMKeyRenameRequestWithFSO.java} |  18 ++--
 .../hadoop/ozone/om/request/key/OMKeyRequest.java  |   6 +-
 ...uestV1.java => OMPathsPurgeRequestWithFSO.java} |   8 +-
 ...lRequestV1.java => OMKeyAclRequestWithFSO.java} |  20 ++--
 ...questV1.java => OMKeyAddAclRequestWithFSO.java} |  20 ++--
 ...stV1.java => OMKeyRemoveAclRequestWithFSO.java} |  38 ++++---
 ...questV1.java => OMKeySetAclRequestWithFSO.java} |  41 ++++---
 ...> S3InitiateMultipartUploadRequestWithFSO.java} |  47 ++++----
 ...a => S3MultipartUploadAbortRequestWithFSO.java} |  17 ++-
 ...S3MultipartUploadCommitPartRequestWithFSO.java} |  15 +--
 .../S3MultipartUploadCompleteRequest.java          |   2 +-
 ...> S3MultipartUploadCompleteRequestWithFSO.java} |  18 ++--
 ....java => OMDirectoryCreateResponseWithFSO.java} |  10 +-
 ...nseV1.java => OMFileCreateResponseWithFSO.java} |   8 +-
 ...V1.java => OMAllocateBlockResponseWithFSO.java} |   8 +-
 ...onseV1.java => OMKeyCommitResponseWithFSO.java} |   8 +-
 ...onseV1.java => OMKeyCreateResponseWithFSO.java} |  10 +-
 ...onseV1.java => OMKeyDeleteResponseWithFSO.java} |   6 +-
 ...onseV1.java => OMKeyRenameResponseWithFSO.java} |   8 +-
 ...nseV1.java => OMPathsPurgeResponseWithFSO.java} |  10 +-
 ...esponseV1.java => OMKeyAclResponseWithFSO.java} |   8 +-
 ... S3InitiateMultipartUploadResponseWithFSO.java} |   9 +-
 ... => S3MultipartUploadAbortResponseWithFSO.java} |   9 +-
 ...3MultipartUploadCommitPartResponseWithFSO.java} |  10 +-
 ... S3MultipartUploadCompleteResponseWithFSO.java} |   7 +-
 .../ozone/om/request/TestOMRequestUtils.java       |   6 +-
 ....java => TestOMBucketCreateRequestWithFSO.java} |   7 +-
 ...va => TestOMDirectoryCreateRequestWithFSO.java} | 118 +++++++++++----------
 ...V1.java => TestOMFileCreateRequestWithFSO.java} |   8 +-
 ...java => TestOMAllocateBlockRequestWithFSO.java} |  13 +--
 ...uestV1.java => TestOMKeyAclRequestWithFSO.java} |  18 ++--
 ...tV1.java => TestOMKeyCommitRequestWithFSO.java} |  14 +--
 ...tV1.java => TestOMKeyCreateRequestWithFSO.java} |   8 +-
 ...tV1.java => TestOMKeyDeleteRequestWithFSO.java} |   8 +-
 ...stS3InitiateMultipartUploadRequestWithFSO.java} |  10 +-
 .../s3/multipart/TestS3MultipartRequest.java       |   9 +-
 ... TestS3MultipartUploadAbortRequestWithFSO.java} |   6 +-
 ...S3MultipartUploadCommitPartRequestWithFSO.java} |   8 +-
 ...stS3MultipartUploadCompleteRequestWithFSO.java} |  14 +--
 ...a => TestOMDirectoryCreateResponseWithFSO.java} |  15 +--
 ...1.java => TestOMFileCreateResponseWithFSO.java} |  10 +-
 ...ava => TestOMAllocateBlockResponseWithFSO.java} |  12 +--
 ...V1.java => TestOMKeyCommitResponseWithFSO.java} |  14 +--
 ...V1.java => TestOMKeyCreateResponseWithFSO.java} |  10 +-
 ...V1.java => TestOMKeyDeleteResponseWithFSO.java} |   8 +-
 ...tS3InitiateMultipartUploadResponseWithFSO.java} |   8 +-
 .../s3/multipart/TestS3MultipartResponse.java      |  22 ++--
 ...TestS3MultipartUploadAbortResponseWithFSO.java} |  10 +-
 ...3MultipartUploadCommitPartResponseWithFSO.java} |  28 ++---
 ...tS3MultipartUploadCompleteResponseWithFSO.java} |  42 ++++----
 .../hadoop/fs/ozone/BasicOzoneFileSystem.java      |   5 +-
 .../fs/ozone/BasicRootedOzoneFileSystem.java       |   4 +-
 75 files changed, 578 insertions(+), 562 deletions(-)

diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneBucket.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneBucket.java
index bfe6456..b4e4774 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneBucket.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneBucket.java
@@ -553,7 +553,7 @@ public class OzoneBucket extends WithMetadata {
       String prevKey) throws IOException {
 
     if(OzoneFSUtils.isFSOptimizedBucket(getMetadata())){
-      return new KeyIteratorV1(keyPrefix, prevKey);
+      return new KeyIteratorWithFSO(keyPrefix, prevKey);
     }
     return new KeyIterator(keyPrefix, prevKey);
   }
@@ -882,7 +882,7 @@ public class OzoneBucket extends WithMetadata {
    *
    * Note: Does not guarantee to return the list of keys in a sorted order.
    */
-  private class KeyIteratorV1 extends KeyIterator{
+  private class KeyIteratorWithFSO extends KeyIterator{
 
     private Stack<String> stack;
     private List<OzoneKey> pendingItemsToBeBatched;
@@ -896,7 +896,7 @@ public class OzoneBucket extends WithMetadata {
      * @param keyPrefix
      * @param prevKey
      */
-    KeyIteratorV1(String keyPrefix, String prevKey) throws IOException {
+    KeyIteratorWithFSO(String keyPrefix, String prevKey) throws IOException {
       super(keyPrefix, prevKey);
     }
 
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSOBucket.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java
similarity index 99%
rename from hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSOBucket.java
rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java
index acbdfaf..50d056d 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSOBucket.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java
@@ -60,10 +60,10 @@ import static org.junit.Assert.fail;
 /**
  * Directory deletion service test cases.
  */
-public class TestDirectoryDeletingServiceWithFSOBucket {
+public class TestDirectoryDeletingServiceWithFSO {
 
   private static final Logger LOG =
-      LoggerFactory.getLogger(TestDirectoryDeletingServiceWithFSOBucket.class);
+      LoggerFactory.getLogger(TestDirectoryDeletingServiceWithFSO.class);
 
   /**
    * Set a timeout for each test.
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfacesV1.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfacesWithFSO.java
similarity index 90%
rename from hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfacesV1.java
rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfacesWithFSO.java
index de484ea..ea49462 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfacesV1.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfacesWithFSO.java
@@ -28,15 +28,15 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
 /**
- * Test OzoneFileSystem Interfaces layout version V1.
+ * Test OzoneFileSystem Interfaces - prefix layout.
  *
  * This test will test the various interfaces i.e.
  * create, read, write, getFileStatus
  */
 @RunWith(Parameterized.class)
-public class TestOzoneFileInterfacesV1 extends TestOzoneFileInterfaces {
+public class TestOzoneFileInterfacesWithFSO extends TestOzoneFileInterfaces {
 
-  public TestOzoneFileInterfacesV1(boolean setDefaultFs,
+  public TestOzoneFileInterfacesWithFSO(boolean setDefaultFs,
       boolean useAbsolutePath, boolean enabledFileSystemPaths) {
     super(setDefaultFs, useAbsolutePath, enabledFileSystemPaths);
   }
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java
index bddc21f..47c462b 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java
@@ -736,7 +736,7 @@ public class TestOzoneFileSystem {
   @Test
   public void testAllocateMoreThanOneBlock() throws IOException {
     Path file = new Path("/file");
-    String str = "TestOzoneFileSystemV1.testSeekOnFileLength";
+    String str = "TestOzoneFileSystem.testAllocateMoreThanOneBlock";
     byte[] strBytes = str.getBytes(StandardCharsets.UTF_8);
     long numBlockAllocationsOrg =
             cluster.getOzoneManager().getMetrics().getNumBlockAllocates();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemV1.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemWithFSO.java
similarity index 98%
rename from hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemV1.java
rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemWithFSO.java
index aa289a0..23bb916 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemV1.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemWithFSO.java
@@ -46,11 +46,11 @@ import static org.junit.Assert.fail;
 
 /**
  * Ozone file system tests that are not covered by contract tests,
- * layout version V1.
+ * - prefix layout.
  *
  */
 @RunWith(Parameterized.class)
-public class TestOzoneFileSystemV1 extends TestOzoneFileSystem {
+public class TestOzoneFileSystemWithFSO extends TestOzoneFileSystem {
 
   @Parameterized.Parameters
   public static Collection<Object[]> data() {
@@ -66,7 +66,8 @@ public class TestOzoneFileSystemV1 extends TestOzoneFileSystem {
     setIsBucketFSOptimized(true);
   }
 
-  public TestOzoneFileSystemV1(boolean setDefaultFs, boolean enableOMRatis) {
+  public TestOzoneFileSystemWithFSO(boolean setDefaultFs,
+      boolean enableOMRatis) {
     super(setDefaultFs, enableOMRatis);
   }
 
@@ -83,7 +84,7 @@ public class TestOzoneFileSystemV1 extends TestOzoneFileSystem {
   }
 
   private static final Logger LOG =
-      LoggerFactory.getLogger(TestOzoneFileSystemV1.class);
+      LoggerFactory.getLogger(TestOzoneFileSystemWithFSO.class);
 
   @Test
   public void testListStatusWithoutRecursiveSearch() throws Exception {
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystemV1.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystemWithFSO.java
similarity index 94%
rename from hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystemV1.java
rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystemWithFSO.java
index b0b3152..0c43508 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystemV1.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystemWithFSO.java
@@ -34,10 +34,11 @@ import java.util.Collection;
 
 
 @RunWith(Parameterized.class)
-public class TestRootedOzoneFileSystemV1 extends TestRootedOzoneFileSystem {
+public class TestRootedOzoneFileSystemWithFSO
+    extends TestRootedOzoneFileSystem {
 
   private static final Logger LOG =
-      LoggerFactory.getLogger(TestRootedOzoneFileSystemV1.class);
+      LoggerFactory.getLogger(TestRootedOzoneFileSystemWithFSO.class);
 
   @Parameterized.Parameters
   public static Collection<Object[]> data() {
@@ -48,7 +49,7 @@ public class TestRootedOzoneFileSystemV1 extends TestRootedOzoneFileSystem {
         new Object[]{false, false});
   }
 
-  public TestRootedOzoneFileSystemV1(boolean setDefaultFs,
+  public TestRootedOzoneFileSystemWithFSO(boolean setDefaultFs,
       boolean enableOMRatis) throws Exception {
     super(setDefaultFs, enableOMRatis);
   }
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractUtils.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractUtils.java
index 1926bd2..0fc23c3 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractUtils.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractUtils.java
@@ -31,18 +31,19 @@ public final class ITestOzoneContractUtils {
 
   private static List<Object> fsoCombinations = Arrays.asList(new Object[] {
       // FSO configuration is a cluster level server side configuration.
-      // If the cluster is configured with V0 layout version,
-      // V0 bucket will created.
-      // If the cluster is configured with V1 layout version,
-      // V1 bucket will be created.
-      // Presently, OzoneClient checks bucketMetadata then invokes V1 or V0
-      // specific code and it makes no sense to add client side configs now.
-      // Once the specific client API to set FSO or non-FSO bucket is provided
-      // the contract test can be refactored to include another parameter
-      // (fsoClient) which sets/unsets the client side configs.
-      true, // Server is configured with new layout (V1)
+      // If the cluster is configured with SIMPLE metadata layout,
+      // non-FSO bucket will created.
+      // If the cluster is configured with PREFIX metadata layout,
+      // FSO bucket will be created.
+      // Presently, OzoneClient checks bucketMetadata then invokes FSO or
+      // non-FSO specific code and it makes no sense to add client side
+      // configs now. Once the specific client API to set FSO or non-FSO
+      // bucket is provided the contract test can be refactored to include
+      // another parameter (fsoClient) which sets/unsets the client side
+      // configs.
+      true, // Server is configured with new layout (PREFIX)
       // and new buckets will be operated on
-      false // Server is configured with old layout (V0)
+      false // Server is configured with old layout (SIMPLE)
       // and old buckets will be operated on
   });
 
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadV1.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadWithFSO.java
similarity index 99%
rename from hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadV1.java
rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadWithFSO.java
index b248b72..7b49413 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadV1.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadWithFSO.java
@@ -79,9 +79,9 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 /**
- * This test verifies all the S3 multipart client apis - layout version V1.
+ * This test verifies all the S3 multipart client apis - prefix layout.
  */
-public class TestOzoneClientMultipartUploadV1 {
+public class TestOzoneClientMultipartUploadWithFSO {
 
   private static ObjectStore store = null;
   private static MiniOzoneCluster cluster = null;
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopDirTreeGeneratorV1.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopDirTreeGeneratorWithFSO.java
similarity index 90%
rename from hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopDirTreeGeneratorV1.java
rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopDirTreeGeneratorWithFSO.java
index ff036e7..c776cef 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopDirTreeGeneratorV1.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopDirTreeGeneratorWithFSO.java
@@ -21,9 +21,10 @@ import org.apache.hadoop.ozone.om.OMConfigKeys;
 import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
 
 /**
- * Test for HadoopDirTreeGenerator layout version V1.
+ * Test for HadoopDirTreeGenerator - prefix layout.
  */
-public class TestHadoopDirTreeGeneratorV1 extends TestHadoopDirTreeGenerator {
+public class TestHadoopDirTreeGeneratorWithFSO
+    extends TestHadoopDirTreeGenerator {
 
   protected OzoneConfiguration getOzoneConfiguration() {
     OzoneConfiguration conf = new OzoneConfiguration();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreV1.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java
similarity index 99%
rename from hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreV1.java
rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java
index e6f943f..79eacb2 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreV1.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java
@@ -75,7 +75,7 @@ import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.KEY_
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-public class TestObjectStoreV1 {
+public class TestObjectStoreWithFSO {
 
   private static MiniOzoneCluster cluster = null;
   private static OzoneConfiguration conf;
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestRecursiveAclWithFSOBucket.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestRecursiveAclWithFSO.java
similarity index 99%
rename from hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestRecursiveAclWithFSOBucket.java
rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestRecursiveAclWithFSO.java
index 5ffe9f2..bcbea56 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestRecursiveAclWithFSOBucket.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestRecursiveAclWithFSO.java
@@ -56,7 +56,7 @@ import static org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType.OZONE;
 /**
  * Test recursive acl checks for delete and rename for FSO Buckets.
  */
-public class TestRecursiveAclWithFSOBucket {
+public class TestRecursiveAclWithFSO {
 
   @Rule public Timeout timeout = Timeout.seconds(120);
 
diff --git a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmKeyInfoCodec.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmKeyInfoCodec.java
index 5855afc..de31d87 100644
--- a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmKeyInfoCodec.java
+++ b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmKeyInfoCodec.java
@@ -34,7 +34,7 @@ import static org.apache.hadoop.ozone.ClientVersions.CURRENT_VERSION;
  * Codec to encode OmKeyInfo as byte array.
  *
  * <p>
- * If the layout version "ozone.om.layout.version" is V1 and
+ * If the layout "ozone.om.metadata.layout" is PREFIX and
  * "ozone.om.enable.filesystem.paths" is TRUE. Then, DB stores only the leaf
  * node name into the 'keyName' field.
  * <p>
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
index d751154..dbda8b9 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
@@ -660,7 +660,7 @@ public class KeyManagerImpl implements KeyManager {
     OmKeyInfo value = null;
     try {
       if (OzoneManagerRatisUtils.isBucketFSOptimized()) {
-        value = getOmKeyInfoV1(volumeName, bucketName, keyName);
+        value = getOmKeyInfoFSO(volumeName, bucketName, keyName);
       } else {
         value = getOmKeyInfo(volumeName, bucketName, keyName);
       }
@@ -711,7 +711,7 @@ public class KeyManagerImpl implements KeyManager {
    * Look up will return only closed fileInfo. This will return null if the
    * keyName is a directory or if the keyName is still open for writing.
    */
-  private OmKeyInfo getOmKeyInfoV1(String volumeName, String bucketName,
+  private OmKeyInfo getOmKeyInfoFSO(String volumeName, String bucketName,
                                    String keyName) throws IOException {
     OzoneFileStatus fileStatus =
             OMFileRequest.getOMKeyInfoIfExists(metadataManager,
@@ -1711,7 +1711,7 @@ public class KeyManagerImpl implements KeyManager {
       OMFileRequest.validateBucket(metadataManager, volume, bucket);
       String objectKey = metadataManager.getOzoneKey(volume, bucket, keyName);
       if (OzoneManagerRatisUtils.isBucketFSOptimized()) {
-        keyInfo = getOmKeyInfoV1(volume, bucket, keyName);
+        keyInfo = getOmKeyInfoFSO(volume, bucket, keyName);
       } else {
         keyInfo = getOmKeyInfo(volume, bucket, keyName);
       }
@@ -1924,7 +1924,7 @@ public class KeyManagerImpl implements KeyManager {
     String keyName = args.getKeyName();
 
     if (OzoneManagerRatisUtils.isBucketFSOptimized()) {
-      return getOzoneFileStatusV1(volumeName, bucketName, keyName,
+      return getOzoneFileStatusFSO(volumeName, bucketName, keyName,
               args.getSortDatanodes(), clientAddress, false);
     }
     return getOzoneFileStatus(volumeName, bucketName, keyName,
@@ -1992,7 +1992,7 @@ public class KeyManagerImpl implements KeyManager {
   }
 
 
-  private OzoneFileStatus getOzoneFileStatusV1(String volumeName,
+  private OzoneFileStatus getOzoneFileStatusFSO(String volumeName,
       String bucketName, String keyName, boolean sortDatanodes,
       String clientAddress, boolean skipFileNotFoundError) throws IOException {
     OzoneFileStatus fileStatus = null;
@@ -2194,7 +2194,7 @@ public class KeyManagerImpl implements KeyManager {
     String keyName = args.getKeyName();
     OzoneFileStatus fileStatus;
     if (OzoneManagerRatisUtils.isBucketFSOptimized()) {
-      fileStatus = getOzoneFileStatusV1(volumeName, bucketName, keyName,
+      fileStatus = getOzoneFileStatusFSO(volumeName, bucketName, keyName,
               args.getSortDatanodes(), clientAddress, false);
     } else {
       fileStatus = getOzoneFileStatus(volumeName, bucketName,
@@ -2302,7 +2302,8 @@ public class KeyManagerImpl implements KeyManager {
     }
 
     if (OzoneManagerRatisUtils.isBucketFSOptimized()) {
-      return listStatusV1(args, recursive, startKey, numEntries, clientAddress);
+      return listStatusFSO(args, recursive, startKey, numEntries,
+          clientAddress);
     }
 
     String volumeName = args.getVolumeName();
@@ -2441,7 +2442,7 @@ public class KeyManagerImpl implements KeyManager {
   }
 
   @SuppressWarnings("methodlength")
-  public List<OzoneFileStatus> listStatusV1(OmKeyArgs args, boolean recursive,
+  public List<OzoneFileStatus> listStatusFSO(OmKeyArgs args, boolean recursive,
       String startKey, long numEntries, String clientAddress)
           throws IOException {
     Preconditions.checkNotNull(args, "Key args can not be null");
@@ -2555,7 +2556,7 @@ public class KeyManagerImpl implements KeyManager {
           prefixPath = OzoneFSUtils.getParentDir(startKey);
         }
 
-        OzoneFileStatus fileStatusInfo = getOzoneFileStatusV1(volumeName,
+        OzoneFileStatus fileStatusInfo = getOzoneFileStatusFSO(volumeName,
                 bucketName, startKey, false, null, true);
 
         if (fileStatusInfo != null) {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashOzoneFileSystem.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashOzoneFileSystem.java
index 9ca673a..30ac9c7 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashOzoneFileSystem.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashOzoneFileSystem.java
@@ -158,7 +158,7 @@ public class TrashOzoneFileSystem extends FileSystem {
     OmBucketInfo bucket = ozoneManager.getBucketInfo(srcPath.getVolumeName(),
         srcPath.getBucketName());
     if (OzoneFSUtils.isFSOptimizedBucket(bucket.getMetadata())) {
-      return renameV1(srcPath, dstPath);
+      return renameFSO(srcPath, dstPath);
     }
     Preconditions.checkArgument(srcPath.getBucketName().
         equals(dstPath.getBucketName()));
@@ -169,7 +169,7 @@ public class TrashOzoneFileSystem extends FileSystem {
     return true;
   }
 
-  private boolean renameV1(OFSPath srcPath, OFSPath dstPath) {
+  private boolean renameFSO(OFSPath srcPath, OFSPath dstPath) {
     ozoneManager.getMetrics().incNumTrashAtomicDirRenames();
     OzoneManagerProtocolProtos.OMRequest omRequest =
         getRenameKeyRequest(srcPath, dstPath);
@@ -180,7 +180,7 @@ public class TrashOzoneFileSystem extends FileSystem {
       }
       return false;
     } catch (Exception e){
-      LOG.error("couldnt send rename requestV1", e);
+      LOG.error("Couldn't send rename request", e);
       return false;
     }
   }
@@ -192,14 +192,14 @@ public class TrashOzoneFileSystem extends FileSystem {
     OmBucketInfo bucket = ozoneManager.getBucketInfo(srcPath.getVolumeName(),
         srcPath.getBucketName());
     if (OzoneFSUtils.isFSOptimizedBucket(bucket.getMetadata())) {
-      return deleteV1(srcPath);
+      return deleteFSO(srcPath);
     }
     DeleteIterator iterator = new DeleteIterator(path, true);
     iterator.iterate();
     return true;
   }
 
-  private boolean deleteV1(OFSPath srcPath) {
+  private boolean deleteFSO(OFSPath srcPath) {
     ozoneManager.getMetrics().incNumTrashAtomicDirDeletes();
     OzoneManagerProtocolProtos.OMRequest omRequest =
         getDeleteKeyRequest(srcPath);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
index f4628a9..e4a08a0 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
@@ -32,41 +32,41 @@ import org.apache.hadoop.ozone.om.request.bucket.acl.OMBucketAddAclRequest;
 import org.apache.hadoop.ozone.om.request.bucket.acl.OMBucketRemoveAclRequest;
 import org.apache.hadoop.ozone.om.request.bucket.acl.OMBucketSetAclRequest;
 import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequest;
-import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequestV1;
+import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequestWithFSO;
 import org.apache.hadoop.ozone.om.request.file.OMFileCreateRequest;
-import org.apache.hadoop.ozone.om.request.file.OMFileCreateRequestV1;
+import org.apache.hadoop.ozone.om.request.file.OMFileCreateRequestWithFSO;
 import org.apache.hadoop.ozone.om.request.key.OMKeysDeleteRequest;
 import org.apache.hadoop.ozone.om.request.key.OMAllocateBlockRequest;
-import org.apache.hadoop.ozone.om.request.key.OMAllocateBlockRequestV1;
+import org.apache.hadoop.ozone.om.request.key.OMAllocateBlockRequestWithFSO;
 import org.apache.hadoop.ozone.om.request.key.OMKeyCommitRequest;
-import org.apache.hadoop.ozone.om.request.key.OMKeyCommitRequestV1;
+import org.apache.hadoop.ozone.om.request.key.OMKeyCommitRequestWithFSO;
 import org.apache.hadoop.ozone.om.request.key.OMKeyCreateRequest;
-import org.apache.hadoop.ozone.om.request.key.OMKeyCreateRequestV1;
+import org.apache.hadoop.ozone.om.request.key.OMKeyCreateRequestWithFSO;
 import org.apache.hadoop.ozone.om.request.key.OMKeyDeleteRequest;
-import org.apache.hadoop.ozone.om.request.key.OMKeyDeleteRequestV1;
+import org.apache.hadoop.ozone.om.request.key.OMKeyDeleteRequestWithFSO;
 import org.apache.hadoop.ozone.om.request.key.OMKeyPurgeRequest;
 import org.apache.hadoop.ozone.om.request.key.OMKeyRenameRequest;
-import org.apache.hadoop.ozone.om.request.key.OMKeyRenameRequestV1;
+import org.apache.hadoop.ozone.om.request.key.OMKeyRenameRequestWithFSO;
 import org.apache.hadoop.ozone.om.request.key.OMKeysRenameRequest;
-import org.apache.hadoop.ozone.om.request.key.OMPathsPurgeRequestV1;
+import org.apache.hadoop.ozone.om.request.key.OMPathsPurgeRequestWithFSO;
 import org.apache.hadoop.ozone.om.request.key.OMTrashRecoverRequest;
 import org.apache.hadoop.ozone.om.request.key.acl.OMKeyAddAclRequest;
-import org.apache.hadoop.ozone.om.request.key.acl.OMKeyAddAclRequestV1;
+import org.apache.hadoop.ozone.om.request.key.acl.OMKeyAddAclRequestWithFSO;
 import org.apache.hadoop.ozone.om.request.key.acl.OMKeyRemoveAclRequest;
-import org.apache.hadoop.ozone.om.request.key.acl.OMKeyRemoveAclRequestV1;
+import org.apache.hadoop.ozone.om.request.key.acl.OMKeyRemoveAclRequestWithFSO;
 import org.apache.hadoop.ozone.om.request.key.acl.OMKeySetAclRequest;
-import org.apache.hadoop.ozone.om.request.key.acl.OMKeySetAclRequestV1;
+import org.apache.hadoop.ozone.om.request.key.acl.OMKeySetAclRequestWithFSO;
 import org.apache.hadoop.ozone.om.request.key.acl.prefix.OMPrefixAddAclRequest;
 import org.apache.hadoop.ozone.om.request.key.acl.prefix.OMPrefixRemoveAclRequest;
 import org.apache.hadoop.ozone.om.request.key.acl.prefix.OMPrefixSetAclRequest;
 import org.apache.hadoop.ozone.om.request.s3.multipart.S3InitiateMultipartUploadRequest;
-import org.apache.hadoop.ozone.om.request.s3.multipart.S3InitiateMultipartUploadRequestV1;
+import org.apache.hadoop.ozone.om.request.s3.multipart.S3InitiateMultipartUploadRequestWithFSO;
 import org.apache.hadoop.ozone.om.request.s3.multipart.S3MultipartUploadAbortRequest;
-import org.apache.hadoop.ozone.om.request.s3.multipart.S3MultipartUploadAbortRequestV1;
+import org.apache.hadoop.ozone.om.request.s3.multipart.S3MultipartUploadAbortRequestWithFSO;
 import org.apache.hadoop.ozone.om.request.s3.multipart.S3MultipartUploadCommitPartRequest;
-import org.apache.hadoop.ozone.om.request.s3.multipart.S3MultipartUploadCommitPartRequestV1;
+import org.apache.hadoop.ozone.om.request.s3.multipart.S3MultipartUploadCommitPartRequestWithFSO;
 import org.apache.hadoop.ozone.om.request.s3.multipart.S3MultipartUploadCompleteRequest;
-import org.apache.hadoop.ozone.om.request.s3.multipart.S3MultipartUploadCompleteRequestV1;
+import org.apache.hadoop.ozone.om.request.s3.multipart.S3MultipartUploadCompleteRequestWithFSO;
 import org.apache.hadoop.ozone.om.request.s3.security.S3GetSecretRequest;
 import org.apache.hadoop.ozone.om.request.security.OMCancelDelegationTokenRequest;
 import org.apache.hadoop.ozone.om.request.security.OMGetDelegationTokenRequest;
@@ -146,65 +146,65 @@ public final class OzoneManagerRatisUtils {
       return new OMBucketSetPropertyRequest(omRequest);
     case AllocateBlock:
       if (isBucketFSOptimized()) {
-        return new OMAllocateBlockRequestV1(omRequest);
+        return new OMAllocateBlockRequestWithFSO(omRequest);
       }
       return new OMAllocateBlockRequest(omRequest);
     case CreateKey:
       if (isBucketFSOptimized()) {
-        return new OMKeyCreateRequestV1(omRequest);
+        return new OMKeyCreateRequestWithFSO(omRequest);
       }
       return new OMKeyCreateRequest(omRequest);
     case CommitKey:
       if (isBucketFSOptimized()) {
-        return new OMKeyCommitRequestV1(omRequest);
+        return new OMKeyCommitRequestWithFSO(omRequest);
       }
       return new OMKeyCommitRequest(omRequest);
     case DeleteKey:
       if (isBucketFSOptimized()) {
-        return new OMKeyDeleteRequestV1(omRequest);
+        return new OMKeyDeleteRequestWithFSO(omRequest);
       }
       return new OMKeyDeleteRequest(omRequest);
     case DeleteKeys:
       return new OMKeysDeleteRequest(omRequest);
     case RenameKey:
       if (isBucketFSOptimized()) {
-        return new OMKeyRenameRequestV1(omRequest);
+        return new OMKeyRenameRequestWithFSO(omRequest);
       }
       return new OMKeyRenameRequest(omRequest);
     case RenameKeys:
       return new OMKeysRenameRequest(omRequest);
     case CreateDirectory:
       if (isBucketFSOptimized()) {
-        return new OMDirectoryCreateRequestV1(omRequest);
+        return new OMDirectoryCreateRequestWithFSO(omRequest);
       }
       return new OMDirectoryCreateRequest(omRequest);
     case CreateFile:
       if (isBucketFSOptimized()) {
-        return new OMFileCreateRequestV1(omRequest);
+        return new OMFileCreateRequestWithFSO(omRequest);
       }
       return new OMFileCreateRequest(omRequest);
     case PurgeKeys:
       return new OMKeyPurgeRequest(omRequest);
     case PurgePaths:
-      return new OMPathsPurgeRequestV1(omRequest);
+      return new OMPathsPurgeRequestWithFSO(omRequest);
     case InitiateMultiPartUpload:
       if (isBucketFSOptimized()) {
-        return new S3InitiateMultipartUploadRequestV1(omRequest);
+        return new S3InitiateMultipartUploadRequestWithFSO(omRequest);
       }
       return new S3InitiateMultipartUploadRequest(omRequest);
     case CommitMultiPartUpload:
       if (isBucketFSOptimized()) {
-        return new S3MultipartUploadCommitPartRequestV1(omRequest);
+        return new S3MultipartUploadCommitPartRequestWithFSO(omRequest);
       }
       return new S3MultipartUploadCommitPartRequest(omRequest);
     case AbortMultiPartUpload:
       if (isBucketFSOptimized()) {
-        return new S3MultipartUploadAbortRequestV1(omRequest);
+        return new S3MultipartUploadAbortRequestWithFSO(omRequest);
       }
       return new S3MultipartUploadAbortRequest(omRequest);
     case CompleteMultiPartUpload:
       if (isBucketFSOptimized()) {
-        return new S3MultipartUploadCompleteRequestV1(omRequest);
+        return new S3MultipartUploadCompleteRequestWithFSO(omRequest);
       }
       return new S3MultipartUploadCompleteRequest(omRequest);
     case AddAcl:
@@ -237,7 +237,7 @@ public final class OzoneManagerRatisUtils {
         return new OMBucketAddAclRequest(omRequest);
       } else if (ObjectType.KEY == type) {
         if (isBucketFSOptimized()){
-          return new OMKeyAddAclRequestV1(omRequest);
+          return new OMKeyAddAclRequestWithFSO(omRequest);
         }
         return new OMKeyAddAclRequest(omRequest);
       } else {
@@ -251,7 +251,7 @@ public final class OzoneManagerRatisUtils {
         return new OMBucketRemoveAclRequest(omRequest);
       } else if (ObjectType.KEY == type) {
         if (isBucketFSOptimized()){
-          return new OMKeyRemoveAclRequestV1(omRequest);
+          return new OMKeyRemoveAclRequestWithFSO(omRequest);
         }
         return new OMKeyRemoveAclRequest(omRequest);
       } else {
@@ -265,7 +265,7 @@ public final class OzoneManagerRatisUtils {
         return new OMBucketSetAclRequest(omRequest);
       } else if (ObjectType.KEY == type) {
         if (isBucketFSOptimized()){
-          return new OMKeySetAclRequestV1(omRequest);
+          return new OMKeySetAclRequestWithFSO(omRequest);
         }
         return new OMKeySetAclRequest(omRequest);
       } else {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketCreateRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketCreateRequest.java
index 5624333..de09e92 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketCreateRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketCreateRequest.java
@@ -158,7 +158,7 @@ public class OMBucketCreateRequest extends OMClientRequest {
         getOmRequest());
     OmBucketInfo omBucketInfo = OmBucketInfo.getFromProtobuf(bucketInfo);
 
-    // Add layout version V1 to bucket info
+    // Add metadata layout to bucket info
     addFSOptimizedBucketDetails(ozoneManager, omBucketInfo);
 
     AuditLogger auditLogger = ozoneManager.getAuditLogger();
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestWithFSO.java
similarity index 94%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestWithFSO.java
index fa66766..bb2ea12 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestWithFSO.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.ozone.om.helpers.OzoneAclUtil;
 import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
 import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
-import org.apache.hadoop.ozone.om.response.file.OMDirectoryCreateResponseV1;
+import org.apache.hadoop.ozone.om.response.file.OMDirectoryCreateResponseWithFSO;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
         .CreateDirectoryRequest;
@@ -66,12 +66,12 @@ import static org.apache.hadoop.ozone.om.request.file.OMFileRequest.OMDirectoryR
  * Handle create directory request. It will add path components to the directory
  * table and maintains file system semantics.
  */
-public class OMDirectoryCreateRequestV1 extends OMDirectoryCreateRequest {
+public class OMDirectoryCreateRequestWithFSO extends OMDirectoryCreateRequest {
 
   private static final Logger LOG =
-      LoggerFactory.getLogger(OMDirectoryCreateRequestV1.class);
+      LoggerFactory.getLogger(OMDirectoryCreateRequestWithFSO.class);
 
-  public OMDirectoryCreateRequestV1(OMRequest omRequest) {
+  public OMDirectoryCreateRequestWithFSO(OMRequest omRequest) {
     super(omRequest);
   }
 
@@ -131,7 +131,7 @@ public class OMDirectoryCreateRequestV1 extends OMDirectoryCreateRequest {
       // Need to check if any files exist in the given path, if they exist we
       // cannot create a directory with the given key.
       // Verify the path against directory table
-      OMFileRequest.OMPathInfoV1 omPathInfo =
+      OMFileRequest.OMPathInfoWithFSO omPathInfo =
           OMFileRequest.verifyDirectoryKeysInPath(omMetadataManager, volumeName,
               bucketName, keyName, keyPath);
       OMFileRequest.OMDirectoryResult omDirectoryResult =
@@ -148,7 +148,7 @@ public class OMDirectoryCreateRequestV1 extends OMDirectoryCreateRequest {
 
         // prepare all missing parents
         missingParentInfos =
-                OMDirectoryCreateRequestV1.getAllMissingParentDirInfo(
+                OMDirectoryCreateRequestWithFSO.getAllMissingParentDirInfo(
                         ozoneManager, keyArgs, omPathInfo, trxnLogIndex);
 
         // prepare leafNode dir
@@ -165,17 +165,18 @@ public class OMDirectoryCreateRequestV1 extends OMDirectoryCreateRequest {
         numKeysCreated = missingParentInfos.size() + 1;
 
         result = OMDirectoryCreateRequest.Result.SUCCESS;
-        omClientResponse = new OMDirectoryCreateResponseV1(omResponse.build(),
-                dirInfo, missingParentInfos, result);
+        omClientResponse =
+            new OMDirectoryCreateResponseWithFSO(omResponse.build(), dirInfo,
+                missingParentInfos, result);
       } else {
         result = Result.DIRECTORY_ALREADY_EXISTS;
         omResponse.setStatus(Status.DIRECTORY_ALREADY_EXISTS);
-        omClientResponse = new OMDirectoryCreateResponseV1(omResponse.build(),
-            result);
+        omClientResponse =
+            new OMDirectoryCreateResponseWithFSO(omResponse.build(), result);
       }
     } catch (IOException ex) {
       exception = ex;
-      omClientResponse = new OMDirectoryCreateResponseV1(
+      omClientResponse = new OMDirectoryCreateResponseWithFSO(
           createErrorOMResponse(omResponse, exception), result);
     } finally {
       addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
@@ -240,7 +241,7 @@ public class OMDirectoryCreateRequestV1 extends OMDirectoryCreateRequest {
    */
   public static List<OmDirectoryInfo> getAllMissingParentDirInfo(
           OzoneManager ozoneManager, KeyArgs keyArgs,
-          OMFileRequest.OMPathInfoV1 pathInfo, long trxnLogIndex)
+          OMFileRequest.OMPathInfoWithFSO pathInfo, long trxnLogIndex)
           throws IOException {
     List<OmDirectoryInfo> missingParentInfos = new ArrayList<>();
 
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestWithFSO.java
similarity index 89%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestWithFSO.java
index 5afaf66..08a665e 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestWithFSO.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
 import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
 import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
-import org.apache.hadoop.ozone.om.response.file.OMFileCreateResponseV1;
+import org.apache.hadoop.ozone.om.response.file.OMFileCreateResponseWithFSO;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.CreateFileRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.CreateFileResponse;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.KeyArgs;
@@ -55,11 +55,11 @@ import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_L
 /**
  * Handles create file request layout version1.
  */
-public class OMFileCreateRequestV1 extends OMFileCreateRequest {
+public class OMFileCreateRequestWithFSO extends OMFileCreateRequest {
 
   private static final Logger LOG =
-      LoggerFactory.getLogger(OMFileCreateRequestV1.class);
-  public OMFileCreateRequestV1(OMRequest omRequest) {
+      LoggerFactory.getLogger(OMFileCreateRequestWithFSO.class);
+  public OMFileCreateRequestWithFSO(OMRequest omRequest) {
     super(omRequest);
   }
 
@@ -127,15 +127,15 @@ public class OMFileCreateRequestV1 extends OMFileCreateRequest {
 
       OmKeyInfo dbFileInfo = null;
 
-      OMFileRequest.OMPathInfoV1 pathInfoV1 =
+      OMFileRequest.OMPathInfoWithFSO pathInfoFSO =
               OMFileRequest.verifyDirectoryKeysInPath(omMetadataManager,
                       volumeName, bucketName, keyName, Paths.get(keyName));
 
-      if (pathInfoV1.getDirectoryResult()
+      if (pathInfoFSO.getDirectoryResult()
               == OMFileRequest.OMDirectoryResult.FILE_EXISTS) {
         String dbFileKey = omMetadataManager.getOzonePathKey(
-                pathInfoV1.getLastKnownParentId(),
-                pathInfoV1.getLeafNodeName());
+                pathInfoFSO.getLastKnownParentId(),
+                pathInfoFSO.getLeafNodeName());
         dbFileInfo = OMFileRequest.getOmKeyInfoFromFileTable(false,
                 omMetadataManager, dbFileKey, keyName);
         if (dbFileInfo != null) {
@@ -145,16 +145,16 @@ public class OMFileCreateRequestV1 extends OMFileCreateRequest {
 
       // check if the file or directory already existed in OM
       checkDirectoryResult(keyName, isOverWrite,
-              pathInfoV1.getDirectoryResult());
+              pathInfoFSO.getDirectoryResult());
 
       if (!isRecursive) {
-        checkAllParentsExist(keyArgs, pathInfoV1);
+        checkAllParentsExist(keyArgs, pathInfoFSO);
       }
 
       // add all missing parents to dir table
       missingParentInfos =
-              OMDirectoryCreateRequestV1.getAllMissingParentDirInfo(
-                      ozoneManager, keyArgs, pathInfoV1, trxnLogIndex);
+              OMDirectoryCreateRequestWithFSO.getAllMissingParentDirInfo(
+                      ozoneManager, keyArgs, pathInfoFSO, trxnLogIndex);
 
       // total number of keys created.
       numKeysCreated = missingParentInfos.size();
@@ -166,15 +166,15 @@ public class OMFileCreateRequestV1 extends OMFileCreateRequest {
       OmKeyInfo omFileInfo = prepareFileInfo(omMetadataManager, keyArgs,
               dbFileInfo, keyArgs.getDataSize(), locations,
               getFileEncryptionInfo(keyArgs), ozoneManager.getPrefixManager(),
-              bucketInfo, pathInfoV1, trxnLogIndex,
-              pathInfoV1.getLeafNodeObjectId(),
+              bucketInfo, pathInfoFSO, trxnLogIndex,
+              pathInfoFSO.getLeafNodeObjectId(),
               ozoneManager.isRatisEnabled());
 
       long openVersion = omFileInfo.getLatestVersionLocations().getVersion();
       long clientID = createFileRequest.getClientID();
-      String dbOpenFileName = omMetadataManager.getOpenFileName(
-              pathInfoV1.getLastKnownParentId(), pathInfoV1.getLeafNodeName(),
-              clientID);
+      String dbOpenFileName = omMetadataManager
+          .getOpenFileName(pathInfoFSO.getLastKnownParentId(),
+              pathInfoFSO.getLeafNodeName(), clientID);
 
       // Append new blocks
       List<OmKeyLocationInfo> newLocationList = keyArgs.getKeyLocationsList()
@@ -194,7 +194,7 @@ public class OMFileCreateRequestV1 extends OMFileCreateRequest {
       // Even if bucket gets deleted, when commitKey we shall identify if
       // bucket gets deleted.
       OMFileRequest.addOpenFileTableCacheEntry(omMetadataManager,
-              dbOpenFileName, omFileInfo, pathInfoV1.getLeafNodeName(),
+              dbOpenFileName, omFileInfo, pathInfoFSO.getLeafNodeName(),
               trxnLogIndex);
 
       // Add cache entries for the prefix directories.
@@ -215,7 +215,7 @@ public class OMFileCreateRequestV1 extends OMFileCreateRequest {
           .setID(clientID)
           .setOpenVersion(openVersion).build())
           .setCmdType(Type.CreateFile);
-      omClientResponse = new OMFileCreateResponseV1(omResponse.build(),
+      omClientResponse = new OMFileCreateResponseWithFSO(omResponse.build(),
               omFileInfo, missingParentInfos, clientID,
               omBucketInfo.copyObject());
 
@@ -225,7 +225,7 @@ public class OMFileCreateRequestV1 extends OMFileCreateRequest {
       exception = ex;
       omMetrics.incNumCreateFileFails();
       omResponse.setCmdType(Type.CreateFile);
-      omClientResponse = new OMFileCreateResponseV1(createErrorOMResponse(
+      omClientResponse = new OMFileCreateResponseWithFSO(createErrorOMResponse(
             omResponse, exception));
     } finally {
       addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
index 27eda71..73c53b5 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
@@ -157,10 +157,10 @@ public final class OMFileRequest {
    * @param bucketName        bucket name
    * @param keyName           key name
    * @param keyPath           path
-   * @return OMPathInfoV1 path info object
+   * @return OMPathInfoWithFSO path info object
    * @throws IOException on DB failure
    */
-  public static OMPathInfoV1 verifyDirectoryKeysInPath(
+  public static OMPathInfoWithFSO verifyDirectoryKeysInPath(
           @Nonnull OMMetadataManager omMetadataManager,
           @Nonnull String volumeName,
           @Nonnull String bucketName, @Nonnull String keyName,
@@ -246,7 +246,7 @@ public final class OMFileRequest {
 
     if (result == OMDirectoryResult.FILE_EXISTS_IN_GIVENPATH || result ==
             OMDirectoryResult.FILE_EXISTS) {
-      return new OMPathInfoV1(leafNodeName, lastKnownParentId, missing,
+      return new OMPathInfoWithFSO(leafNodeName, lastKnownParentId, missing,
               result, inheritAcls, fullKeyPath.toString());
     }
 
@@ -255,7 +255,7 @@ public final class OMFileRequest {
     LOG.trace("Acls inherited from parent " + dbDirKeyName + " are : "
             + inheritAcls);
 
-    return new OMPathInfoV1(leafNodeName, lastKnownParentId, missing,
+    return new OMPathInfoWithFSO(leafNodeName, lastKnownParentId, missing,
             result, inheritAcls);
   }
 
@@ -264,13 +264,13 @@ public final class OMFileRequest {
    * Includes the list of missing intermediate directories and
    * the directory search result code.
    */
-  public static class OMPathInfoV1 extends OMPathInfo{
+  public static class OMPathInfoWithFSO extends OMPathInfo{
     private String leafNodeName;
     private long lastKnownParentId;
     private long leafNodeObjectId;
     private String fileExistsInPath;
 
-    public OMPathInfoV1(String leafNodeName, long lastKnownParentId,
+    public OMPathInfoWithFSO(String leafNodeName, long lastKnownParentId,
                         List missingParents, OMDirectoryResult result,
                         List<OzoneAcl> aclList, String fileExistsInPath) {
       super(missingParents, result, aclList);
@@ -279,7 +279,7 @@ public final class OMFileRequest {
       this.fileExistsInPath = fileExistsInPath;
     }
 
-    public OMPathInfoV1(String leafNodeName, long lastKnownParentId,
+    public OMPathInfoWithFSO(String leafNodeName, long lastKnownParentId,
                         List missingParents, OMDirectoryResult result,
                         List<OzoneAcl> aclList) {
       this(leafNodeName, lastKnownParentId, missingParents, result, aclList,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestWithFSO.java
similarity index 95%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestWithFSO.java
index a4d581c..b09352a 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestWithFSO.java
@@ -34,7 +34,7 @@ import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
 import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
 import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
-import org.apache.hadoop.ozone.om.response.key.OMAllocateBlockResponseV1;
+import org.apache.hadoop.ozone.om.response.key.OMAllocateBlockResponseWithFSO;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.AllocateBlockRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.AllocateBlockResponse;
@@ -58,14 +58,14 @@ import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.KEY_
 import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_LOCK;
 
 /**
- * Handles allocate block request layout version V1.
+ * Handles allocate block request - prefix layout.
  */
-public class OMAllocateBlockRequestV1 extends OMAllocateBlockRequest {
+public class OMAllocateBlockRequestWithFSO extends OMAllocateBlockRequest {
 
   private static final Logger LOG =
-          LoggerFactory.getLogger(OMAllocateBlockRequestV1.class);
+          LoggerFactory.getLogger(OMAllocateBlockRequestWithFSO.class);
 
-  public OMAllocateBlockRequestV1(OMRequest omRequest) {
+  public OMAllocateBlockRequestWithFSO(OMRequest omRequest) {
     super(omRequest);
   }
 
@@ -166,8 +166,8 @@ public class OMAllocateBlockRequestV1 extends OMAllocateBlockRequest {
     } catch (IOException ex) {
       omMetrics.incNumBlockAllocateCallFails();
       exception = ex;
-      omClientResponse = new OMAllocateBlockResponseV1(createErrorOMResponse(
-              omResponse, exception));
+      omClientResponse = new OMAllocateBlockResponseWithFSO(
+          createErrorOMResponse(omResponse, exception));
       LOG.error("Allocate Block failed. Volume:{}, Bucket:{}, OpenKey:{}. " +
               "Exception:{}", volumeName, bucketName, openKeyName, exception);
     } finally {
@@ -220,7 +220,7 @@ public class OMAllocateBlockRequestV1 extends OMAllocateBlockRequest {
   private OMClientResponse getOmClientResponse(long clientID,
       OMResponse.Builder omResponse, OmKeyInfo openKeyInfo,
       OmBucketInfo omBucketInfo) {
-    return new OMAllocateBlockResponseV1(omResponse.build(), openKeyInfo,
+    return new OMAllocateBlockResponseWithFSO(omResponse.build(), openKeyInfo,
             clientID, omBucketInfo);
   }
 }
\ No newline at end of file
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java
similarity index 94%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java
index 64991de..e97939e 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java
@@ -32,15 +32,13 @@ import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
 import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
 import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
-import org.apache.hadoop.ozone.om.response.key.OMKeyCommitResponseV1;
+import org.apache.hadoop.ozone.om.response.key.OMKeyCommitResponseWithFSO;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.CommitKeyRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.KeyArgs;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.KeyLocation;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
 import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -54,14 +52,11 @@ import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.KEY_
 import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_LOCK;
 
 /**
- * Handles CommitKey request layout version V1.
+ * Handles CommitKey request - prefix layout.
  */
-public class OMKeyCommitRequestV1 extends OMKeyCommitRequest {
+public class OMKeyCommitRequestWithFSO extends OMKeyCommitRequest {
 
-  private static final Logger LOG =
-          LoggerFactory.getLogger(OMKeyCommitRequestV1.class);
-
-  public OMKeyCommitRequestV1(OMRequest omRequest) {
+  public OMKeyCommitRequestWithFSO(OMRequest omRequest) {
     super(omRequest);
   }
 
@@ -165,14 +160,14 @@ public class OMKeyCommitRequestV1 extends OMKeyCommitRequest {
               locationInfoList.size() * scmBlockSize * factor;
       omBucketInfo.incrUsedBytes(correctedSpace);
 
-      omClientResponse = new OMKeyCommitResponseV1(omResponse.build(),
+      omClientResponse = new OMKeyCommitResponseWithFSO(omResponse.build(),
               omKeyInfo, dbFileKey, dbOpenFileKey, omBucketInfo.copyObject());
 
       result = Result.SUCCESS;
     } catch (IOException ex) {
       result = Result.FAILURE;
       exception = ex;
-      omClientResponse = new OMKeyCommitResponseV1(createErrorOMResponse(
+      omClientResponse = new OMKeyCommitResponseWithFSO(createErrorOMResponse(
               omResponse, exception));
     } finally {
       addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
similarity index 84%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
index c01c9ee..3662013 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
@@ -29,19 +29,17 @@ import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
 import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
 import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
 import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
-import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequestV1;
+import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequestWithFSO;
 import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
 import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
-import org.apache.hadoop.ozone.om.response.key.OMKeyCreateResponseV1;
+import org.apache.hadoop.ozone.om.response.key.OMKeyCreateResponseWithFSO;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.CreateKeyResponse;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type;
 import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
 import org.apache.hadoop.ozone.security.acl.OzoneObj;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.nio.file.Paths;
@@ -58,11 +56,9 @@ import static org.apache.hadoop.ozone.om.request.file.OMFileRequest.OMDirectoryR
 /**
  * Handles CreateKey request layout version1.
  */
-public class OMKeyCreateRequestV1 extends OMKeyCreateRequest {
-  private static final Logger LOG =
-          LoggerFactory.getLogger(OMKeyCreateRequestV1.class);
+public class OMKeyCreateRequestWithFSO extends OMKeyCreateRequest {
 
-  public OMKeyCreateRequestV1(OMRequest omRequest) {
+  public OMKeyCreateRequestWithFSO(OMRequest omRequest) {
     super(omRequest);
   }
 
@@ -111,15 +107,15 @@ public class OMKeyCreateRequestV1 extends OMKeyCreateRequest {
 
       OmKeyInfo dbFileInfo = null;
 
-      OMFileRequest.OMPathInfoV1 pathInfoV1 =
+      OMFileRequest.OMPathInfoWithFSO pathInfoFSO =
               OMFileRequest.verifyDirectoryKeysInPath(omMetadataManager,
                       volumeName, bucketName, keyName, Paths.get(keyName));
 
-      if (pathInfoV1.getDirectoryResult()
+      if (pathInfoFSO.getDirectoryResult()
               == OMFileRequest.OMDirectoryResult.FILE_EXISTS) {
         String dbFileKey = omMetadataManager.getOzonePathKey(
-                pathInfoV1.getLastKnownParentId(),
-                pathInfoV1.getLeafNodeName());
+                pathInfoFSO.getLastKnownParentId(),
+                pathInfoFSO.getLeafNodeName());
         dbFileInfo = OMFileRequest.getOmKeyInfoFromFileTable(false,
                 omMetadataManager, dbFileKey, keyName);
         if (dbFileInfo != null) {
@@ -128,19 +124,20 @@ public class OMKeyCreateRequestV1 extends OMKeyCreateRequest {
       }
 
       // Check if a file or directory exists with same key name.
-      if (pathInfoV1.getDirectoryResult() == DIRECTORY_EXISTS) {
-        throw new OMException("Cannot write to " +
-                "directory. createIntermediateDirs behavior is enabled and " +
-                "hence / has special interpretation: " + keyName, NOT_A_FILE);
-      } else if (pathInfoV1.getDirectoryResult() == FILE_EXISTS_IN_GIVENPATH) {
-        throw new OMException("Can not create file: " + keyName +
-                " as there is already file in the given path", NOT_A_FILE);
+      if (pathInfoFSO.getDirectoryResult() == DIRECTORY_EXISTS) {
+        throw new OMException("Cannot write to "
+            + "directory. createIntermediateDirs behavior is enabled and "
+            + "hence / has special interpretation: " + keyName, NOT_A_FILE);
+      } else if (pathInfoFSO.getDirectoryResult()
+          == FILE_EXISTS_IN_GIVENPATH) {
+        throw new OMException("Can not create file: " + keyName
+            + " as there is already file in the given path", NOT_A_FILE);
       }
 
       // add all missing parents to dir table
       missingParentInfos =
-              OMDirectoryCreateRequestV1.getAllMissingParentDirInfo(
-                      ozoneManager, keyArgs, pathInfoV1, trxnLogIndex);
+              OMDirectoryCreateRequestWithFSO.getAllMissingParentDirInfo(
+                      ozoneManager, keyArgs, pathInfoFSO, trxnLogIndex);
 
       // total number of keys created.
       numKeysCreated = missingParentInfos.size();
@@ -152,15 +149,15 @@ public class OMKeyCreateRequestV1 extends OMKeyCreateRequest {
       OmKeyInfo omFileInfo = prepareFileInfo(omMetadataManager, keyArgs,
               dbFileInfo, keyArgs.getDataSize(), locations,
               getFileEncryptionInfo(keyArgs), ozoneManager.getPrefixManager(),
-              bucketInfo, pathInfoV1, trxnLogIndex,
-              pathInfoV1.getLeafNodeObjectId(),
+              bucketInfo, pathInfoFSO, trxnLogIndex,
+              pathInfoFSO.getLeafNodeObjectId(),
               ozoneManager.isRatisEnabled());
 
       long openVersion = omFileInfo.getLatestVersionLocations().getVersion();
       long clientID = createKeyRequest.getClientID();
-      String dbOpenFileName = omMetadataManager.getOpenFileName(
-              pathInfoV1.getLastKnownParentId(), pathInfoV1.getLeafNodeName(),
-              clientID);
+      String dbOpenFileName = omMetadataManager
+          .getOpenFileName(pathInfoFSO.getLastKnownParentId(),
+              pathInfoFSO.getLeafNodeName(), clientID);
 
       // Append new blocks
       List<OmKeyLocationInfo> newLocationList = keyArgs.getKeyLocationsList()
@@ -180,7 +177,7 @@ public class OMKeyCreateRequestV1 extends OMKeyCreateRequest {
       // Even if bucket gets deleted, when commitKey we shall identify if
       // bucket gets deleted.
       OMFileRequest.addOpenFileTableCacheEntry(omMetadataManager,
-              dbOpenFileName, omFileInfo, pathInfoV1.getLeafNodeName(),
+              dbOpenFileName, omFileInfo, pathInfoFSO.getLeafNodeName(),
               trxnLogIndex);
 
       // Add cache entries for the prefix directories.
@@ -201,7 +198,7 @@ public class OMKeyCreateRequestV1 extends OMKeyCreateRequest {
               .setID(clientID)
               .setOpenVersion(openVersion).build())
               .setCmdType(Type.CreateKey);
-      omClientResponse = new OMKeyCreateResponseV1(omResponse.build(),
+      omClientResponse = new OMKeyCreateResponseWithFSO(omResponse.build(),
               omFileInfo, missingParentInfos, clientID,
               omBucketInfo.copyObject());
 
@@ -211,7 +208,7 @@ public class OMKeyCreateRequestV1 extends OMKeyCreateRequest {
       exception = ex;
       omMetrics.incNumKeyAllocateFails();
       omResponse.setCmdType(Type.CreateKey);
-      omClientResponse = new OMKeyCreateResponseV1(
+      omClientResponse = new OMKeyCreateResponseWithFSO(
               createErrorOMResponse(omResponse, exception));
     } finally {
       addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestWithFSO.java
similarity index 95%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestWithFSO.java
index 87427f8..8dfc8d5 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestWithFSO.java
@@ -35,7 +35,7 @@ import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
 import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
 import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
-import org.apache.hadoop.ozone.om.response.key.OMKeyDeleteResponseV1;
+import org.apache.hadoop.ozone.om.response.key.OMKeyDeleteResponseWithFSO;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.DeleteKeyRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.DeleteKeyResponse;
@@ -53,14 +53,14 @@ import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.KEY_
 import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_LOCK;
 
 /**
- * Handles DeleteKey request layout version V1.
+ * Handles DeleteKey request - prefix layout.
  */
-public class OMKeyDeleteRequestV1 extends OMKeyDeleteRequest {
+public class OMKeyDeleteRequestWithFSO extends OMKeyDeleteRequest {
 
   private static final Logger LOG =
-      LoggerFactory.getLogger(OMKeyDeleteRequestV1.class);
+      LoggerFactory.getLogger(OMKeyDeleteRequestWithFSO.class);
 
-  public OMKeyDeleteRequestV1(OMRequest omRequest) {
+  public OMKeyDeleteRequestWithFSO(OMRequest omRequest) {
     super(omRequest);
   }
 
@@ -159,7 +159,7 @@ public class OMKeyDeleteRequestV1 extends OMKeyDeleteRequest {
       // validation, so we don't need to add to cache.
       // TODO: Revisit if we need it later.
 
-      omClientResponse = new OMKeyDeleteResponseV1(omResponse
+      omClientResponse = new OMKeyDeleteResponseWithFSO(omResponse
           .setDeleteKeyResponse(DeleteKeyResponse.newBuilder()).build(),
           keyName, omKeyInfo, ozoneManager.isRatisEnabled(),
           omBucketInfo.copyObject(), keyStatus.isDirectory());
@@ -168,7 +168,7 @@ public class OMKeyDeleteRequestV1 extends OMKeyDeleteRequest {
     } catch (IOException ex) {
       result = Result.FAILURE;
       exception = ex;
-      omClientResponse = new OMKeyDeleteResponseV1(
+      omClientResponse = new OMKeyDeleteResponseWithFSO(
           createErrorOMResponse(omResponse, exception));
     } finally {
       addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
similarity index 95%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
index 4ab9d3a..86fe2e9 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
@@ -37,7 +37,7 @@ import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
 import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
 import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
-import org.apache.hadoop.ozone.om.response.key.OMKeyRenameResponseV1;
+import org.apache.hadoop.ozone.om.response.key.OMKeyRenameResponseWithFSO;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
     .KeyArgs;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
@@ -58,14 +58,14 @@ import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.KEY_
 import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_LOCK;
 
 /**
- * Handles rename key request layout version V1.
+ * Handles rename key request - prefix layout.
  */
-public class OMKeyRenameRequestV1 extends OMKeyRenameRequest {
+public class OMKeyRenameRequestWithFSO extends OMKeyRenameRequest {
 
   private static final Logger LOG =
-          LoggerFactory.getLogger(OMKeyRenameRequestV1.class);
+          LoggerFactory.getLogger(OMKeyRenameRequestWithFSO.class);
 
-  public OMKeyRenameRequestV1(OMRequest omRequest) {
+  public OMKeyRenameRequestWithFSO(OMRequest omRequest) {
     super(omRequest);
   }
 
@@ -207,7 +207,7 @@ public class OMKeyRenameRequestV1 extends OMKeyRenameRequest {
     } catch (IOException ex) {
       result = Result.FAILURE;
       exception = ex;
-      omClientResponse = new OMKeyRenameResponseV1(createErrorOMResponse(
+      omClientResponse = new OMKeyRenameResponseWithFSO(createErrorOMResponse(
               omResponse, exception));
     } finally {
       addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
@@ -284,9 +284,9 @@ public class OMKeyRenameRequestV1 extends OMKeyRenameRequest {
               new CacheValue<>(Optional.of(fromKeyValue), trxnLogIndex));
     }
 
-    OMClientResponse omClientResponse = new OMKeyRenameResponseV1(omResponse
-            .setRenameKeyResponse(RenameKeyResponse.newBuilder()).build(),
-            dbFromKey, dbToKey, fromKeyValue, isRenameDirectory);
+    OMClientResponse omClientResponse = new OMKeyRenameResponseWithFSO(
+        omResponse.setRenameKeyResponse(RenameKeyResponse.newBuilder()).build(),
+        dbFromKey, dbToKey, fromKeyValue, isRenameDirectory);
     return omClientResponse;
   }
 
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
index 4c4d097..1130b64 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
@@ -592,7 +592,7 @@ public abstract class OMKeyRequest extends OMClientRequest {
           @Nullable FileEncryptionInfo encInfo,
           @Nonnull PrefixManager prefixManager,
           @Nullable OmBucketInfo omBucketInfo,
-          OMFileRequest.OMPathInfoV1 omPathInfo,
+          OMFileRequest.OMPathInfoWithFSO omPathInfo,
           long transactionLogIndex, long objectID,
           boolean isRatisEnabled)
           throws IOException {
@@ -636,7 +636,7 @@ public abstract class OMKeyRequest extends OMClientRequest {
       @Nullable FileEncryptionInfo encInfo,
       @Nonnull PrefixManager prefixManager,
       @Nullable OmBucketInfo omBucketInfo,
-      OMFileRequest.OMPathInfoV1 omPathInfo,
+      OMFileRequest.OMPathInfoWithFSO omPathInfo,
       long transactionLogIndex, long objectID) {
 
     OmKeyInfo.Builder builder = new OmKeyInfo.Builder();
@@ -678,7 +678,7 @@ public abstract class OMKeyRequest extends OMClientRequest {
           @Nonnull List<OmKeyLocationInfo> locations,
           FileEncryptionInfo encInfo,  @Nonnull PrefixManager prefixManager,
           @Nullable OmBucketInfo omBucketInfo,
-          OMFileRequest.OMPathInfoV1 omPathInfo,
+          OMFileRequest.OMPathInfoWithFSO omPathInfo,
           @Nonnull long transactionLogIndex, long objectID)
           throws IOException {
     HddsProtos.ReplicationFactor factor;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMPathsPurgeRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMPathsPurgeRequestWithFSO.java
similarity index 94%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMPathsPurgeRequestV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMPathsPurgeRequestWithFSO.java
index b9d6066..4515cd5 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMPathsPurgeRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMPathsPurgeRequestWithFSO.java
@@ -22,7 +22,7 @@ import org.apache.hadoop.ozone.om.OzoneManager;
 import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
 import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
-import org.apache.hadoop.ozone.om.response.key.OMPathsPurgeResponseV1;
+import org.apache.hadoop.ozone.om.response.key.OMPathsPurgeResponseWithFSO;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
@@ -32,9 +32,9 @@ import java.util.List;
 /**
  * Handles purging of keys from OM DB.
  */
-public class OMPathsPurgeRequestV1 extends OMKeyRequest {
+public class OMPathsPurgeRequestWithFSO extends OMKeyRequest {
 
-  public OMPathsPurgeRequestV1(OMRequest omRequest) {
+  public OMPathsPurgeRequestWithFSO(OMRequest omRequest) {
     super(omRequest);
   }
 
@@ -53,7 +53,7 @@ public class OMPathsPurgeRequestV1 extends OMKeyRequest {
     OMResponse.Builder omResponse = OmResponseUtil.getOMResponseBuilder(
         getOmRequest());
 
-    OMClientResponse omClientResponse = new OMPathsPurgeResponseV1(
+    OMClientResponse omClientResponse = new OMPathsPurgeResponseWithFSO(
         omResponse.build(), markDeletedSubDirsList, deletedSubFilesList,
         deletedDirsList, ozoneManager.isRatisEnabled());
     addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequestWithFSO.java
similarity index 93%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequestV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequestWithFSO.java
index 3dfb29e..c264300 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequestWithFSO.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
 import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
 import org.apache.hadoop.ozone.om.request.util.ObjectParser;
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
-import org.apache.hadoop.ozone.om.response.key.acl.OMKeyAclResponseV1;
+import org.apache.hadoop.ozone.om.response.key.acl.OMKeyAclResponseWithFSO;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
 import org.apache.hadoop.ozone.security.acl.OzoneObj;
@@ -44,12 +44,12 @@ import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_L
 
 
 /**
- * Handles key ACL requests layout version V1.
+ * Handles key ACL requests - prefix layout.
  */
-public abstract class OMKeyAclRequestV1 extends OMKeyAclRequest {
+public abstract class OMKeyAclRequestWithFSO extends OMKeyAclRequest {
 
-  public OMKeyAclRequestV1(OzoneManagerProtocolProtos.OMRequest omRequest) {
-    super(omRequest);
+  public OMKeyAclRequestWithFSO(OzoneManagerProtocolProtos.OMRequest omReq) {
+    super(omReq);
   }
 
   @Override
@@ -148,14 +148,16 @@ public abstract class OMKeyAclRequestV1 extends OMKeyAclRequest {
   /**
    * Get the om client response on failure case with lock.
    *
-   * @param omResponse
+   * @param omResp
    * @param exception
    * @return OMClientResponse
    */
-  @Override OMClientResponse onFailure(
-      OzoneManagerProtocolProtos.OMResponse.Builder omResponse,
+  @Override
+  OMClientResponse onFailure(
+      OzoneManagerProtocolProtos.OMResponse.Builder omResp,
       IOException exception) {
-    return new OMKeyAclResponseV1(createErrorOMResponse(omResponse, exception));
+    return new OMKeyAclResponseWithFSO(
+        createErrorOMResponse(omResp, exception));
   }
 
   abstract OMClientResponse onSuccess(
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAddAclRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAddAclRequestWithFSO.java
similarity index 91%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAddAclRequestV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAddAclRequestWithFSO.java
index dbe0289..e62387c 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAddAclRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAddAclRequestWithFSO.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
 import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
 import org.apache.hadoop.ozone.om.response.key.acl.OMKeyAclResponse;
-import org.apache.hadoop.ozone.om.response.key.acl.OMKeyAclResponseV1;
+import org.apache.hadoop.ozone.om.response.key.acl.OMKeyAclResponseWithFSO;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.ozone.security.acl.OzoneObj;
 import org.apache.hadoop.ozone.security.acl.OzoneObjInfo;
@@ -41,14 +41,15 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * Handle add Acl request for bucket for layout version V1.
+ * Handle add Acl request for bucket for prefix layout.
  */
-public class OMKeyAddAclRequestV1 extends OMKeyAclRequestV1 {
+public class OMKeyAddAclRequestWithFSO extends OMKeyAclRequestWithFSO {
 
   private static final Logger LOG =
-      LoggerFactory.getLogger(OMKeyAddAclRequestV1.class);
+      LoggerFactory.getLogger(OMKeyAddAclRequestWithFSO.class);
 
-  @Override public OzoneManagerProtocolProtos.OMRequest preExecute(
+  @Override
+  public OzoneManagerProtocolProtos.OMRequest preExecute(
       OzoneManager ozoneManager) throws IOException {
     long modificationTime = Time.now();
     OzoneManagerProtocolProtos.AddAclRequest.Builder addAclRequestBuilder =
@@ -63,8 +64,9 @@ public class OMKeyAddAclRequestV1 extends OMKeyAclRequestV1 {
   private List<OzoneAcl> ozoneAcls;
   private OzoneObj obj;
 
-  public OMKeyAddAclRequestV1(OzoneManagerProtocolProtos.OMRequest omRequest) {
-    super(omRequest);
+  public OMKeyAddAclRequestWithFSO(
+      OzoneManagerProtocolProtos.OMRequest omReq) {
+    super(omReq);
     OzoneManagerProtocolProtos.AddAclRequest addAclRequest =
         getOmRequest().getAddAclRequest();
     obj = OzoneObjInfo.fromProtobuf(addAclRequest.getObj());
@@ -139,11 +141,11 @@ public class OMKeyAddAclRequestV1 extends OMKeyAclRequestV1 {
 
   @Override OMClientResponse onSuccess(
       OzoneManagerProtocolProtos.OMResponse.Builder omResponse,
-      OmKeyInfo omKeyInfo, boolean operationResult, boolean isDirectory) {
+      OmKeyInfo omKeyInfo, boolean operationResult, boolean isDir) {
     omResponse.setSuccess(operationResult);
     omResponse.setAddAclResponse(
         OzoneManagerProtocolProtos.AddAclResponse.newBuilder()
             .setResponse(operationResult));
-    return new OMKeyAclResponseV1(omResponse.build(), omKeyInfo, isDirectory);
+    return new OMKeyAclResponseWithFSO(omResponse.build(), omKeyInfo, isDir);
   }
 }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyRemoveAclRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyRemoveAclRequestWithFSO.java
similarity index 86%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyRemoveAclRequestV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyRemoveAclRequestWithFSO.java
index 2d377d1..dfd2c7a 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyRemoveAclRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyRemoveAclRequestWithFSO.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
 import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
 import org.apache.hadoop.ozone.om.response.key.acl.OMKeyAclResponse;
-import org.apache.hadoop.ozone.om.response.key.acl.OMKeyAclResponseV1;
+import org.apache.hadoop.ozone.om.response.key.acl.OMKeyAclResponseWithFSO;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.ozone.security.acl.OzoneObj;
 import org.apache.hadoop.ozone.security.acl.OzoneObjInfo;
@@ -41,14 +41,15 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * Handle remove Acl request for bucket for layout version V1.
+ * Handle remove Acl request for bucket for prefix layout.
  */
-public class OMKeyRemoveAclRequestV1 extends OMKeyAclRequestV1 {
+public class OMKeyRemoveAclRequestWithFSO extends OMKeyAclRequestWithFSO {
 
   private static final Logger LOG =
-      LoggerFactory.getLogger(OMKeyRemoveAclRequestV1.class);
+      LoggerFactory.getLogger(OMKeyRemoveAclRequestWithFSO.class);
 
-  @Override public OzoneManagerProtocolProtos.OMRequest preExecute(
+  @Override
+  public OzoneManagerProtocolProtos.OMRequest preExecute(
       OzoneManager ozoneManager) throws IOException {
     long modificationTime = Time.now();
     OzoneManagerProtocolProtos.RemoveAclRequest.Builder
@@ -65,7 +66,7 @@ public class OMKeyRemoveAclRequestV1 extends OMKeyAclRequestV1 {
   private List<OzoneAcl> ozoneAcls;
   private OzoneObj obj;
 
-  public OMKeyRemoveAclRequestV1(
+  public OMKeyRemoveAclRequestWithFSO(
       OzoneManagerProtocolProtos.OMRequest omRequest) {
     super(omRequest);
     OzoneManagerProtocolProtos.RemoveAclRequest removeAclRequest =
@@ -76,19 +77,23 @@ public class OMKeyRemoveAclRequestV1 extends OMKeyAclRequestV1 {
         Lists.newArrayList(OzoneAcl.fromProtobuf(removeAclRequest.getAcl()));
   }
 
-  @Override String getPath() {
+  @Override
+  String getPath() {
     return path;
   }
 
-  @Override OzoneObj getObject() {
+  @Override
+  OzoneObj getObject() {
     return obj;
   }
 
-  @Override OzoneManagerProtocolProtos.OMResponse.Builder onInit() {
+  @Override
+  OzoneManagerProtocolProtos.OMResponse.Builder onInit() {
     return OmResponseUtil.getOMResponseBuilder(getOmRequest());
   }
 
-  @Override OMClientResponse onSuccess(
+  @Override
+  OMClientResponse onSuccess(
       OzoneManagerProtocolProtos.OMResponse.Builder omResponse,
       OmKeyInfo omKeyInfo, boolean operationResult) {
     omResponse.setSuccess(operationResult);
@@ -98,7 +103,8 @@ public class OMKeyRemoveAclRequestV1 extends OMKeyAclRequestV1 {
     return new OMKeyAclResponse(omResponse.build(), omKeyInfo);
   }
 
-  @Override void onComplete(Result result, boolean operationResult,
+  @Override
+  void onComplete(Result result, boolean operationResult,
       IOException exception, long trxnLogIndex, AuditLogger auditLogger,
       Map<String, String> auditMap) {
     switch (result) {
@@ -128,7 +134,8 @@ public class OMKeyRemoveAclRequestV1 extends OMKeyAclRequestV1 {
             getOmRequest().getUserInfo()));
   }
 
-  @Override boolean apply(OmKeyInfo omKeyInfo, long trxnLogIndex) {
+  @Override
+  boolean apply(OmKeyInfo omKeyInfo, long trxnLogIndex) {
     // No need to check not null here, this will be never called with null.
     return omKeyInfo.removeAcl(ozoneAcls.get(0));
   }
@@ -141,13 +148,14 @@ public class OMKeyRemoveAclRequestV1 extends OMKeyAclRequestV1 {
         omDoubleBufferHelper);
   }
 
-  @Override OMClientResponse onSuccess(
+  @Override
+  OMClientResponse onSuccess(
       OzoneManagerProtocolProtos.OMResponse.Builder omResponse,
-      OmKeyInfo omKeyInfo, boolean operationResult, boolean isDirectory) {
+      OmKeyInfo omKeyInfo, boolean operationResult, boolean isDir) {
     omResponse.setSuccess(operationResult);
     omResponse.setRemoveAclResponse(
         OzoneManagerProtocolProtos.RemoveAclResponse.newBuilder()
             .setResponse(operationResult));
-    return new OMKeyAclResponseV1(omResponse.build(), omKeyInfo, isDirectory);
+    return new OMKeyAclResponseWithFSO(omResponse.build(), omKeyInfo, isDir);
   }
 }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeySetAclRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeySetAclRequestWithFSO.java
similarity index 85%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeySetAclRequestV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeySetAclRequestWithFSO.java
index 6b6811e..20598e8 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeySetAclRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeySetAclRequestWithFSO.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
 import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
 import org.apache.hadoop.ozone.om.response.key.acl.OMKeyAclResponse;
-import org.apache.hadoop.ozone.om.response.key.acl.OMKeyAclResponseV1;
+import org.apache.hadoop.ozone.om.response.key.acl.OMKeyAclResponseWithFSO;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.ozone.security.acl.OzoneObj;
 import org.apache.hadoop.ozone.security.acl.OzoneObjInfo;
@@ -42,14 +42,15 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * Handle set Acl request for bucket for layout version V1.
+ * Handle set Acl request for bucket for prefix layout.
  */
-public class OMKeySetAclRequestV1 extends OMKeyAclRequestV1 {
+public class OMKeySetAclRequestWithFSO extends OMKeyAclRequestWithFSO {
 
   private static final Logger LOG =
-      LoggerFactory.getLogger(OMKeySetAclRequestV1.class);
+      LoggerFactory.getLogger(OMKeySetAclRequestWithFSO.class);
 
-  @Override public OzoneManagerProtocolProtos.OMRequest preExecute(
+  @Override
+  public OzoneManagerProtocolProtos.OMRequest preExecute(
       OzoneManager ozoneManager) throws IOException {
     long modificationTime = Time.now();
     OzoneManagerProtocolProtos.SetAclRequest.Builder setAclRequestBuilder =
@@ -64,8 +65,9 @@ public class OMKeySetAclRequestV1 extends OMKeyAclRequestV1 {
   private List<OzoneAcl> ozoneAcls;
   private OzoneObj obj;
 
-  public OMKeySetAclRequestV1(OzoneManagerProtocolProtos.OMRequest omRequest) {
-    super(omRequest);
+  public OMKeySetAclRequestWithFSO(
+      OzoneManagerProtocolProtos.OMRequest omReq) {
+    super(omReq);
     OzoneManagerProtocolProtos.SetAclRequest setAclRequest =
         getOmRequest().getSetAclRequest();
     obj = OzoneObjInfo.fromProtobuf(setAclRequest.getObj());
@@ -74,19 +76,23 @@ public class OMKeySetAclRequestV1 extends OMKeyAclRequestV1 {
         .newArrayList(OzoneAclUtil.fromProtobuf(setAclRequest.getAclList()));
   }
 
-  @Override String getPath() {
+  @Override
+  String getPath() {
     return path;
   }
 
-  @Override OzoneObj getObject() {
+  @Override
+  OzoneObj getObject() {
     return obj;
   }
 
-  @Override OzoneManagerProtocolProtos.OMResponse.Builder onInit() {
+  @Override
+  OzoneManagerProtocolProtos.OMResponse.Builder onInit() {
     return OmResponseUtil.getOMResponseBuilder(getOmRequest());
   }
 
-  @Override OMClientResponse onSuccess(
+  @Override
+  OMClientResponse onSuccess(
       OzoneManagerProtocolProtos.OMResponse.Builder omResponse,
       OmKeyInfo omKeyInfo, boolean operationResult) {
     omResponse.setSuccess(operationResult);
@@ -96,7 +102,8 @@ public class OMKeySetAclRequestV1 extends OMKeyAclRequestV1 {
     return new OMKeyAclResponse(omResponse.build(), omKeyInfo);
   }
 
-  @Override void onComplete(Result result, boolean operationResult,
+  @Override
+  void onComplete(Result result, boolean operationResult,
       IOException exception, long trxnLogIndex, AuditLogger auditLogger,
       Map<String, String> auditMap) {
     switch (result) {
@@ -121,7 +128,8 @@ public class OMKeySetAclRequestV1 extends OMKeyAclRequestV1 {
             getOmRequest().getUserInfo()));
   }
 
-  @Override boolean apply(OmKeyInfo omKeyInfo, long trxnLogIndex) {
+  @Override
+  boolean apply(OmKeyInfo omKeyInfo, long trxnLogIndex) {
     // No need to check not null here, this will be never called with null.
     return omKeyInfo.setAcls(ozoneAcls);
   }
@@ -134,13 +142,14 @@ public class OMKeySetAclRequestV1 extends OMKeyAclRequestV1 {
         omDoubleBufferHelper);
   }
 
-  @Override OMClientResponse onSuccess(
+  @Override
+  OMClientResponse onSuccess(
       OzoneManagerProtocolProtos.OMResponse.Builder omResponse,
-      OmKeyInfo omKeyInfo, boolean operationResult, boolean isDirectory) {
+      OmKeyInfo omKeyInfo, boolean operationResult, boolean isDir) {
     omResponse.setSuccess(operationResult);
     omResponse.setSetAclResponse(
         OzoneManagerProtocolProtos.SetAclResponse.newBuilder()
             .setResponse(operationResult));
-    return new OMKeyAclResponseV1(omResponse.build(), omKeyInfo, isDirectory);
+    return new OMKeyAclResponseWithFSO(omResponse.build(), omKeyInfo, isDir);
   }
 }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestWithFSO.java
similarity index 87%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestWithFSO.java
index 06b2426..b5d2172 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestWithFSO.java
@@ -31,18 +31,16 @@ import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup;
 import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo;
 import org.apache.hadoop.ozone.om.helpers.OzoneAclUtil;
 import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
-import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequestV1;
+import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequestWithFSO;
 import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
 import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
-import org.apache.hadoop.ozone.om.response.s3.multipart.S3InitiateMultipartUploadResponseV1;
+import org.apache.hadoop.ozone.om.response.s3.multipart.S3InitiateMultipartUploadResponseWithFSO;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.KeyArgs;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.MultipartInfoInitiateRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.MultipartInfoInitiateResponse;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.nio.file.Paths;
@@ -58,13 +56,10 @@ import static org.apache.hadoop.ozone.om.request.file.OMFileRequest.OMDirectoryR
 /**
  * Handles initiate multipart upload request.
  */
-public class S3InitiateMultipartUploadRequestV1
+public class S3InitiateMultipartUploadRequestWithFSO
         extends S3InitiateMultipartUploadRequest {
 
-  private static final Logger LOG =
-      LoggerFactory.getLogger(S3InitiateMultipartUploadRequestV1.class);
-
-  public S3InitiateMultipartUploadRequestV1(OMRequest omRequest) {
+  public S3InitiateMultipartUploadRequestWithFSO(OMRequest omRequest) {
     super(omRequest);
   }
 
@@ -125,17 +120,17 @@ public class S3InitiateMultipartUploadRequestV1
         }
       }
 
-      OMFileRequest.OMPathInfoV1 pathInfoV1 =
-              OMFileRequest.verifyDirectoryKeysInPath(omMetadataManager,
-                      volumeName, bucketName, keyName, Paths.get(keyName));
+      OMFileRequest.OMPathInfoWithFSO pathInfoFSO = OMFileRequest
+          .verifyDirectoryKeysInPath(omMetadataManager, volumeName, bucketName,
+              keyName, Paths.get(keyName));
 
       // check if the directory already existed in OM
-      checkDirectoryResult(keyName, pathInfoV1.getDirectoryResult());
+      checkDirectoryResult(keyName, pathInfoFSO.getDirectoryResult());
 
       // add all missing parents to dir table
-      missingParentInfos =
-              OMDirectoryCreateRequestV1.getAllMissingParentDirInfo(
-                      ozoneManager, keyArgs, pathInfoV1, transactionLogIndex);
+      missingParentInfos = OMDirectoryCreateRequestWithFSO
+          .getAllMissingParentDirInfo(ozoneManager, keyArgs, pathInfoFSO,
+              transactionLogIndex);
 
       // We are adding uploadId to key, because if multiple users try to
       // perform multipart upload on the same key, each will try to upload, who
@@ -152,9 +147,9 @@ public class S3InitiateMultipartUploadRequestV1
       // multipart upload request is received, it returns multipart upload id
       // for the key.
 
-      String multipartKey = omMetadataManager.getMultipartKey(
-              pathInfoV1.getLastKnownParentId(), pathInfoV1.getLeafNodeName(),
-              keyArgs.getMultipartUploadID());
+      String multipartKey = omMetadataManager
+          .getMultipartKey(pathInfoFSO.getLastKnownParentId(),
+              pathInfoFSO.getLeafNodeName(), keyArgs.getMultipartUploadID());
 
       // Even if this key already exists in the KeyTable, it would be taken
       // care of in the final complete multipart upload. AWS S3 behavior is
@@ -166,9 +161,9 @@ public class S3InitiateMultipartUploadRequestV1
           .setCreationTime(keyArgs.getModificationTime())
           .setReplicationType(keyArgs.getType())
           .setReplicationFactor(keyArgs.getFactor())
-          .setObjectID(pathInfoV1.getLeafNodeObjectId())
+          .setObjectID(pathInfoFSO.getLeafNodeObjectId())
           .setUpdateID(transactionLogIndex)
-          .setParentID(pathInfoV1.getLastKnownParentId())
+          .setParentID(pathInfoFSO.getLastKnownParentId())
           .build();
 
       omKeyInfo = new OmKeyInfo.Builder()
@@ -182,9 +177,9 @@ public class S3InitiateMultipartUploadRequestV1
           .setOmKeyLocationInfos(Collections.singletonList(
               new OmKeyLocationInfoGroup(0, new ArrayList<>())))
           .setAcls(OzoneAclUtil.fromProtobuf(keyArgs.getAclsList()))
-          .setObjectID(pathInfoV1.getLeafNodeObjectId())
+          .setObjectID(pathInfoFSO.getLeafNodeObjectId())
           .setUpdateID(transactionLogIndex)
-          .setParentObjectID(pathInfoV1.getLastKnownParentId())
+          .setParentObjectID(pathInfoFSO.getLastKnownParentId())
           .build();
 
       // Add cache entries for the prefix directories.
@@ -194,7 +189,7 @@ public class S3InitiateMultipartUploadRequestV1
               transactionLogIndex);
 
       OMFileRequest.addOpenFileTableCacheEntry(omMetadataManager,
-              multipartKey, omKeyInfo, pathInfoV1.getLeafNodeName(),
+              multipartKey, omKeyInfo, pathInfoFSO.getLeafNodeName(),
               transactionLogIndex);
 
       // Add to cache
@@ -203,7 +198,7 @@ public class S3InitiateMultipartUploadRequestV1
           new CacheValue<>(Optional.of(multipartKeyInfo), transactionLogIndex));
 
       omClientResponse =
-          new S3InitiateMultipartUploadResponseV1(
+          new S3InitiateMultipartUploadResponseWithFSO(
               omResponse.setInitiateMultiPartUploadResponse(
                   MultipartInfoInitiateResponse.newBuilder()
                       .setVolumeName(requestedVolume)
@@ -216,7 +211,7 @@ public class S3InitiateMultipartUploadRequestV1
     } catch (IOException ex) {
       result = Result.FAILURE;
       exception = ex;
-      omClientResponse = new S3InitiateMultipartUploadResponseV1(
+      omClientResponse = new S3InitiateMultipartUploadResponseWithFSO(
           createErrorOMResponse(omResponse, exception));
     } finally {
       addResponseToDoubleBuffer(transactionLogIndex, omClientResponse,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequestWithFSO.java
similarity index 87%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequestV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequestWithFSO.java
index ddeb10c..af6ebc7 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequestWithFSO.java
@@ -25,12 +25,10 @@ import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo;
 import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
 import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
-import org.apache.hadoop.ozone.om.response.s3.multipart.S3MultipartUploadAbortResponseV1;
+import org.apache.hadoop.ozone.om.response.s3.multipart.S3MultipartUploadAbortResponseWithFSO;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.MultipartUploadAbortResponse;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -40,20 +38,17 @@ import java.util.Iterator;
 /**
  * Handles Abort of multipart upload request.
  */
-public class S3MultipartUploadAbortRequestV1
+public class S3MultipartUploadAbortRequestWithFSO
     extends S3MultipartUploadAbortRequest {
 
-  private static final Logger LOG =
-      LoggerFactory.getLogger(S3MultipartUploadAbortRequestV1.class);
-
-  public S3MultipartUploadAbortRequestV1(OMRequest omRequest) {
+  public S3MultipartUploadAbortRequestWithFSO(OMRequest omRequest) {
     super(omRequest);
   }
 
   protected OMClientResponse getOmClientResponse(IOException exception,
       OMResponse.Builder omResponse) {
 
-    return new S3MultipartUploadAbortResponseV1(createErrorOMResponse(
+    return new S3MultipartUploadAbortResponseWithFSO(createErrorOMResponse(
         omResponse, exception));
   }
 
@@ -61,12 +56,12 @@ public class S3MultipartUploadAbortRequestV1
       OmMultipartKeyInfo multipartKeyInfo, String multipartKey,
       OMResponse.Builder omResponse, OmBucketInfo omBucketInfo) {
 
-    OMClientResponse omClientResponse = new S3MultipartUploadAbortResponseV1(
+    OMClientResponse omClientResp = new S3MultipartUploadAbortResponseWithFSO(
         omResponse.setAbortMultiPartUploadResponse(
             MultipartUploadAbortResponse.newBuilder()).build(),
         multipartKey, multipartKeyInfo, ozoneManager.isRatisEnabled(),
         omBucketInfo.copyObject());
-    return omClientResponse;
+    return omClientResp;
   }
 
   protected String getMultipartKey(String multipartUploadID, String volumeName,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestWithFSO.java
similarity index 97%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestWithFSO.java
index 0f23745..13995b9 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestWithFSO.java
@@ -33,15 +33,13 @@ import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
 import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
 import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
-import org.apache.hadoop.ozone.om.response.s3.multipart.S3MultipartUploadCommitPartResponseV1;
+import org.apache.hadoop.ozone.om.response.s3.multipart.S3MultipartUploadCommitPartResponseWithFSO;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.KeyArgs;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.MultipartCommitUploadPartRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.MultipartCommitUploadPartResponse;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -56,13 +54,10 @@ import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_L
 /**
  * Handle Multipart upload commit upload part file.
  */
-public class S3MultipartUploadCommitPartRequestV1
+public class S3MultipartUploadCommitPartRequestWithFSO
         extends S3MultipartUploadCommitPartRequest {
 
-  private static final Logger LOG =
-      LoggerFactory.getLogger(S3MultipartUploadCommitPartRequestV1.class);
-
-  public S3MultipartUploadCommitPartRequestV1(OMRequest omRequest) {
+  public S3MultipartUploadCommitPartRequestWithFSO(OMRequest omRequest) {
     super(omRequest);
   }
 
@@ -230,7 +225,7 @@ public class S3MultipartUploadCommitPartRequestV1
           MultipartCommitUploadPartResponse.newBuilder()
               .setPartName(fullKeyPartName));
 
-      omClientResponse = new S3MultipartUploadCommitPartResponseV1(
+      omClientResponse = new S3MultipartUploadCommitPartResponseWithFSO(
           omResponse.build(), multipartKey, openFileKey,
           multipartKeyInfo, oldPartKeyInfo, omKeyInfo,
           ozoneManager.isRatisEnabled(),
@@ -240,7 +235,7 @@ public class S3MultipartUploadCommitPartRequestV1
     } catch (IOException ex) {
       result = Result.FAILURE;
       exception = ex;
-      omClientResponse = new S3MultipartUploadCommitPartResponseV1(
+      omClientResponse = new S3MultipartUploadCommitPartResponseWithFSO(
           createErrorOMResponse(omResponse, exception), multipartKey,
           openFileKey, multipartKeyInfo, oldPartKeyInfo, omKeyInfo,
           ozoneManager.isRatisEnabled(), copyBucketInfo);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequest.java
index 8fcf992..fd72fcc 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequest.java
@@ -329,7 +329,7 @@ public class S3MultipartUploadCompleteRequest extends OMKeyRequest {
 
   protected void updatePrefixFSOInfo(OmKeyInfo dbOpenKeyInfo,
       OmKeyInfo.Builder builder) {
-    // FSOBucket is disabled. Do nothing.
+    // FSO is disabled. Do nothing.
   }
 
   protected OmKeyInfo getOmKeyInfoFromKeyTable(String dbOzoneKey,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestWithFSO.java
similarity index 95%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestWithFSO.java
index 37f2dad..fd644c4 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestWithFSO.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
 import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
 import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
-import org.apache.hadoop.ozone.om.response.s3.multipart.S3MultipartUploadCompleteResponseV1;
+import org.apache.hadoop.ozone.om.response.s3.multipart.S3MultipartUploadCompleteResponseWithFSO;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.KeyArgs;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.MultipartUploadCompleteRequest;
@@ -59,13 +59,13 @@ import static org.apache.hadoop.ozone.om.request.file.OMFileRequest.OMDirectoryR
 /**
  * Handle Multipart upload complete request.
  */
-public class S3MultipartUploadCompleteRequestV1
+public class S3MultipartUploadCompleteRequestWithFSO
         extends S3MultipartUploadCompleteRequest {
 
   private static final Logger LOG =
-      LoggerFactory.getLogger(S3MultipartUploadCompleteRequestV1.class);
+      LoggerFactory.getLogger(S3MultipartUploadCompleteRequestWithFSO.class);
 
-  public S3MultipartUploadCompleteRequestV1(OMRequest omRequest) {
+  public S3MultipartUploadCompleteRequestWithFSO(OMRequest omRequest) {
     super(omRequest);
   }
 
@@ -112,10 +112,10 @@ public class S3MultipartUploadCompleteRequestV1
 
       String fileName = OzoneFSUtils.getFileName(keyName);
       Path keyPath = Paths.get(keyName);
-      OMFileRequest.OMPathInfoV1 pathInfoV1 =
+      OMFileRequest.OMPathInfoWithFSO pathInfoFSO =
               OMFileRequest.verifyDirectoryKeysInPath(omMetadataManager,
                       volumeName, bucketName, keyName, keyPath);
-      long parentID = pathInfoV1.getLastKnownParentId();
+      long parentID = pathInfoFSO.getLastKnownParentId();
 
       dbMultipartKey = omMetadataManager.getMultipartKey(parentID,
               fileName, uploadID);
@@ -129,7 +129,7 @@ public class S3MultipartUploadCompleteRequestV1
               omMetadataManager.getMultipartInfoTable().get(dbMultipartKey);
 
       // Check for directory exists with same name, if it exists throw error.
-      if (pathInfoV1.getDirectoryResult() == DIRECTORY_EXISTS) {
+      if (pathInfoFSO.getDirectoryResult() == DIRECTORY_EXISTS) {
         throw new OMException("Can not Complete MPU for file: " + keyName +
                 " as there is already directory in the given path",
                 NOT_A_FILE);
@@ -190,7 +190,7 @@ public class S3MultipartUploadCompleteRequestV1
                 .setKey(keyName)
                 .setHash(DigestUtils.sha256Hex(keyName)));
 
-        omClientResponse = new S3MultipartUploadCompleteResponseV1(
+        omClientResponse = new S3MultipartUploadCompleteResponseWithFSO(
             omResponse.build(), dbMultipartKey, omKeyInfo, unUsedParts);
 
         result = Result.SUCCESS;
@@ -204,7 +204,7 @@ public class S3MultipartUploadCompleteRequestV1
     } catch (IOException ex) {
       result = Result.FAILURE;
       exception = ex;
-      omClientResponse = new S3MultipartUploadCompleteResponseV1(
+      omClientResponse = new S3MultipartUploadCompleteResponseWithFSO(
           createErrorOMResponse(omResponse, exception));
     } finally {
       addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponseV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponseWithFSO.java
similarity index 91%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponseV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponseWithFSO.java
index 4e93fa7..be5275f 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponseWithFSO.java
@@ -38,16 +38,16 @@ import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.DIRECTORY_TABLE;
  * Response for create directory request.
  */
 @CleanupTableInfo(cleanupTables = {DIRECTORY_TABLE})
-public class OMDirectoryCreateResponseV1 extends OMClientResponse {
+public class OMDirectoryCreateResponseWithFSO extends OMClientResponse {
 
   public static final Logger LOG =
-      LoggerFactory.getLogger(OMDirectoryCreateResponseV1.class);
+      LoggerFactory.getLogger(OMDirectoryCreateResponseWithFSO.class);
 
   private OmDirectoryInfo dirInfo;
   private List<OmDirectoryInfo> parentDirInfos;
   private Result result;
 
-  public OMDirectoryCreateResponseV1(@Nonnull OMResponse omResponse,
+  public OMDirectoryCreateResponseWithFSO(@Nonnull OMResponse omResponse,
                                      @Nonnull OmDirectoryInfo dirInfo,
                                      @Nonnull List<OmDirectoryInfo> pDirInfos,
                                      @Nonnull Result result) {
@@ -60,7 +60,7 @@ public class OMDirectoryCreateResponseV1 extends OMClientResponse {
   /**
    * For when the request is not successful or the directory already exists.
    */
-  public OMDirectoryCreateResponseV1(@Nonnull OMResponse omResponse,
+  public OMDirectoryCreateResponseWithFSO(@Nonnull OMResponse omResponse,
                                      @Nonnull Result result) {
     super(omResponse);
     this.result = result;
@@ -97,7 +97,7 @@ public class OMDirectoryCreateResponseV1 extends OMClientResponse {
       // When directory already exists, we don't add it to cache. And it is
       // not an error, in this case dirKeyInfo will be null.
       LOG.debug("Response Status is OK, dirKeyInfo is null in " +
-              "OMDirectoryCreateResponseV1");
+              "OMDirectoryCreateResponseWithFSO");
     }
   }
 }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponseV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponseWithFSO.java
similarity index 92%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponseV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponseWithFSO.java
index beb0c99..42c256c 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponseWithFSO.java
@@ -36,14 +36,14 @@ import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.DIRECTORY_TABLE;
 import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.OPEN_FILE_TABLE;
 
 /**
- * Response for create file request layout version V1.
+ * Response for create file request - prefix layout.
  */
 @CleanupTableInfo(cleanupTables = {DIRECTORY_TABLE, OPEN_FILE_TABLE})
-public class OMFileCreateResponseV1 extends OMFileCreateResponse {
+public class OMFileCreateResponseWithFSO extends OMFileCreateResponse {
 
   private List<OmDirectoryInfo> parentDirInfos;
 
-  public OMFileCreateResponseV1(@Nonnull OMResponse omResponse,
+  public OMFileCreateResponseWithFSO(@Nonnull OMResponse omResponse,
                                 @Nonnull OmKeyInfo omKeyInfo,
                                 @Nonnull List<OmDirectoryInfo> parentDirInfos,
                                 long openKeySessionID,
@@ -57,7 +57,7 @@ public class OMFileCreateResponseV1 extends OMFileCreateResponse {
    * For when the request is not successful.
    * For a successful request, the other constructor should be used.
    */
-  public OMFileCreateResponseV1(@Nonnull OMResponse omResponse) {
+  public OMFileCreateResponseWithFSO(@Nonnull OMResponse omResponse) {
     super(omResponse);
   }
 
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponseV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponseWithFSO.java
similarity index 89%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponseV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponseWithFSO.java
index d750457..9f2a800 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponseWithFSO.java
@@ -32,12 +32,12 @@ import java.io.IOException;
 import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.OPEN_FILE_TABLE;
 
 /**
- * Response for AllocateBlock request layout version V1.
+ * Response for AllocateBlock request - prefix layout.
  */
 @CleanupTableInfo(cleanupTables = {OPEN_FILE_TABLE})
-public class OMAllocateBlockResponseV1 extends OMAllocateBlockResponse {
+public class OMAllocateBlockResponseWithFSO extends OMAllocateBlockResponse {
 
-  public OMAllocateBlockResponseV1(@Nonnull OMResponse omResponse,
+  public OMAllocateBlockResponseWithFSO(@Nonnull OMResponse omResponse,
       @Nonnull OmKeyInfo omKeyInfo, long clientID,
       @Nonnull OmBucketInfo omBucketInfo) {
     super(omResponse, omKeyInfo, clientID, omBucketInfo);
@@ -47,7 +47,7 @@ public class OMAllocateBlockResponseV1 extends OMAllocateBlockResponse {
    * For when the request is not successful.
    * For a successful request, the other constructor should be used.
    */
-  public OMAllocateBlockResponseV1(@Nonnull OMResponse omResponse) {
+  public OMAllocateBlockResponseWithFSO(@Nonnull OMResponse omResponse) {
     super(omResponse);
   }
 
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponseV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponseWithFSO.java
similarity index 91%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponseV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponseWithFSO.java
index 5f0a337..3b8bba1 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponseWithFSO.java
@@ -34,12 +34,12 @@ import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.OPEN_FILE_TABLE;
 import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.FILE_TABLE;
 
 /**
- * Response for CommitKey request layout version V1.
+ * Response for CommitKey request - prefix layout1.
  */
 @CleanupTableInfo(cleanupTables = {OPEN_FILE_TABLE, FILE_TABLE})
-public class OMKeyCommitResponseV1 extends OMKeyCommitResponse {
+public class OMKeyCommitResponseWithFSO extends OMKeyCommitResponse {
 
-  public OMKeyCommitResponseV1(@Nonnull OMResponse omResponse,
+  public OMKeyCommitResponseWithFSO(@Nonnull OMResponse omResponse,
                                @Nonnull OmKeyInfo omKeyInfo,
                                String ozoneKeyName, String openKeyName,
                                @Nonnull OmBucketInfo omBucketInfo) {
@@ -51,7 +51,7 @@ public class OMKeyCommitResponseV1 extends OMKeyCommitResponse {
    * For when the request is not successful.
    * For a successful request, the other constructor should be used.
    */
-  public OMKeyCommitResponseV1(@Nonnull OMResponse omResponse) {
+  public OMKeyCommitResponseWithFSO(@Nonnull OMResponse omResponse) {
     super(omResponse);
     checkStatusNotOK();
   }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponseV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponseWithFSO.java
similarity index 88%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponseV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponseWithFSO.java
index 04237d7..f9f9567 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponseWithFSO.java
@@ -22,7 +22,7 @@ import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
 import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
 import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
 import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
-import org.apache.hadoop.ozone.om.response.file.OMFileCreateResponseV1;
+import org.apache.hadoop.ozone.om.response.file.OMFileCreateResponseWithFSO;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
 
 import javax.annotation.Nonnull;
@@ -32,12 +32,12 @@ import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.DIRECTORY_TABLE;
 import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.OPEN_FILE_TABLE;
 
 /**
- * Response for CreateKey request layout version V1.
+ * Response for CreateKey request - prefix layout.
  */
 @CleanupTableInfo(cleanupTables = {DIRECTORY_TABLE, OPEN_FILE_TABLE})
-public class OMKeyCreateResponseV1 extends OMFileCreateResponseV1 {
+public class OMKeyCreateResponseWithFSO extends OMFileCreateResponseWithFSO {
 
-  public OMKeyCreateResponseV1(@Nonnull OMResponse omResponse,
+  public OMKeyCreateResponseWithFSO(@Nonnull OMResponse omResponse,
                                @Nonnull OmKeyInfo omKeyInfo,
                                @Nonnull List<OmDirectoryInfo> parentDirInfos,
                                long openKeySessionID,
@@ -50,7 +50,7 @@ public class OMKeyCreateResponseV1 extends OMFileCreateResponseV1 {
    * For when the request is not successful.
    * For a successful request, the other constructor should be used.
    */
-  public OMKeyCreateResponseV1(@Nonnull OMResponse omResponse) {
+  public OMKeyCreateResponseWithFSO(@Nonnull OMResponse omResponse) {
     super(omResponse);
   }
 }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponseV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponseWithFSO.java
similarity index 95%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponseV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponseWithFSO.java
index afcdd76..8477653 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponseWithFSO.java
@@ -39,12 +39,12 @@ import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.FILE_TABLE;
  */
 @CleanupTableInfo(cleanupTables = {FILE_TABLE, DIRECTORY_TABLE,
     DELETED_TABLE, DELETED_DIR_TABLE})
-public class OMKeyDeleteResponseV1 extends OMKeyDeleteResponse {
+public class OMKeyDeleteResponseWithFSO extends OMKeyDeleteResponse {
 
   private boolean isDeleteDirectory;
   private String keyName;
 
-  public OMKeyDeleteResponseV1(@Nonnull OMResponse omResponse,
+  public OMKeyDeleteResponseWithFSO(@Nonnull OMResponse omResponse,
       @Nonnull String keyName, @Nonnull OmKeyInfo omKeyInfo,
       boolean isRatisEnabled, @Nonnull OmBucketInfo omBucketInfo,
       @Nonnull boolean isDeleteDirectory) {
@@ -57,7 +57,7 @@ public class OMKeyDeleteResponseV1 extends OMKeyDeleteResponse {
    * For when the request is not successful.
    * For a successful request, the other constructor should be used.
    */
-  public OMKeyDeleteResponseV1(@Nonnull OMResponse omResponse) {
+  public OMKeyDeleteResponseWithFSO(@Nonnull OMResponse omResponse) {
     super(omResponse);
   }
 
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponseV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponseWithFSO.java
similarity index 91%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponseV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponseWithFSO.java
index 4437aa3..f1dd69e 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponseWithFSO.java
@@ -32,14 +32,14 @@ import java.io.IOException;
 import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.*;
 
 /**
- * Response for RenameKey request layout version V1.
+ * Response for RenameKey request - prefix layout.
  */
 @CleanupTableInfo(cleanupTables = {FILE_TABLE, DIRECTORY_TABLE})
-public class OMKeyRenameResponseV1 extends OMKeyRenameResponse {
+public class OMKeyRenameResponseWithFSO extends OMKeyRenameResponse {
 
   private boolean isRenameDirectory;
 
-  public OMKeyRenameResponseV1(@Nonnull OMResponse omResponse,
+  public OMKeyRenameResponseWithFSO(@Nonnull OMResponse omResponse,
       String fromKeyName, String toKeyName, @Nonnull OmKeyInfo renameKeyInfo,
       boolean isRenameDirectory) {
     super(omResponse, fromKeyName, toKeyName, renameKeyInfo);
@@ -50,7 +50,7 @@ public class OMKeyRenameResponseV1 extends OMKeyRenameResponse {
    * For when the request is not successful.
    * For a successful request, the other constructor should be used.
    */
-  public OMKeyRenameResponseV1(@Nonnull OMResponse omResponse) {
+  public OMKeyRenameResponseWithFSO(@Nonnull OMResponse omResponse) {
     super(omResponse);
   }
 
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMPathsPurgeResponseV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMPathsPurgeResponseWithFSO.java
similarity index 94%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMPathsPurgeResponseV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMPathsPurgeResponseWithFSO.java
index 714024a..0548039 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMPathsPurgeResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMPathsPurgeResponseWithFSO.java
@@ -23,7 +23,7 @@ import org.apache.hadoop.ozone.OmUtils;
 import org.apache.hadoop.ozone.om.OMMetadataManager;
 import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
 import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
-import org.apache.hadoop.ozone.om.request.key.OMPathsPurgeRequestV1;
+import org.apache.hadoop.ozone.om.request.key.OMPathsPurgeRequestWithFSO;
 import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
@@ -41,13 +41,13 @@ import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.DIRECTORY_TABLE;
 import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.FILE_TABLE;
 
 /**
- * Response for {@link OMPathsPurgeRequestV1} request.
+ * Response for {@link OMPathsPurgeRequestWithFSO} request.
  */
 @CleanupTableInfo(cleanupTables = {DELETED_TABLE, DELETED_DIR_TABLE,
     DIRECTORY_TABLE, FILE_TABLE})
-public class OMPathsPurgeResponseV1 extends OMClientResponse {
+public class OMPathsPurgeResponseWithFSO extends OMClientResponse {
   private static final Logger LOG =
-      LoggerFactory.getLogger(OMPathsPurgeResponseV1.class);
+      LoggerFactory.getLogger(OMPathsPurgeResponseWithFSO.class);
 
   private List<OzoneManagerProtocolProtos.KeyInfo> markDeletedDirList;
   private List<String> dirList;
@@ -55,7 +55,7 @@ public class OMPathsPurgeResponseV1 extends OMClientResponse {
   private boolean isRatisEnabled;
 
 
-  public OMPathsPurgeResponseV1(@Nonnull OMResponse omResponse,
+  public OMPathsPurgeResponseWithFSO(@Nonnull OMResponse omResponse,
       @Nonnull List<OzoneManagerProtocolProtos.KeyInfo> markDeletedDirs,
       @Nonnull List<OzoneManagerProtocolProtos.KeyInfo> files,
       @Nonnull List<String> dirs, boolean isRatisEnabled) {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponseV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponseWithFSO.java
similarity index 93%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponseV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponseWithFSO.java
index 046a024..995644f 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponseWithFSO.java
@@ -32,14 +32,14 @@ import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.DIRECTORY_TABLE;
 import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.FILE_TABLE;
 
 /**
- * Response for Bucket acl request for layout version V1.
+ * Response for Bucket acl request for prefix layout.
  */
 @CleanupTableInfo(cleanupTables = { FILE_TABLE, DIRECTORY_TABLE })
-public class OMKeyAclResponseV1 extends OMKeyAclResponse {
+public class OMKeyAclResponseWithFSO extends OMKeyAclResponse {
 
   private boolean isDirectory;
 
-  public OMKeyAclResponseV1(
+  public OMKeyAclResponseWithFSO(
       @NotNull OzoneManagerProtocolProtos.OMResponse omResponse,
       @NotNull OmKeyInfo omKeyInfo, boolean isDirectory) {
     super(omResponse, omKeyInfo);
@@ -52,7 +52,7 @@ public class OMKeyAclResponseV1 extends OMKeyAclResponse {
    *
    * @param omResponse
    */
-  public OMKeyAclResponseV1(
+  public OMKeyAclResponseWithFSO(
       @NotNull OzoneManagerProtocolProtos.OMResponse omResponse) {
     super(omResponse);
   }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseWithFSO.java
similarity index 92%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseWithFSO.java
index 4c3f00f..69e0176 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseWithFSO.java
@@ -37,15 +37,15 @@ import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.MULTIPARTFILEINFO
 import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.OPEN_FILE_TABLE;
 
 /**
- * Response for S3 Initiate Multipart Upload request for layout V1.
+ * Response for S3 Initiate Multipart Upload request for prefix layout.
  */
 @CleanupTableInfo(cleanupTables = {DIRECTORY_TABLE, OPEN_FILE_TABLE,
         MULTIPARTFILEINFO_TABLE})
-public class S3InitiateMultipartUploadResponseV1 extends
+public class S3InitiateMultipartUploadResponseWithFSO extends
         S3InitiateMultipartUploadResponse {
   private List<OmDirectoryInfo> parentDirInfos;
 
-  public S3InitiateMultipartUploadResponseV1(
+  public S3InitiateMultipartUploadResponseWithFSO(
       @Nonnull OMResponse omResponse,
       @Nonnull OmMultipartKeyInfo omMultipartKeyInfo,
       @Nonnull OmKeyInfo omKeyInfo,
@@ -58,7 +58,8 @@ public class S3InitiateMultipartUploadResponseV1 extends
    * For when the request is not successful.
    * For a successful request, the other constructor should be used.
    */
-  public S3InitiateMultipartUploadResponseV1(@Nonnull OMResponse omResponse) {
+  public S3InitiateMultipartUploadResponseWithFSO(
+      @Nonnull OMResponse omResponse) {
     super(omResponse);
   }
 
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponseV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponseWithFSO.java
similarity index 87%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponseV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponseWithFSO.java
index 3ed05ef..295373b 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponseWithFSO.java
@@ -30,14 +30,14 @@ import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.MULTIPARTFILEINFO
 import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.OPEN_FILE_TABLE;
 
 /**
- * Response for Multipart Abort Request layout version V1.
+ * Response for Multipart Abort Request - prefix layout.
  */
 @CleanupTableInfo(cleanupTables = {OPEN_FILE_TABLE, DELETED_TABLE,
     MULTIPARTFILEINFO_TABLE})
-public class S3MultipartUploadAbortResponseV1
+public class S3MultipartUploadAbortResponseWithFSO
     extends S3MultipartUploadAbortResponse {
 
-  public S3MultipartUploadAbortResponseV1(@Nonnull OMResponse omResponse,
+  public S3MultipartUploadAbortResponseWithFSO(@Nonnull OMResponse omResponse,
       String multipartKey, @Nonnull OmMultipartKeyInfo omMultipartKeyInfo,
       boolean isRatisEnabled, @Nonnull OmBucketInfo omBucketInfo) {
 
@@ -49,7 +49,8 @@ public class S3MultipartUploadAbortResponseV1
    * For when the request is not successful.
    * For a successful request, the other constructor should be used.
    */
-  public S3MultipartUploadAbortResponseV1(@Nonnull OMResponse omResponse) {
+  public S3MultipartUploadAbortResponseWithFSO(
+      @Nonnull OMResponse omResponse) {
     super(omResponse);
   }
 }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponseV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponseWithFSO.java
similarity index 88%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponseV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponseWithFSO.java
index d8e5cc5..746dad0 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponseWithFSO.java
@@ -37,7 +37,7 @@ import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.MULTIPARTFILEINFO
  */
 @CleanupTableInfo(cleanupTables = {OPEN_FILE_TABLE, DELETED_TABLE,
     MULTIPARTFILEINFO_TABLE})
-public class S3MultipartUploadCommitPartResponseV1
+public class S3MultipartUploadCommitPartResponseWithFSO
         extends S3MultipartUploadCommitPartResponse {
 
   /**
@@ -52,12 +52,12 @@ public class S3MultipartUploadCommitPartResponseV1
    * @param oldPartKeyInfo
    */
   @SuppressWarnings("checkstyle:ParameterNumber")
-  public S3MultipartUploadCommitPartResponseV1(@Nonnull OMResponse omResponse,
-      String multipartKey, String openKey,
+  public S3MultipartUploadCommitPartResponseWithFSO(
+      @Nonnull OMResponse omResponse, String multipartKey, String openKey,
       @Nullable OmMultipartKeyInfo omMultipartKeyInfo,
       @Nullable OzoneManagerProtocolProtos.PartKeyInfo oldPartKeyInfo,
-      @Nullable OmKeyInfo openPartKeyInfoToBeDeleted,
-      boolean isRatisEnabled, @Nonnull OmBucketInfo omBucketInfo) {
+      @Nullable OmKeyInfo openPartKeyInfoToBeDeleted, boolean isRatisEnabled,
+      @Nonnull OmBucketInfo omBucketInfo) {
 
     super(omResponse, multipartKey, openKey, omMultipartKeyInfo,
             oldPartKeyInfo, openPartKeyInfoToBeDeleted, isRatisEnabled,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponseV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponseWithFSO.java
similarity index 94%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponseV1.java
rename to hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponseWithFSO.java
index bb31dce..42c5b8b 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponseWithFSO.java
@@ -40,10 +40,10 @@ import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.OPEN_FILE_TABLE;
  */
 @CleanupTableInfo(cleanupTables = {OPEN_FILE_TABLE, FILE_TABLE, DELETED_TABLE,
     MULTIPARTFILEINFO_TABLE})
-public class S3MultipartUploadCompleteResponseV1
+public class S3MultipartUploadCompleteResponseWithFSO
         extends S3MultipartUploadCompleteResponse {
 
-  public S3MultipartUploadCompleteResponseV1(
+  public S3MultipartUploadCompleteResponseWithFSO(
       @Nonnull OMResponse omResponse,
       @Nonnull String multipartKey,
       @Nonnull OmKeyInfo omKeyInfo,
@@ -55,7 +55,8 @@ public class S3MultipartUploadCompleteResponseV1
    * For when the request is not successful.
    * For a successful request, the other constructor should be used.
    */
-  public S3MultipartUploadCompleteResponseV1(@Nonnull OMResponse omResponse) {
+  public S3MultipartUploadCompleteResponseWithFSO(
+      @Nonnull OMResponse omResponse) {
     super(omResponse);
     checkStatusNotOK();
   }
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestOMRequestUtils.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestOMRequestUtils.java
index d994834..7f50f73 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestOMRequestUtils.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestOMRequestUtils.java
@@ -432,7 +432,7 @@ public final class TestOMRequestUtils {
         .setClientId(UUID.randomUUID().toString()).build();
   }
 
-  public static OzoneManagerProtocolProtos.OMRequest createBucketRequestV1(
+  public static OzoneManagerProtocolProtos.OMRequest createBucketReqFSO(
           String bucketName, String volumeName, boolean isVersionEnabled,
           OzoneManagerProtocolProtos.StorageTypeProto storageTypeProto) {
     OzoneManagerProtocolProtos.BucketInfo bucketInfo =
@@ -441,7 +441,7 @@ public final class TestOMRequestUtils {
                     .setVolumeName(volumeName)
                     .setIsVersionEnabled(isVersionEnabled)
                     .setStorageType(storageTypeProto)
-                    .addAllMetadata(getMetadataListV1()).build();
+                    .addAllMetadata(getMetadataListFSO()).build();
     OzoneManagerProtocolProtos.CreateBucketRequest.Builder req =
             OzoneManagerProtocolProtos.CreateBucketRequest.newBuilder();
     req.setBucketInfo(bucketInfo);
@@ -460,7 +460,7 @@ public final class TestOMRequestUtils {
     return metadataList;
   }
 
-  public static List< HddsProtos.KeyValue> getMetadataListV1() {
+  public static List< HddsProtos.KeyValue> getMetadataListFSO() {
     List<HddsProtos.KeyValue> metadataList = new ArrayList<>();
     metadataList.add(HddsProtos.KeyValue.newBuilder().setKey("key1").setValue(
             "value1").build());
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequestV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequestWithFSO.java
similarity index 95%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequestV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequestWithFSO.java
index 0e4d6ab..f63ce17 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequestWithFSO.java
@@ -35,10 +35,11 @@ import static org.mockito.Mockito.when;
 /**
  * Tests OMBucketCreateRequest class, which handles CreateBucket request.
  */
-public class TestOMBucketCreateRequestV1 extends TestOMBucketCreateRequest {
+public class TestOMBucketCreateRequestWithFSO
+    extends TestOMBucketCreateRequest {
 
   @Test
-  public void testValidateAndUpdateCacheWithFSOBucket() throws Exception {
+  public void testValidateAndUpdateCacheWithFSO() throws Exception {
     when(ozoneManager.getOMMetadataLayout()).thenReturn(
             OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
     String volumeName = UUID.randomUUID().toString();
@@ -55,7 +56,7 @@ public class TestOMBucketCreateRequestV1 extends TestOMBucketCreateRequest {
       String bucketName) throws Exception {
     addCreateVolumeToTable(volumeName, omMetadataManager);
     OMRequest originalRequest =
-        TestOMRequestUtils.createBucketRequestV1(bucketName, volumeName,
+        TestOMRequestUtils.createBucketReqFSO(bucketName, volumeName,
                 false, StorageTypeProto.SSD);
 
     OMBucketCreateRequest omBucketCreateRequest =
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestWithFSO.java
similarity index 85%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestWithFSO.java
index 15c3875..f147e91 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestWithFSO.java
@@ -65,9 +65,9 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 /**
- * Test OM directory create request V1 layout version.
+ * Test OM directory create request - prefix layout.
  */
-public class TestOMDirectoryCreateRequestV1 {
+public class TestOMDirectoryCreateRequestWithFSO {
 
   @Rule
   public TemporaryFolder folder = new TemporaryFolder();
@@ -119,11 +119,11 @@ public class TestOMDirectoryCreateRequestV1 {
 
     OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
             keyName);
-    OMDirectoryCreateRequestV1 omDirectoryCreateRequestV1 =
-            new OMDirectoryCreateRequestV1(omRequest);
+    OMDirectoryCreateRequestWithFSO omDirectoryCreateRequestWithFSO =
+            new OMDirectoryCreateRequestWithFSO(omRequest);
 
     OMRequest modifiedOmRequest =
-            omDirectoryCreateRequestV1.preExecute(ozoneManager);
+            omDirectoryCreateRequestWithFSO.preExecute(ozoneManager);
 
     // As in preExecute, we modify original request.
     Assert.assertNotEquals(omRequest, modifiedOmRequest);
@@ -147,15 +147,17 @@ public class TestOMDirectoryCreateRequestV1 {
 
     OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
             keyName);
-    OMDirectoryCreateRequestV1 omDirCreateRequestV1 =
-            new OMDirectoryCreateRequestV1(omRequest);
+    OMDirectoryCreateRequestWithFSO omDirCreateRequestFSO =
+            new OMDirectoryCreateRequestWithFSO(omRequest);
 
-    OMRequest modifiedOmRequest = omDirCreateRequestV1.preExecute(ozoneManager);
+    OMRequest modifiedOmReq =
+        omDirCreateRequestFSO.preExecute(ozoneManager);
 
-    omDirCreateRequestV1 = new OMDirectoryCreateRequestV1(modifiedOmRequest);
+    omDirCreateRequestFSO =
+        new OMDirectoryCreateRequestWithFSO(modifiedOmReq);
 
     OMClientResponse omClientResponse =
-            omDirCreateRequestV1.validateAndUpdateCache(ozoneManager, 100L,
+            omDirCreateRequestFSO.validateAndUpdateCache(ozoneManager, 100L,
                     ozoneManagerDoubleBufferHelper);
 
     Assert.assertTrue(omClientResponse.getOMResponse().getStatus()
@@ -172,15 +174,17 @@ public class TestOMDirectoryCreateRequestV1 {
 
     OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
             keyName);
-    OMDirectoryCreateRequestV1 omDirCreateRequestV1 =
-            new OMDirectoryCreateRequestV1(omRequest);
+    OMDirectoryCreateRequestWithFSO omDirCreateRequestFSO =
+            new OMDirectoryCreateRequestWithFSO(omRequest);
 
-    OMRequest modifiedOmRequest = omDirCreateRequestV1.preExecute(ozoneManager);
+    OMRequest modifiedOmRequest =
+        omDirCreateRequestFSO.preExecute(ozoneManager);
 
-    omDirCreateRequestV1 = new OMDirectoryCreateRequestV1(modifiedOmRequest);
+    omDirCreateRequestFSO =
+        new OMDirectoryCreateRequestWithFSO(modifiedOmRequest);
 
     OMClientResponse omClientResponse =
-            omDirCreateRequestV1.validateAndUpdateCache(ozoneManager, 100L,
+            omDirCreateRequestFSO.validateAndUpdateCache(ozoneManager, 100L,
                     ozoneManagerDoubleBufferHelper);
 
     Assert.assertEquals(VOLUME_NOT_FOUND,
@@ -201,16 +205,16 @@ public class TestOMDirectoryCreateRequestV1 {
 
     OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
             keyName);
-    OMDirectoryCreateRequestV1 omDirCreateRequestV1 =
-            new OMDirectoryCreateRequestV1(omRequest);
+    OMDirectoryCreateRequestWithFSO omDirCreateReqFSO =
+            new OMDirectoryCreateRequestWithFSO(omRequest);
 
-    OMRequest modifiedOmRequest = omDirCreateRequestV1.preExecute(ozoneManager);
+    OMRequest modifiedOmReq = omDirCreateReqFSO.preExecute(ozoneManager);
 
-    omDirCreateRequestV1 = new OMDirectoryCreateRequestV1(modifiedOmRequest);
+    omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq);
     TestOMRequestUtils.addVolumeToDB(volumeName, omMetadataManager);
 
     OMClientResponse omClientResponse =
-            omDirCreateRequestV1.validateAndUpdateCache(ozoneManager, 100L,
+            omDirCreateReqFSO.validateAndUpdateCache(ozoneManager, 100L,
                     ozoneManagerDoubleBufferHelper);
 
     Assert.assertTrue(omClientResponse.getOMResponse().getStatus()
@@ -253,15 +257,15 @@ public class TestOMDirectoryCreateRequestV1 {
 
     OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
             keyName);
-    OMDirectoryCreateRequestV1 omDirCreateRequestV1 =
-            new OMDirectoryCreateRequestV1(omRequest);
+    OMDirectoryCreateRequestWithFSO omDirCreateReqFSO =
+            new OMDirectoryCreateRequestWithFSO(omRequest);
 
-    OMRequest modifiedOmRequest = omDirCreateRequestV1.preExecute(ozoneManager);
+    OMRequest modifiedOmReq = omDirCreateReqFSO.preExecute(ozoneManager);
 
-    omDirCreateRequestV1 = new OMDirectoryCreateRequestV1(modifiedOmRequest);
+    omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq);
 
     OMClientResponse omClientResponse =
-            omDirCreateRequestV1.validateAndUpdateCache(ozoneManager, 100L,
+            omDirCreateReqFSO.validateAndUpdateCache(ozoneManager, 100L,
                     ozoneManagerDoubleBufferHelper);
 
     Assert.assertTrue(omClientResponse.getOMResponse().getStatus()
@@ -306,15 +310,15 @@ public class TestOMDirectoryCreateRequestV1 {
 
     OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
             keyName);
-    OMDirectoryCreateRequestV1 omDirCreateRequestV1 =
-            new OMDirectoryCreateRequestV1(omRequest);
+    OMDirectoryCreateRequestWithFSO omDirCreateReqFSO =
+            new OMDirectoryCreateRequestWithFSO(omRequest);
 
-    OMRequest modifiedOmRequest = omDirCreateRequestV1.preExecute(ozoneManager);
+    OMRequest modifiedOmReq = omDirCreateReqFSO.preExecute(ozoneManager);
 
-    omDirCreateRequestV1 = new OMDirectoryCreateRequestV1(modifiedOmRequest);
+    omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq);
 
     OMClientResponse omClientResponse =
-            omDirCreateRequestV1.validateAndUpdateCache(ozoneManager, 100L,
+            omDirCreateReqFSO.validateAndUpdateCache(ozoneManager, 100L,
                     ozoneManagerDoubleBufferHelper);
 
     Assert.assertTrue(omClientResponse.getOMResponse().getStatus()
@@ -377,16 +381,16 @@ public class TestOMDirectoryCreateRequestV1 {
 
     OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
             keyName);
-    OMDirectoryCreateRequestV1 omDirCreateRequestV1 =
-            new OMDirectoryCreateRequestV1(omRequest);
+    OMDirectoryCreateRequestWithFSO omDirCreateReqFSO =
+            new OMDirectoryCreateRequestWithFSO(omRequest);
 
-    OMRequest modifiedOmRequest =
-            omDirCreateRequestV1.preExecute(ozoneManager);
+    OMRequest modifiedOmReq =
+            omDirCreateReqFSO.preExecute(ozoneManager);
 
-    omDirCreateRequestV1 = new OMDirectoryCreateRequestV1(modifiedOmRequest);
+    omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq);
 
     OMClientResponse omClientResponse =
-            omDirCreateRequestV1.validateAndUpdateCache(ozoneManager, 100L,
+            omDirCreateReqFSO.validateAndUpdateCache(ozoneManager, 100L,
                     ozoneManagerDoubleBufferHelper);
 
     Assert.assertTrue(omClientResponse.getOMResponse().getStatus()
@@ -447,16 +451,16 @@ public class TestOMDirectoryCreateRequestV1 {
 
     OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
             keyName);
-    OMDirectoryCreateRequestV1 omDirCreateRequestV1 =
-            new OMDirectoryCreateRequestV1(omRequest);
+    OMDirectoryCreateRequestWithFSO omDirCreateReqFSO =
+            new OMDirectoryCreateRequestWithFSO(omRequest);
 
-    OMRequest modifiedOmRequest =
-            omDirCreateRequestV1.preExecute(ozoneManager);
+    OMRequest modifiedOmReq =
+            omDirCreateReqFSO.preExecute(ozoneManager);
 
-    omDirCreateRequestV1 = new OMDirectoryCreateRequestV1(modifiedOmRequest);
+    omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq);
 
     OMClientResponse omClientResponse =
-            omDirCreateRequestV1.validateAndUpdateCache(ozoneManager, 100L,
+            omDirCreateReqFSO.validateAndUpdateCache(ozoneManager, 100L,
                     ozoneManagerDoubleBufferHelper);
 
     Assert.assertTrue("Invalid response code:" +
@@ -491,16 +495,16 @@ public class TestOMDirectoryCreateRequestV1 {
 
     OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
             OzoneFSUtils.addTrailingSlashIfNeeded(keyName));
-    OMDirectoryCreateRequestV1 omDirCreateRequestV1 =
-            new OMDirectoryCreateRequestV1(omRequest);
+    OMDirectoryCreateRequestWithFSO omDirCreateReqFSO =
+            new OMDirectoryCreateRequestWithFSO(omRequest);
 
-    OMRequest modifiedOmRequest = omDirCreateRequestV1.preExecute(ozoneManager);
+    OMRequest modifiedOmReq = omDirCreateReqFSO.preExecute(ozoneManager);
 
-    omDirCreateRequestV1 = new OMDirectoryCreateRequestV1(modifiedOmRequest);
+    omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq);
 
     Assert.assertEquals(0L, omMetrics.getNumKeys());
     OMClientResponse omClientResponse =
-            omDirCreateRequestV1.validateAndUpdateCache(ozoneManager, 100L,
+            omDirCreateReqFSO.validateAndUpdateCache(ozoneManager, 100L,
                     ozoneManagerDoubleBufferHelper);
 
     Assert.assertEquals(OzoneManagerProtocolProtos.Status.OK,
@@ -524,16 +528,16 @@ public class TestOMDirectoryCreateRequestV1 {
 
     OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
             OzoneFSUtils.addTrailingSlashIfNeeded(keyName));
-    OMDirectoryCreateRequestV1 omDirCreateRequestV1 =
-            new OMDirectoryCreateRequestV1(omRequest);
+    OMDirectoryCreateRequestWithFSO omDirCreateReqFSO =
+            new OMDirectoryCreateRequestWithFSO(omRequest);
 
-    OMRequest modifiedOmRequest = omDirCreateRequestV1.preExecute(ozoneManager);
+    OMRequest modifiedOmReq = omDirCreateReqFSO.preExecute(ozoneManager);
 
-    omDirCreateRequestV1 = new OMDirectoryCreateRequestV1(modifiedOmRequest);
+    omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq);
 
     Assert.assertEquals(0L, omMetrics.getNumKeys());
     OMClientResponse omClientResponse =
-            omDirCreateRequestV1.validateAndUpdateCache(ozoneManager,
+            omDirCreateReqFSO.validateAndUpdateCache(ozoneManager,
                     100L, ozoneManagerDoubleBufferHelper);
 
     Assert.assertEquals(OzoneManagerProtocolProtos.Status.INVALID_KEY_NAME,
@@ -562,16 +566,16 @@ public class TestOMDirectoryCreateRequestV1 {
 
     OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
             OzoneFSUtils.addTrailingSlashIfNeeded(keyName));
-    OMDirectoryCreateRequestV1 omDirCreateRequestV1 =
-            new OMDirectoryCreateRequestV1(omRequest);
+    OMDirectoryCreateRequestWithFSO omDirCreateReqFSO =
+            new OMDirectoryCreateRequestWithFSO(omRequest);
 
-    OMRequest modifiedOmRequest = omDirCreateRequestV1.preExecute(ozoneManager);
+    OMRequest modifiedOmReq = omDirCreateReqFSO.preExecute(ozoneManager);
 
-    omDirCreateRequestV1 = new OMDirectoryCreateRequestV1(modifiedOmRequest);
+    omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq);
 
     Assert.assertEquals(0L, omMetrics.getNumKeys());
     OMClientResponse omClientResponse =
-            omDirCreateRequestV1.validateAndUpdateCache(ozoneManager, 100L,
+            omDirCreateReqFSO.validateAndUpdateCache(ozoneManager, 100L,
                     ozoneManagerDoubleBufferHelper);
 
     Assert.assertEquals(OzoneManagerProtocolProtos.Status.OK,
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequestV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequestWithFSO.java
similarity index 96%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequestV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequestWithFSO.java
index 2631c91..ddafb38 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequestWithFSO.java
@@ -34,9 +34,9 @@ import org.junit.Test;
 import java.util.UUID;
 
 /**
- * Tests OMFileCreateRequest layout version V1.
+ * Tests OMFileCreateRequest - prefix layout.
  */
-public class TestOMFileCreateRequestV1 extends TestOMFileCreateRequest {
+public class TestOMFileCreateRequestWithFSO extends TestOMFileCreateRequest {
 
   @Test
   public void testValidateAndUpdateCacheWithNonRecursive() throws Exception {
@@ -182,7 +182,7 @@ public class TestOMFileCreateRequestV1 extends TestOMFileCreateRequest {
   @Override
   protected OzoneConfiguration getOzoneConfiguration() {
     OzoneConfiguration config = super.getOzoneConfiguration();
-    // omLayoutVersionV1 flag will be set while invoking OzoneManager#start()
+    // Metadata Layout prefix will be set while invoking OzoneManager#start()
     // and its not invoked in this test. Hence it is explicitly setting
     // this configuration to populate prefix tables.
     OzoneManagerRatisUtils.setBucketFSOptimized(true);
@@ -190,6 +190,6 @@ public class TestOMFileCreateRequestV1 extends TestOMFileCreateRequest {
   }
 
   protected OMFileCreateRequest getOMFileCreateRequest(OMRequest omRequest) {
-    return new OMFileCreateRequestV1(omRequest);
+    return new OMFileCreateRequestWithFSO(omRequest);
   }
 }
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequestV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequestWithFSO.java
similarity index 91%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequestV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequestWithFSO.java
index 5d21226..ca9ccbe 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequestWithFSO.java
@@ -34,15 +34,16 @@ import org.jetbrains.annotations.NotNull;
 import org.junit.Assert;
 
 /**
- * Tests OMAllocateBlockRequest class layout version V1.
+ * Tests OMAllocateBlockRequest class prefix layout.
  */
-public class TestOMAllocateBlockRequestV1 extends TestOMAllocateBlockRequest {
+public class TestOMAllocateBlockRequestWithFSO
+    extends TestOMAllocateBlockRequest {
 
   @NotNull
   @Override
   protected OzoneConfiguration getOzoneConfiguration() {
     OzoneConfiguration config = super.getOzoneConfiguration();
-    // omLayoutVersionV1 flag will be set while invoking OzoneManager#start()
+    // metadata layout prefix will be set while invoking OzoneManager#start()
     // and its not invoked in this test. Hence it is explicitly setting
     // this configuration to populate prefix tables.
     OzoneManagerRatisUtils.setBucketFSOptimized(true);
@@ -62,7 +63,7 @@ public class TestOMAllocateBlockRequestV1 extends TestOMAllocateBlockRequest {
     long txnId = 50;
     long objectId = parentID + 1;
 
-    OmKeyInfo omKeyInfoV1 =
+    OmKeyInfo omKeyInfoFSO =
             TestOMRequestUtils.createOmKeyInfo(volumeName, bucketName, keyName,
                     HddsProtos.ReplicationType.RATIS,
                     HddsProtos.ReplicationFactor.ONE, objectId, parentID, txnId,
@@ -70,7 +71,7 @@ public class TestOMAllocateBlockRequestV1 extends TestOMAllocateBlockRequest {
 
     // add key to openFileTable
     TestOMRequestUtils.addFileToKeyTable(true, false,
-            fileName, omKeyInfoV1, clientID, txnLogId, omMetadataManager);
+            fileName, omKeyInfoFSO, clientID, txnLogId, omMetadataManager);
 
     return omMetadataManager.getOzonePathKey(parentID, fileName);
   }
@@ -78,7 +79,7 @@ public class TestOMAllocateBlockRequestV1 extends TestOMAllocateBlockRequest {
   @NotNull
   protected OMAllocateBlockRequest getOmAllocateBlockRequest(
           OzoneManagerProtocolProtos.OMRequest modifiedOmRequest) {
-    return new OMAllocateBlockRequestV1(modifiedOmRequest);
+    return new OMAllocateBlockRequestWithFSO(modifiedOmRequest);
   }
 
   @Override
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequestV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequestWithFSO.java
similarity index 88%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequestV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequestWithFSO.java
index 12e745c..2870bb0 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequestWithFSO.java
@@ -23,16 +23,16 @@ import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
 import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils;
 import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
 import org.apache.hadoop.ozone.om.request.key.acl.OMKeyAclRequest;
-import org.apache.hadoop.ozone.om.request.key.acl.OMKeyAddAclRequestV1;
-import org.apache.hadoop.ozone.om.request.key.acl.OMKeyRemoveAclRequestV1;;
-import org.apache.hadoop.ozone.om.request.key.acl.OMKeySetAclRequestV1;
+import org.apache.hadoop.ozone.om.request.key.acl.OMKeyAddAclRequestWithFSO;
+import org.apache.hadoop.ozone.om.request.key.acl.OMKeyRemoveAclRequestWithFSO;;
+import org.apache.hadoop.ozone.om.request.key.acl.OMKeySetAclRequestWithFSO;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.util.Time;
 
 /**
- * Test Key ACL requests for layout version V1.
+ * Test Key ACL requests for prefix layout.
  */
-public class TestOMKeyAclRequestV1 extends TestOMKeyAclRequest {
+public class TestOMKeyAclRequestWithFSO extends TestOMKeyAclRequest {
 
   protected String addKeyToTable() throws Exception {
     String parentDir = "c/d/e";
@@ -57,22 +57,22 @@ public class TestOMKeyAclRequestV1 extends TestOMKeyAclRequest {
 
   @Override protected OMKeyAclRequest getOmKeyAddAclRequest(
       OzoneManagerProtocolProtos.OMRequest originalRequest) {
-    return new OMKeyAddAclRequestV1(originalRequest);
+    return new OMKeyAddAclRequestWithFSO(originalRequest);
   }
 
   @Override protected OMKeyAclRequest getOmKeyRemoveAclRequest(
       OzoneManagerProtocolProtos.OMRequest removeAclRequest) {
-    return new OMKeyRemoveAclRequestV1(removeAclRequest);
+    return new OMKeyRemoveAclRequestWithFSO(removeAclRequest);
   }
 
   @Override protected OMKeyAclRequest getOmKeySetAclRequest(
       OzoneManagerProtocolProtos.OMRequest setAclRequest) {
-    return new OMKeySetAclRequestV1(setAclRequest);
+    return new OMKeySetAclRequestWithFSO(setAclRequest);
   }
 
   @Override protected OzoneConfiguration getOzoneConfiguration() {
     OzoneConfiguration config = super.getOzoneConfiguration();
-    // omLayoutVersionV1 flag will be set while invoking OzoneManager#start()
+    // Metadata layout prefix will be set while invoking OzoneManager#start()
     // and its not invoked in this test. Hence it is explicitly setting
     // this configuration to populate prefix tables.
     OzoneManagerRatisUtils.setBucketFSOptimized(true);
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequestV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequestWithFSO.java
similarity index 89%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequestV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequestWithFSO.java
index 379dbcf..fde3f7b 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequestWithFSO.java
@@ -34,9 +34,9 @@ import org.junit.Assert;
 import java.io.IOException;
 
 /**
- * Class tests OMKeyCommitRequestV1 class layout version V1.
+ * Class tests OMKeyCommitRequest with prefix layout.
  */
-public class TestOMKeyCommitRequestV1 extends TestOMKeyCommitRequest {
+public class TestOMKeyCommitRequestWithFSO extends TestOMKeyCommitRequest {
 
   private long parentID = Long.MIN_VALUE;
 
@@ -69,7 +69,7 @@ public class TestOMKeyCommitRequestV1 extends TestOMKeyCommitRequest {
     }
     long objectId = 100;
 
-    OmKeyInfo omKeyInfoV1 =
+    OmKeyInfo omKeyInfoFSO =
             TestOMRequestUtils.createOmKeyInfo(volumeName, bucketName, keyName,
                     HddsProtos.ReplicationType.RATIS,
                     HddsProtos.ReplicationFactor.ONE, objectId, parentID, 100,
@@ -77,7 +77,7 @@ public class TestOMKeyCommitRequestV1 extends TestOMKeyCommitRequest {
 
     String fileName = OzoneFSUtils.getFileName(keyName);
     TestOMRequestUtils.addFileToKeyTable(true, false,
-            fileName, omKeyInfoV1, clientID, txnLogId, omMetadataManager);
+            fileName, omKeyInfoFSO, clientID, txnLogId, omMetadataManager);
 
     return omMetadataManager.getOzonePathKey(parentID, fileName);
   }
@@ -86,7 +86,7 @@ public class TestOMKeyCommitRequestV1 extends TestOMKeyCommitRequest {
   @Override
   protected OzoneConfiguration getOzoneConfiguration() {
     OzoneConfiguration config = super.getOzoneConfiguration();
-    // omLayoutVersionV1 flag will be set while invoking OzoneManager#start()
+    // Metadata layout prefix will be set while invoking OzoneManager#start()
     // and its not invoked in this test. Hence it is explicitly setting
     // this configuration to populate prefix tables.
     OzoneManagerRatisUtils.setBucketFSOptimized(true);
@@ -95,11 +95,11 @@ public class TestOMKeyCommitRequestV1 extends TestOMKeyCommitRequest {
 
   @NotNull
   protected OMKeyCommitRequest getOmKeyCommitRequest(OMRequest omRequest) {
-    return new OMKeyCommitRequestV1(omRequest);
+    return new OMKeyCommitRequestWithFSO(omRequest);
   }
 
   protected void verifyKeyName(OmKeyInfo omKeyInfo) {
-    // V1 format - stores fileName in the keyName DB field.
+    // prefix layout format - stores fileName in the keyName DB field.
     String fileName = OzoneFSUtils.getFileName(keyName);
     Assert.assertEquals("Incorrect FileName", fileName,
             omKeyInfo.getFileName());
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCreateRequestV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCreateRequestWithFSO.java
similarity index 95%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCreateRequestV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCreateRequestWithFSO.java
index e545dc7..27e9c4f 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCreateRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCreateRequestWithFSO.java
@@ -38,15 +38,15 @@ import java.nio.file.Paths;
 import java.util.Iterator;
 
 /**
- * Tests OMCreateKeyRequestV1 class.
+ * Tests OMCreateKeyRequestWithFSO class.
  */
-public class TestOMKeyCreateRequestV1 extends TestOMKeyCreateRequest {
+public class TestOMKeyCreateRequestWithFSO extends TestOMKeyCreateRequest {
 
   @NotNull
   @Override
   protected OzoneConfiguration getOzoneConfiguration() {
     OzoneConfiguration config = super.getOzoneConfiguration();
-    // omLayoutVersionV1 flag will be set while invoking OzoneManager#start()
+    // Metadata layout prefix will be set while invoking OzoneManager#start()
     // and its not invoked in this test. Hence it is explicitly setting
     // this configuration to populate prefix tables.
     OzoneManagerRatisUtils.setBucketFSOptimized(true);
@@ -125,6 +125,6 @@ public class TestOMKeyCreateRequestV1 extends TestOMKeyCreateRequest {
   }
 
   protected OMKeyCreateRequest getOMKeyCreateRequest(OMRequest omRequest) {
-    return new OMKeyCreateRequestV1(omRequest);
+    return new OMKeyCreateRequestWithFSO(omRequest);
   }
 }
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequestV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequestWithFSO.java
similarity index 95%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequestV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequestWithFSO.java
index 7d58d08..3c9c5c9 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequestWithFSO.java
@@ -37,13 +37,13 @@ import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 /**
- * Tests OmKeyDelete request layout version V1.
+ * Tests OmKeyDelete request with prefix layout.
  */
-public class TestOMKeyDeleteRequestV1 extends TestOMKeyDeleteRequest {
+public class TestOMKeyDeleteRequestWithFSO extends TestOMKeyDeleteRequest {
 
   protected OMKeyDeleteRequest getOmKeyDeleteRequest(
       OMRequest modifiedOmRequest) {
-    return new OMKeyDeleteRequestV1(modifiedOmRequest);
+    return new OMKeyDeleteRequestWithFSO(modifiedOmRequest);
   }
 
   protected String addKeyToTable() throws Exception {
@@ -71,7 +71,7 @@ public class TestOMKeyDeleteRequestV1 extends TestOMKeyDeleteRequest {
   @Override
   protected OzoneConfiguration getOzoneConfiguration() {
     OzoneConfiguration config = super.getOzoneConfiguration();
-    // omLayoutVersionV1 flag will be set while invoking OzoneManager#start()
+    // Metadata layout prefix will be set while invoking OzoneManager#start()
     // and its not invoked in this test. Hence it is explicitly setting
     // this configuration to populate prefix tables.
     OzoneManagerRatisUtils.setBucketFSOptimized(true);
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3InitiateMultipartUploadRequestV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3InitiateMultipartUploadRequestWithFSO.java
similarity index 94%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3InitiateMultipartUploadRequestV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3InitiateMultipartUploadRequestWithFSO.java
index 4c9dbb5..c39d679 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3InitiateMultipartUploadRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3InitiateMultipartUploadRequestWithFSO.java
@@ -38,7 +38,7 @@ import java.util.UUID;
 /**
  * Tests S3 Initiate Multipart Upload request.
  */
-public class TestS3InitiateMultipartUploadRequestV1
+public class TestS3InitiateMultipartUploadRequestWithFSO
     extends TestS3InitiateMultipartUploadRequest {
 
   @Test
@@ -62,14 +62,14 @@ public class TestS3InitiateMultipartUploadRequestV1
             omMetadataManager.getBucketTable().get(bucketKey);
     long bucketID = omBucketInfo.getObjectID();
 
-    OMRequest modifiedRequest = doPreExecuteInitiateMPUV1(volumeName,
+    OMRequest modifiedRequest = doPreExecuteInitiateMPUWithFSO(volumeName,
         bucketName, keyName);
 
-    S3InitiateMultipartUploadRequest s3InitiateMultipartUploadRequestV1 =
+    S3InitiateMultipartUploadRequest s3InitiateMultipartUploadReqFSO =
         getS3InitiateMultipartUploadReq(modifiedRequest);
 
     OMClientResponse omClientResponse =
-            s3InitiateMultipartUploadRequestV1.validateAndUpdateCache(
+            s3InitiateMultipartUploadReqFSO.validateAndUpdateCache(
                     ozoneManager, 100L,
                     ozoneManagerDoubleBufferHelper);
 
@@ -134,6 +134,6 @@ public class TestS3InitiateMultipartUploadRequestV1
 
   protected S3InitiateMultipartUploadRequest getS3InitiateMultipartUploadReq(
       OMRequest initiateMPURequest) {
-    return new S3InitiateMultipartUploadRequestV1(initiateMPURequest);
+    return new S3InitiateMultipartUploadRequestWithFSO(initiateMPURequest);
   }
 }
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartRequest.java
index d08b4ae..5fe2c0d 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartRequest.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartRequest.java
@@ -225,17 +225,18 @@ public class TestS3MultipartRequest {
    * @param keyName
    * @return OMRequest - returned from preExecute.
    */
-  protected OMRequest doPreExecuteInitiateMPUV1(
+  protected OMRequest doPreExecuteInitiateMPUWithFSO(
       String volumeName, String bucketName, String keyName) throws Exception {
     OMRequest omRequest =
             TestOMRequestUtils.createInitiateMPURequest(volumeName, bucketName,
                     keyName);
 
-    S3InitiateMultipartUploadRequestV1 s3InitiateMultipartUploadRequestV1 =
-            new S3InitiateMultipartUploadRequestV1(omRequest);
+    S3InitiateMultipartUploadRequestWithFSO
+        s3InitiateMultipartUploadRequestWithFSO =
+            new S3InitiateMultipartUploadRequestWithFSO(omRequest);
 
     OMRequest modifiedRequest =
-            s3InitiateMultipartUploadRequestV1.preExecute(ozoneManager);
+            s3InitiateMultipartUploadRequestWithFSO.preExecute(ozoneManager);
 
     Assert.assertNotEquals(omRequest, modifiedRequest);
     Assert.assertTrue(modifiedRequest.hasInitiateMultiPartUploadRequest());
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadAbortRequestV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadAbortRequestWithFSO.java
similarity index 91%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadAbortRequestV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadAbortRequestWithFSO.java
index fd8a158..7db5fd6 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadAbortRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadAbortRequestWithFSO.java
@@ -27,7 +27,7 @@ import java.util.UUID;
 /**
  * Test Multipart upload abort request.
  */
-public class TestS3MultipartUploadAbortRequestV1
+public class TestS3MultipartUploadAbortRequestWithFSO
     extends TestS3MultipartUploadAbortRequest {
 
   private String dirName = "a/b/c/";
@@ -37,13 +37,13 @@ public class TestS3MultipartUploadAbortRequestV1
   @Override
   protected S3MultipartUploadAbortRequest getS3MultipartUploadAbortReq(
       OMRequest omRequest) {
-    return new S3MultipartUploadAbortRequestV1(omRequest);
+    return new S3MultipartUploadAbortRequestWithFSO(omRequest);
   }
 
   @Override
   protected S3InitiateMultipartUploadRequest getS3InitiateMultipartUploadReq(
       OMRequest initiateMPURequest) {
-    return new S3InitiateMultipartUploadRequestV1(initiateMPURequest);
+    return new S3InitiateMultipartUploadRequestWithFSO(initiateMPURequest);
   }
 
   @Override
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCommitPartRequestV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCommitPartRequestWithFSO.java
similarity index 93%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCommitPartRequestV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCommitPartRequestWithFSO.java
index d0d01e1..b6e5bcb 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCommitPartRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCommitPartRequestWithFSO.java
@@ -33,7 +33,7 @@ import java.util.UUID;
 /**
  * Tests S3 Multipart upload commit part request.
  */
-public class TestS3MultipartUploadCommitPartRequestV1
+public class TestS3MultipartUploadCommitPartRequestWithFSO
     extends TestS3MultipartUploadCommitPartRequest {
 
   private String dirName = "a/b/c/";
@@ -42,12 +42,12 @@ public class TestS3MultipartUploadCommitPartRequestV1
 
   protected S3MultipartUploadCommitPartRequest getS3MultipartUploadCommitReq(
           OMRequest omRequest) {
-    return new S3MultipartUploadCommitPartRequestV1(omRequest);
+    return new S3MultipartUploadCommitPartRequestWithFSO(omRequest);
   }
 
   protected S3InitiateMultipartUploadRequest getS3InitiateMultipartUploadReq(
           OMRequest initiateMPURequest) {
-    return new S3InitiateMultipartUploadRequestV1(initiateMPURequest);
+    return new S3InitiateMultipartUploadRequestWithFSO(initiateMPURequest);
   }
 
   protected String getKeyName() {
@@ -80,7 +80,7 @@ public class TestS3MultipartUploadCommitPartRequestV1
                     keyName);
 
     S3InitiateMultipartUploadRequest s3InitiateMultipartUploadRequest =
-            new S3InitiateMultipartUploadRequestV1(omRequest);
+            new S3InitiateMultipartUploadRequestWithFSO(omRequest);
 
     OMRequest modifiedRequest =
             s3InitiateMultipartUploadRequest.preExecute(ozoneManager);
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequestV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequestWithFSO.java
similarity index 92%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequestV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequestWithFSO.java
index cd5051f..972de95 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequestWithFSO.java
@@ -41,7 +41,7 @@ import java.util.UUID;
 /**
  * Tests S3 Multipart Upload Complete request.
  */
-public class TestS3MultipartUploadCompleteRequestV1
+public class TestS3MultipartUploadCompleteRequestWithFSO
     extends TestS3MultipartUploadCompleteRequest {
 
   @BeforeClass
@@ -67,7 +67,7 @@ public class TestS3MultipartUploadCompleteRequestV1
     long txnId = 50;
     long objectId = parentID + 1;
 
-    OmKeyInfo omKeyInfoV1 =
+    OmKeyInfo omKeyInfoFSO =
             TestOMRequestUtils.createOmKeyInfo(volumeName, bucketName, keyName,
                     HddsProtos.ReplicationType.RATIS,
                     HddsProtos.ReplicationFactor.ONE, objectId, parentID, txnId,
@@ -75,9 +75,9 @@ public class TestS3MultipartUploadCompleteRequestV1
 
     // add key to openFileTable
     String fileName = OzoneFSUtils.getFileName(keyName);
-    omKeyInfoV1.setKeyName(fileName);
+    omKeyInfoFSO.setKeyName(fileName);
     TestOMRequestUtils.addFileToKeyTable(true, false,
-            fileName, omKeyInfoV1, clientID, omKeyInfoV1.getObjectID(),
+            fileName, omKeyInfoFSO, clientID, omKeyInfoFSO.getObjectID(),
             omMetadataManager);
   }
 
@@ -115,17 +115,17 @@ public class TestS3MultipartUploadCompleteRequestV1
 
   protected S3MultipartUploadCompleteRequest getS3MultipartUploadCompleteReq(
           OMRequest omRequest) {
-    return new S3MultipartUploadCompleteRequestV1(omRequest);
+    return new S3MultipartUploadCompleteRequestWithFSO(omRequest);
   }
 
   protected S3MultipartUploadCommitPartRequest getS3MultipartUploadCommitReq(
           OMRequest omRequest) {
-    return new S3MultipartUploadCommitPartRequestV1(omRequest);
+    return new S3MultipartUploadCommitPartRequestWithFSO(omRequest);
   }
 
   protected S3InitiateMultipartUploadRequest getS3InitiateMultipartUploadReq(
           OMRequest initiateMPURequest) {
-    return new S3InitiateMultipartUploadRequestV1(initiateMPURequest);
+    return new S3InitiateMultipartUploadRequestWithFSO(initiateMPURequest);
   }
 
 }
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponseV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponseWithFSO.java
similarity index 87%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponseV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponseWithFSO.java
index fb06581..628ac65 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponseWithFSO.java
@@ -25,7 +25,7 @@ import org.apache.hadoop.ozone.om.OMMetadataManager;
 import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
 import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
 import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
-import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequestV1;
+import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequestWithFSO;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
 import org.junit.Assert;
@@ -38,9 +38,9 @@ import java.util.ArrayList;
 import java.util.UUID;
 
 /**
- * Tests OMDirectoryCreateResponseV1 new layout version.
+ * Tests OMDirectoryCreateResponseWithFSO - prefix layout.
  */
-public class TestOMDirectoryCreateResponseV1 {
+public class TestOMDirectoryCreateResponseWithFSO {
   @Rule
   public TemporaryFolder folder = new TemporaryFolder();
 
@@ -71,11 +71,12 @@ public class TestOMDirectoryCreateResponseV1 {
             .setCmdType(OzoneManagerProtocolProtos.Type.CreateDirectory)
             .build();
 
-    OMDirectoryCreateResponseV1 omDirectoryCreateResponseV1 =
-        new OMDirectoryCreateResponseV1(omResponse, omDirInfo,
-            new ArrayList<>(), OMDirectoryCreateRequestV1.Result.SUCCESS);
+    OMDirectoryCreateResponseWithFSO omDirectoryCreateResponseWithFSO =
+        new OMDirectoryCreateResponseWithFSO(omResponse, omDirInfo,
+            new ArrayList<>(), OMDirectoryCreateRequestWithFSO.Result.SUCCESS);
 
-    omDirectoryCreateResponseV1.addToDBBatch(omMetadataManager, batchOperation);
+    omDirectoryCreateResponseWithFSO
+        .addToDBBatch(omMetadataManager, batchOperation);
 
     // Do manual commit and see whether addToBatch is successful or not.
     omMetadataManager.getStore().commitBatchOperation(batchOperation);
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMFileCreateResponseV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMFileCreateResponseWithFSO.java
similarity index 89%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMFileCreateResponseV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMFileCreateResponseWithFSO.java
index a8a0c99..4697079 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMFileCreateResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMFileCreateResponseWithFSO.java
@@ -33,9 +33,9 @@ import org.junit.Assert;
 import java.util.ArrayList;
 
 /**
- * Tests MKeyCreateResponse layout version V1.
+ * Tests MKeyCreateResponse - prefix layout1.
  */
-public class TestOMFileCreateResponseV1 extends TestOMKeyCreateResponse {
+public class TestOMFileCreateResponseWithFSO extends TestOMKeyCreateResponse {
 
   @NotNull
   @Override
@@ -61,15 +61,15 @@ public class TestOMFileCreateResponseV1 extends TestOMKeyCreateResponse {
   protected OMKeyCreateResponse getOmKeyCreateResponse(OmKeyInfo keyInfo,
       OmBucketInfo bucketInfo, OMResponse response) {
 
-    return new OMFileCreateResponseV1(response, keyInfo, new ArrayList<>(),
-            clientID, bucketInfo);
+    return new OMFileCreateResponseWithFSO(response, keyInfo,
+        new ArrayList<>(), clientID, bucketInfo);
   }
 
   @NotNull
   @Override
   protected OzoneConfiguration getOzoneConfiguration() {
     OzoneConfiguration config = super.getOzoneConfiguration();
-    // omLayoutVersionV1 flag will be set while invoking OzoneManager#start()
+    // Metadata layout prefix will be set while invoking OzoneManager#start()
     // and its not invoked in this test. Hence it is explicitly setting
     // this configuration to populate prefix tables.
     OzoneManagerRatisUtils.setBucketFSOptimized(true);
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponseV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponseWithFSO.java
similarity index 90%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponseV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponseWithFSO.java
index 1626079..97e1b90 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponseWithFSO.java
@@ -30,9 +30,9 @@ import org.apache.hadoop.util.Time;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Tests OMAllocateBlockResponse layout version V1.
+ * Tests OMAllocateBlockResponse - prefix layout.
  */
-public class TestOMAllocateBlockResponseV1
+public class TestOMAllocateBlockResponseWithFSO
         extends TestOMAllocateBlockResponse {
 
   // logical ID, which really doesn't exist in dirTable
@@ -47,12 +47,12 @@ public class TestOMAllocateBlockResponseV1
     long txnId = 50;
     long objectId = parentID + 1;
 
-    OmKeyInfo omKeyInfoV1 =
+    OmKeyInfo omKeyInfoFSO =
             TestOMRequestUtils.createOmKeyInfo(volumeName, bucketName, keyName,
                     HddsProtos.ReplicationType.RATIS,
                     HddsProtos.ReplicationFactor.ONE, objectId, parentID, txnId,
                     Time.now());
-    return omKeyInfoV1;
+    return omKeyInfoFSO;
   }
 
   protected String getOpenKey() throws Exception {
@@ -64,7 +64,7 @@ public class TestOMAllocateBlockResponseV1
   protected OMAllocateBlockResponse getOmAllocateBlockResponse(
           OmKeyInfo omKeyInfo, OmBucketInfo omBucketInfo,
           OMResponse omResponse) {
-    return new OMAllocateBlockResponseV1(omResponse, omKeyInfo, clientID,
+    return new OMAllocateBlockResponseWithFSO(omResponse, omKeyInfo, clientID,
             omBucketInfo);
   }
 
@@ -72,7 +72,7 @@ public class TestOMAllocateBlockResponseV1
   @Override
   protected OzoneConfiguration getOzoneConfiguration() {
     OzoneConfiguration config = super.getOzoneConfiguration();
-    // omLayoutVersionV1 flag will be set while invoking OzoneManager#start()
+    // Metadata layout prefix will be set while invoking OzoneManager#start()
     // and its not invoked in this test. Hence it is explicitly setting
     // this configuration to populate prefix tables.
     OzoneManagerRatisUtils.setBucketFSOptimized(true);
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponseV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponseWithFSO.java
similarity index 89%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponseV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponseWithFSO.java
index 7275f69..4eabb3f 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponseWithFSO.java
@@ -31,9 +31,9 @@ import org.jetbrains.annotations.NotNull;
 import org.junit.Assert;
 
 /**
- * Tests OMKeyCommitResponse layout version V1.
+ * Tests OMKeyCommitResponse - prefix layout.
  */
-public class TestOMKeyCommitResponseV1 extends TestOMKeyCommitResponse {
+public class TestOMKeyCommitResponseWithFSO extends TestOMKeyCommitResponse {
 
   @NotNull
   protected OMKeyCommitResponse getOmKeyCommitResponse(
@@ -41,8 +41,8 @@ public class TestOMKeyCommitResponseV1 extends TestOMKeyCommitResponse {
           OzoneManagerProtocolProtos.OMResponse omResponse, String openKey,
           String ozoneKey) {
     Assert.assertNotNull(omBucketInfo);
-    return new OMKeyCommitResponseV1(omResponse, omKeyInfo, ozoneKey, openKey,
-            omBucketInfo);
+    return new OMKeyCommitResponseWithFSO(omResponse, omKeyInfo, ozoneKey,
+        openKey, omBucketInfo);
   }
 
   @NotNull
@@ -63,7 +63,7 @@ public class TestOMKeyCommitResponseV1 extends TestOMKeyCommitResponse {
     long parentID = omBucketInfo.getObjectID();
     long objectId = parentID + 10;
 
-    OmKeyInfo omKeyInfoV1 =
+    OmKeyInfo omKeyInfoFSO =
             TestOMRequestUtils.createOmKeyInfo(volumeName, bucketName, keyName,
                     HddsProtos.ReplicationType.RATIS,
                     HddsProtos.ReplicationFactor.ONE, objectId, parentID, 100,
@@ -71,7 +71,7 @@ public class TestOMKeyCommitResponseV1 extends TestOMKeyCommitResponse {
 
     String fileName = OzoneFSUtils.getFileName(keyName);
     TestOMRequestUtils.addFileToKeyTable(true, false,
-            fileName, omKeyInfoV1, clientID, txnLogId, omMetadataManager);
+            fileName, omKeyInfoFSO, clientID, txnLogId, omMetadataManager);
   }
 
   @NotNull
@@ -94,7 +94,7 @@ public class TestOMKeyCommitResponseV1 extends TestOMKeyCommitResponse {
   @Override
   protected OzoneConfiguration getOzoneConfiguration() {
     OzoneConfiguration config = super.getOzoneConfiguration();
-    // omLayoutVersionV1 flag will be set while invoking OzoneManager#start()
+    // Metadata layout prefix will be set while invoking OzoneManager#start()
     // and its not invoked in this test. Hence it is explicitly setting
     // this configuration to populate prefix tables.
     OzoneManagerRatisUtils.setBucketFSOptimized(true);
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCreateResponseV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCreateResponseWithFSO.java
similarity index 89%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCreateResponseV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCreateResponseWithFSO.java
index 834aafa..f816d17 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCreateResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCreateResponseWithFSO.java
@@ -31,15 +31,15 @@ import org.junit.Assert;
 import java.util.ArrayList;
 
 /**
- * Tests OMKeyCreateResponseV1.
+ * Tests OMKeyCreateResponseWithFSO.
  */
-public class TestOMKeyCreateResponseV1 extends TestOMKeyCreateResponse {
+public class TestOMKeyCreateResponseWithFSO extends TestOMKeyCreateResponse {
 
   @NotNull
   @Override
   protected OzoneConfiguration getOzoneConfiguration() {
     OzoneConfiguration config = super.getOzoneConfiguration();
-    // omLayoutVersionV1 flag will be set while invoking OzoneManager#start()
+    // Metadata layout prefix will be set while invoking OzoneManager#start()
     // and its not invoked in this test. Hence it is explicitly setting
     // this configuration to populate prefix tables.
     OzoneManagerRatisUtils.setBucketFSOptimized(true);
@@ -69,7 +69,7 @@ public class TestOMKeyCreateResponseV1 extends TestOMKeyCreateResponse {
   protected OMKeyCreateResponse getOmKeyCreateResponse(OmKeyInfo keyInfo,
       OmBucketInfo bucketInfo, OMResponse response) {
 
-    return new OMKeyCreateResponseV1(response, keyInfo,  new ArrayList<>(),
-            clientID, bucketInfo);
+    return new OMKeyCreateResponseWithFSO(response, keyInfo, new ArrayList<>(),
+        clientID, bucketInfo);
   }
 }
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponseV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponseWithFSO.java
similarity index 92%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponseV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponseWithFSO.java
index 4422527..9a68f96 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponseWithFSO.java
@@ -29,14 +29,14 @@ import org.jetbrains.annotations.NotNull;
 import org.junit.Assert;
 
 /**
- * Tests OMKeyDeleteResponse layout version V1.
+ * Tests OMKeyDeleteResponse - prefix layout.
  */
-public class TestOMKeyDeleteResponseV1 extends TestOMKeyDeleteResponse {
+public class TestOMKeyDeleteResponseWithFSO extends TestOMKeyDeleteResponse {
 
   @Override
   protected OMKeyDeleteResponse getOmKeyDeleteResponse(OmKeyInfo omKeyInfo,
       OzoneManagerProtocolProtos.OMResponse omResponse) {
-    return new OMKeyDeleteResponseV1(omResponse, omKeyInfo.getKeyName(),
+    return new OMKeyDeleteResponseWithFSO(omResponse, omKeyInfo.getKeyName(),
         omKeyInfo, true, getOmBucketInfo(), false);
   }
 
@@ -75,7 +75,7 @@ public class TestOMKeyDeleteResponseV1 extends TestOMKeyDeleteResponse {
   @Override
   protected OzoneConfiguration getOzoneConfiguration() {
     OzoneConfiguration config = super.getOzoneConfiguration();
-    // omLayoutVersionV1 flag will be set while invoking OzoneManager#start()
+    // Metadata layout prefix will be set while invoking OzoneManager#start()
     // and its not invoked in this test. Hence it is explicitly setting
     // this configuration to populate prefix tables.
     OzoneManagerRatisUtils.setBucketFSOptimized(true);
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3InitiateMultipartUploadResponseV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3InitiateMultipartUploadResponseWithFSO.java
similarity index 93%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3InitiateMultipartUploadResponseV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3InitiateMultipartUploadResponseWithFSO.java
index 6dd6aaf..b29fa2a 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3InitiateMultipartUploadResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3InitiateMultipartUploadResponseWithFSO.java
@@ -32,7 +32,7 @@ import java.util.UUID;
 /**
  * Class tests S3 Initiate MPU response.
  */
-public class TestS3InitiateMultipartUploadResponseV1
+public class TestS3InitiateMultipartUploadResponseWithFSO
     extends TestS3InitiateMultipartUploadResponse {
 
   @Test
@@ -48,11 +48,11 @@ public class TestS3InitiateMultipartUploadResponseV1
     long parentID = 1027; // assume objectID of dir path "a/b/c/d" is 1027
     List<OmDirectoryInfo> parentDirInfos = new ArrayList<>();
 
-    S3InitiateMultipartUploadResponse s3InitiateMultipartUploadResponseV1 =
-            createS3InitiateMPUResponseV1(volumeName, bucketName, parentID,
+    S3InitiateMultipartUploadResponse s3InitiateMultipartUploadResponseFSO =
+            createS3InitiateMPUResponseFSO(volumeName, bucketName, parentID,
                     keyName, multipartUploadID, parentDirInfos);
 
-    s3InitiateMultipartUploadResponseV1.addToDBBatch(omMetadataManager,
+    s3InitiateMultipartUploadResponseFSO.addToDBBatch(omMetadataManager,
         batchOperation);
 
     // Do manual commit and see whether addToBatch is successful or not.
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartResponse.java
index c10ff77..cef6009 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartResponse.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartResponse.java
@@ -156,7 +156,7 @@ public class TestS3MultipartResponse {
             .setFactor(HddsProtos.ReplicationFactor.ONE).build()).build();
   }
 
-  public PartKeyInfo createPartKeyInfoV1(
+  public PartKeyInfo createPartKeyInfoFSO(
       String volumeName, String bucketName, long parentID, String fileName,
       int partNumber) {
     return PartKeyInfo.newBuilder()
@@ -175,7 +175,7 @@ public class TestS3MultipartResponse {
             .setFactor(HddsProtos.ReplicationFactor.ONE).build()).build();
   }
 
-  public S3InitiateMultipartUploadResponse createS3InitiateMPUResponseV1(
+  public S3InitiateMultipartUploadResponse createS3InitiateMPUResponseFSO(
       String volumeName, String bucketName, long parentID, String keyName,
       String multipartUploadID, List<OmDirectoryInfo> parentDirInfos) {
     OmMultipartKeyInfo multipartKeyInfo = new OmMultipartKeyInfo.Builder()
@@ -212,12 +212,12 @@ public class TestS3MultipartResponse {
                             .setKeyName(keyName)
                             .setMultipartUploadID(multipartUploadID)).build();
 
-    return new S3InitiateMultipartUploadResponseV1(omResponse, multipartKeyInfo,
-            omKeyInfo, parentDirInfos);
+    return new S3InitiateMultipartUploadResponseWithFSO(omResponse,
+        multipartKeyInfo, omKeyInfo, parentDirInfos);
   }
 
   @SuppressWarnings("checkstyle:ParameterNumber")
-  public S3MultipartUploadCommitPartResponse createS3CommitMPUResponseV1(
+  public S3MultipartUploadCommitPartResponse createS3CommitMPUResponseFSO(
           String volumeName, String bucketName, long parentID, String keyName,
           String multipartUploadID,
           OzoneManagerProtocolProtos.PartKeyInfo oldPartKeyInfo,
@@ -262,13 +262,13 @@ public class TestS3MultipartResponse {
                     OzoneManagerProtocolProtos.MultipartCommitUploadPartResponse
                             .newBuilder().setPartName(volumeName)).build();
 
-    return new S3MultipartUploadCommitPartResponseV1(omResponse, multipartKey,
-            openKey, multipartKeyInfo, oldPartKeyInfo,
-            openPartKeyInfoToBeDeleted, isRatisEnabled, omBucketInfo);
+    return new S3MultipartUploadCommitPartResponseWithFSO(omResponse,
+        multipartKey, openKey, multipartKeyInfo, oldPartKeyInfo,
+        openPartKeyInfoToBeDeleted, isRatisEnabled, omBucketInfo);
   }
 
   @SuppressWarnings("checkstyle:ParameterNumber")
-  public S3MultipartUploadCompleteResponse createS3CompleteMPUResponseV1(
+  public S3MultipartUploadCompleteResponse createS3CompleteMPUResponseFSO(
           String volumeName, String bucketName, long parentID, String keyName,
           String multipartUploadID, OmKeyInfo omKeyInfo,
           OzoneManagerProtocolProtos.Status status,
@@ -284,8 +284,8 @@ public class TestS3MultipartResponse {
                             .newBuilder().setBucket(bucketName)
                             .setVolume(volumeName).setKey(keyName)).build();
 
-    return new S3MultipartUploadCompleteResponseV1(omResponse, multipartKey,
-            omKeyInfo, unUsedParts);
+    return new S3MultipartUploadCompleteResponseWithFSO(omResponse,
+        multipartKey, omKeyInfo, unUsedParts);
   }
 
   private String getMultipartKey(long parentID, String keyName,
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponseV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponseWithFSO.java
similarity index 88%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponseV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponseWithFSO.java
index 115b277..8ce9170 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponseWithFSO.java
@@ -31,7 +31,7 @@ import java.util.UUID;
 /**
  * Test multipart upload abort response.
  */
-public class TestS3MultipartUploadAbortResponseV1
+public class TestS3MultipartUploadAbortResponseWithFSO
     extends TestS3MultipartUploadAbortResponse {
 
   private String dirName = "abort/b/c/";
@@ -52,15 +52,15 @@ public class TestS3MultipartUploadAbortResponseV1
   protected S3InitiateMultipartUploadResponse getS3InitiateMultipartUploadResp(
       OmMultipartKeyInfo multipartKeyInfo, OmKeyInfo omKeyInfo,
       OzoneManagerProtocolProtos.OMResponse omResponse) {
-    return new S3InitiateMultipartUploadResponseV1(omResponse, multipartKeyInfo,
-        omKeyInfo, new ArrayList<>());
+    return new S3InitiateMultipartUploadResponseWithFSO(omResponse,
+        multipartKeyInfo, omKeyInfo, new ArrayList<>());
   }
 
   protected S3MultipartUploadAbortResponse getS3MultipartUploadAbortResp(
       String multipartKey, OmMultipartKeyInfo omMultipartKeyInfo,
       OmBucketInfo omBucketInfo,
       OzoneManagerProtocolProtos.OMResponse omResponse) {
-    return new S3MultipartUploadAbortResponseV1(omResponse, multipartKey,
+    return new S3MultipartUploadAbortResponseWithFSO(omResponse, multipartKey,
         omMultipartKeyInfo, true, omBucketInfo);
   }
 
@@ -69,7 +69,7 @@ public class TestS3MultipartUploadAbortResponseV1
       String volumeName, String bucketName, String keyName, int partNumber) {
 
     String fileName = OzoneFSUtils.getFileName(keyName);
-    return createPartKeyInfoV1(volumeName, bucketName, parentID, fileName,
+    return createPartKeyInfoFSO(volumeName, bucketName, parentID, fileName,
         partNumber);
   }
 }
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponseV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponseWithFSO.java
similarity index 89%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponseV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponseWithFSO.java
index 511ffef..0ac6584 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponseWithFSO.java
@@ -35,7 +35,7 @@ import java.util.UUID;
 /**
  * Test multipart upload commit part response.
  */
-public class TestS3MultipartUploadCommitPartResponseV1
+public class TestS3MultipartUploadCommitPartResponseWithFSO
     extends TestS3MultipartResponse {
 
   private String dirName = "a/b/c/";
@@ -61,7 +61,7 @@ public class TestS3MultipartUploadCommitPartResponseV1
             clientId);
 
     S3MultipartUploadCommitPartResponse s3MultipartUploadCommitPartResponse =
-        createS3CommitMPUResponseV1(volumeName, bucketName, parentID, keyName,
+        createS3CommitMPUResponseFSO(volumeName, bucketName, parentID, keyName,
             multipartUploadID, null, null,
                 OzoneManagerProtocolProtos.Status.OK, openKey);
 
@@ -96,20 +96,20 @@ public class TestS3MultipartUploadCommitPartResponseV1
     String multipartKey = omMetadataManager.getMultipartKey(parentID, fileName,
             multipartUploadID);
 
-    S3InitiateMultipartUploadResponse s3InitiateMultipartUploadResponseV1 =
-            createS3InitiateMPUResponseV1(volumeName, bucketName, parentID,
+    S3InitiateMultipartUploadResponse s3InitiateMultipartUploadResponseFSO =
+            createS3InitiateMPUResponseFSO(volumeName, bucketName, parentID,
                     keyName, multipartUploadID, new ArrayList<>());
 
-    s3InitiateMultipartUploadResponseV1.addToDBBatch(omMetadataManager,
+    s3InitiateMultipartUploadResponseFSO.addToDBBatch(omMetadataManager,
             batchOperation);
 
     // Add some dummy parts for testing.
     // Not added any key locations, as this just test is to see entries are
     // adding to delete table or not.
     OmMultipartKeyInfo omMultipartKeyInfo =
-            s3InitiateMultipartUploadResponseV1.getOmMultipartKeyInfo();
+            s3InitiateMultipartUploadResponseFSO.getOmMultipartKeyInfo();
 
-    PartKeyInfo part1 = createPartKeyInfoV1(volumeName, bucketName, parentID,
+    PartKeyInfo part1 = createPartKeyInfoFSO(volumeName, bucketName, parentID,
         fileName, 1);
 
     addPart(1, part1, omMultipartKeyInfo);
@@ -119,7 +119,7 @@ public class TestS3MultipartUploadCommitPartResponseV1
             clientId);
 
     S3MultipartUploadCommitPartResponse s3MultipartUploadCommitPartResponse =
-            createS3CommitMPUResponseV1(volumeName, bucketName, parentID,
+            createS3CommitMPUResponseFSO(volumeName, bucketName, parentID,
                     keyName, multipartUploadID,
                     omMultipartKeyInfo.getPartKeyInfo(1),
                     omMultipartKeyInfo,
@@ -167,20 +167,20 @@ public class TestS3MultipartUploadCommitPartResponseV1
     String multipartKey = omMetadataManager.getMultipartKey(parentID, fileName,
             multipartUploadID);
 
-    S3InitiateMultipartUploadResponse s3InitiateMultipartUploadResponseV1 =
-            createS3InitiateMPUResponseV1(volumeName, bucketName, parentID,
+    S3InitiateMultipartUploadResponse s3InitiateMultipartUploadResponseFSO =
+            createS3InitiateMPUResponseFSO(volumeName, bucketName, parentID,
                     keyName, multipartUploadID, new ArrayList<>());
 
-    s3InitiateMultipartUploadResponseV1.addToDBBatch(omMetadataManager,
+    s3InitiateMultipartUploadResponseFSO.addToDBBatch(omMetadataManager,
             batchOperation);
 
     // Add some dummy parts for testing.
     // Not added any key locations, as this just test is to see entries are
     // adding to delete table or not.
     OmMultipartKeyInfo omMultipartKeyInfo =
-            s3InitiateMultipartUploadResponseV1.getOmMultipartKeyInfo();
+            s3InitiateMultipartUploadResponseFSO.getOmMultipartKeyInfo();
 
-    PartKeyInfo part1 = createPartKeyInfoV1(volumeName, bucketName, parentID,
+    PartKeyInfo part1 = createPartKeyInfoFSO(volumeName, bucketName, parentID,
             fileName, 1);
 
     addPart(1, part1, omMultipartKeyInfo);
@@ -190,7 +190,7 @@ public class TestS3MultipartUploadCommitPartResponseV1
             clientId);
 
     S3MultipartUploadCommitPartResponse s3MultipartUploadCommitPartResponse =
-            createS3CommitMPUResponseV1(volumeName, bucketName, parentID,
+            createS3CommitMPUResponseFSO(volumeName, bucketName, parentID,
                     keyName + "invalid", multipartUploadID,
                     omMultipartKeyInfo.getPartKeyInfo(1),
                     omMultipartKeyInfo, OzoneManagerProtocolProtos.Status
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCompleteResponseV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCompleteResponseWithFSO.java
similarity index 87%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCompleteResponseV1.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCompleteResponseWithFSO.java
index 2683273..ed66ba6 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCompleteResponseV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCompleteResponseWithFSO.java
@@ -38,7 +38,7 @@ import java.util.UUID;
 /**
  * Test multipart upload complete response.
  */
-public class TestS3MultipartUploadCompleteResponseV1
+public class TestS3MultipartUploadCompleteResponseWithFSO
     extends TestS3MultipartResponse {
 
   private String dirName = "a/b/c/";
@@ -64,25 +64,25 @@ public class TestS3MultipartUploadCompleteResponseV1
     String dbOpenKey = omMetadataManager.getOpenFileName(parentID, fileName,
             clientId);
     String dbKey = omMetadataManager.getOzonePathKey(parentID, fileName);
-    OmKeyInfo omKeyInfoV1 =
+    OmKeyInfo omKeyInfoFSO =
             TestOMRequestUtils.createOmKeyInfo(volumeName, bucketName, keyName,
                     HddsProtos.ReplicationType.RATIS,
                     HddsProtos.ReplicationFactor.ONE, objectId, parentID, txnId,
                     Time.now());
 
     // add key to openFileTable
-    omKeyInfoV1.setKeyName(fileName);
+    omKeyInfoFSO.setKeyName(fileName);
     TestOMRequestUtils.addFileToKeyTable(true, false,
-            fileName, omKeyInfoV1, clientId, omKeyInfoV1.getObjectID(),
+            fileName, omKeyInfoFSO, clientId, omKeyInfoFSO.getObjectID(),
             omMetadataManager);
 
-    addS3MultipartUploadCommitPartResponseV1(volumeName, bucketName, keyName,
+    addS3MultipartUploadCommitPartResponseFSO(volumeName, bucketName, keyName,
             multipartUploadID, dbOpenKey);
 
     List<OmKeyInfo> unUsedParts = new ArrayList<>();
     S3MultipartUploadCompleteResponse s3MultipartUploadCompleteResponse =
-            createS3CompleteMPUResponseV1(volumeName, bucketName, parentID,
-                    keyName, multipartUploadID, omKeyInfoV1,
+            createS3CompleteMPUResponseFSO(volumeName, bucketName, parentID,
+                    keyName, multipartUploadID, omKeyInfoFSO,
                 OzoneManagerProtocolProtos.Status.OK, unUsedParts);
 
     s3MultipartUploadCompleteResponse.addToDBBatch(omMetadataManager,
@@ -120,7 +120,7 @@ public class TestS3MultipartUploadCompleteResponseV1
     String dbMultipartKey = omMetadataManager.getMultipartKey(parentID,
             fileName, multipartUploadID);
 
-    S3InitiateMultipartUploadResponse s3InitiateMultipartUploadResponseV1 =
+    S3InitiateMultipartUploadResponse s3InitiateMultipartUploadResponseFSO =
             addS3InitiateMultipartUpload(volumeName, bucketName, keyName,
                     multipartUploadID);
 
@@ -128,9 +128,9 @@ public class TestS3MultipartUploadCompleteResponseV1
     // Not added any key locations, as this just test is to see entries are
     // adding to delete table or not.
     OmMultipartKeyInfo omMultipartKeyInfo =
-            s3InitiateMultipartUploadResponseV1.getOmMultipartKeyInfo();
+            s3InitiateMultipartUploadResponseFSO.getOmMultipartKeyInfo();
 
-    OmKeyInfo omKeyInfoV1 = commitS3MultipartUpload(volumeName, bucketName,
+    OmKeyInfo omKeyInfoFSO = commitS3MultipartUpload(volumeName, bucketName,
             keyName, multipartUploadID, fileName, dbMultipartKey,
             omMultipartKeyInfo);
     // After commits, it adds an entry to the deleted table.
@@ -145,8 +145,8 @@ public class TestS3MultipartUploadCompleteResponseV1
     List<OmKeyInfo> unUsedParts = new ArrayList<>();
     unUsedParts.add(omKeyInfo);
     S3MultipartUploadCompleteResponse s3MultipartUploadCompleteResponse =
-            createS3CompleteMPUResponseV1(volumeName, bucketName, parentID,
-                    keyName, multipartUploadID, omKeyInfoV1,
+            createS3CompleteMPUResponseFSO(volumeName, bucketName, parentID,
+                    keyName, multipartUploadID, omKeyInfoFSO,
                     OzoneManagerProtocolProtos.Status.OK, unUsedParts);
 
     s3MultipartUploadCompleteResponse.addToDBBatch(omMetadataManager,
@@ -154,7 +154,7 @@ public class TestS3MultipartUploadCompleteResponseV1
 
     omMetadataManager.getStore().commitBatchOperation(batchOperation);
     String dbKey = omMetadataManager.getOzonePathKey(parentID,
-          omKeyInfoV1.getFileName());
+          omKeyInfoFSO.getFileName());
     Assert.assertNotNull(omMetadataManager.getKeyTable().get(dbKey));
     Assert.assertNull(
             omMetadataManager.getMultipartInfoTable().get(dbMultipartKey));
@@ -173,7 +173,7 @@ public class TestS3MultipartUploadCompleteResponseV1
       String fileName, String multipartKey,
       OmMultipartKeyInfo omMultipartKeyInfo) throws IOException {
 
-    PartKeyInfo part1 = createPartKeyInfoV1(volumeName, bucketName, parentID,
+    PartKeyInfo part1 = createPartKeyInfoFSO(volumeName, bucketName, parentID,
         fileName, 1);
 
     addPart(1, part1, omMultipartKeyInfo);
@@ -183,7 +183,7 @@ public class TestS3MultipartUploadCompleteResponseV1
             clientId);
 
     S3MultipartUploadCommitPartResponse s3MultipartUploadCommitPartResponse =
-            createS3CommitMPUResponseV1(volumeName, bucketName, parentID,
+            createS3CommitMPUResponseFSO(volumeName, bucketName, parentID,
                     keyName, multipartUploadID,
                     omMultipartKeyInfo.getPartKeyInfo(1),
                     omMultipartKeyInfo,
@@ -220,14 +220,14 @@ public class TestS3MultipartUploadCompleteResponseV1
           String volumeName, String bucketName, String keyName,
           String multipartUploadID) throws IOException {
 
-    S3InitiateMultipartUploadResponse s3InitiateMultipartUploadResponseV1 =
-            createS3InitiateMPUResponseV1(volumeName, bucketName, parentID,
+    S3InitiateMultipartUploadResponse s3InitiateMultipartUploadResponseFSO =
+            createS3InitiateMPUResponseFSO(volumeName, bucketName, parentID,
                     keyName, multipartUploadID, new ArrayList<>());
 
-    s3InitiateMultipartUploadResponseV1.addToDBBatch(omMetadataManager,
+    s3InitiateMultipartUploadResponseFSO.addToDBBatch(omMetadataManager,
             batchOperation);
 
-    return s3InitiateMultipartUploadResponseV1;
+    return s3InitiateMultipartUploadResponseFSO;
   }
 
   private String getKeyName() {
@@ -241,11 +241,11 @@ public class TestS3MultipartUploadCompleteResponseV1
             dirName, omMetadataManager);
   }
 
-  private void addS3MultipartUploadCommitPartResponseV1(String volumeName,
+  private void addS3MultipartUploadCommitPartResponseFSO(String volumeName,
       String bucketName, String keyName, String multipartUploadID,
       String openKey) throws IOException {
     S3MultipartUploadCommitPartResponse s3MultipartUploadCommitPartResponse =
-            createS3CommitMPUResponseV1(volumeName, bucketName, parentID,
+            createS3CommitMPUResponseFSO(volumeName, bucketName, parentID,
                     keyName, multipartUploadID, null, null,
                     OzoneManagerProtocolProtos.Status.OK, openKey);
 
diff --git a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java
index a1eca1e..9a9fb51 100644
--- a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java
+++ b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java
@@ -327,7 +327,7 @@ public class BasicOzoneFileSystem extends FileSystem {
     }
 
     if (adapter.isFSOptimizedBucket()) {
-      return renameV1(srcPath, dstPath);
+      return renameFSO(srcPath, dstPath);
     }
 
     // Check if the source exists
@@ -410,7 +410,8 @@ public class BasicOzoneFileSystem extends FileSystem {
     return result;
   }
 
-  private boolean renameV1(String srcPath, String dstPath) throws IOException {
+  private boolean renameFSO(String srcPath, String dstPath)
+      throws IOException {
     try {
       adapter.renameKey(srcPath, dstPath);
     } catch (OMException ome) {
diff --git a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneFileSystem.java b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneFileSystem.java
index 08d2008..c6c6acd 100644
--- a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneFileSystem.java
+++ b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneFileSystem.java
@@ -310,7 +310,7 @@ public class BasicRootedOzoneFileSystem extends FileSystem {
     }
     OzoneBucket bucket = adapterImpl.getBucket(ofsSrc, false);
     if (OzoneFSUtils.isFSOptimizedBucket(bucket.getMetadata())) {
-      return renameV1(bucket, ofsSrc, ofsDst);
+      return renameFSO(bucket, ofsSrc, ofsDst);
     }
 
     // Cannot rename a directory to its own subdirectory
@@ -389,7 +389,7 @@ public class BasicRootedOzoneFileSystem extends FileSystem {
     return result;
   }
 
-  private boolean renameV1(OzoneBucket bucket,
+  private boolean renameFSO(OzoneBucket bucket,
       OFSPath srcPath, OFSPath dstPath) throws IOException {
     // construct src and dst key paths
     String srcKeyPath = srcPath.getNonKeyPathNoPrefixDelim() +

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org