diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/PartitionedItemizedFileDocument.scala b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/PartitionedFileDocument.scala
similarity index 93%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/PartitionedItemizedFileDocument.scala
rename to core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/PartitionedFileDocument.scala
index ab0ac3dfcfd..fbb67703f02 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/PartitionedItemizedFileDocument.scala
+++ b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/PartitionedFileDocument.scala
@@ -1,14 +1,14 @@
 package edu.uci.ics.amber.core.storage.result
 
 import edu.uci.ics.amber.core.storage.model.VirtualDocument
-import edu.uci.ics.amber.core.storage.result.PartitionedItemizedFileDocument.getPartitionURI
+import edu.uci.ics.amber.core.storage.result.PartitionedFileDocument.getPartitionURI
 import edu.uci.ics.amber.util.PathUtils.workflowResultsRootPath
 import org.apache.commons.vfs2.VFS
 
 import java.net.URI
 import java.util.concurrent.locks.ReentrantLock
 
-object PartitionedItemizedFileDocument {
+object PartitionedFileDocument {
 
   /**
     * Utility function to generate the partition URI by index.
@@ -18,7 +18,7 @@ object PartitionedItemizedFileDocument {
   }
 }
 
-class PartitionedItemizedFileDocument[R <: VirtualDocument[T], T >: Null <: AnyRef](
+class PartitionedFileDocument[R <: VirtualDocument[T], T >: Null <: AnyRef](
     val id: String,
     val numOfPartition: Int,
     createPartition: URI => R
diff --git a/core/workflow-core/src/test/scala/edu/uci/ics/amber/storage/result/PartitionedItemizedFileDocumentSpec.scala b/core/workflow-core/src/test/scala/edu/uci/ics/amber/storage/result/PartitionedFileDocumentSpec.scala
similarity index 88%
rename from core/workflow-core/src/test/scala/edu/uci/ics/amber/storage/result/PartitionedItemizedFileDocumentSpec.scala
rename to core/workflow-core/src/test/scala/edu/uci/ics/amber/storage/result/PartitionedFileDocumentSpec.scala
index 1c204341e73..4a3e6bee47e 100644
--- a/core/workflow-core/src/test/scala/edu/uci/ics/amber/storage/result/PartitionedItemizedFileDocumentSpec.scala
+++ b/core/workflow-core/src/test/scala/edu/uci/ics/amber/storage/result/PartitionedFileDocumentSpec.scala
@@ -1,21 +1,21 @@
 package edu.uci.ics.amber.core.storage.result
 
-import edu.uci.ics.amber.core.storage.result.PartitionedItemizedFileDocument.getPartitionURI
+import edu.uci.ics.amber.core.storage.result.PartitionedFileDocument.getPartitionURI
 import org.apache.commons.vfs2.{FileObject, VFS}
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.BeforeAndAfter
 import org.scalatest.concurrent.ScalaFutures.convertScalaFuture
 import org.scalatest.matchers.should.Matchers
 
-class PartitionedItemizedFileDocumentSpec extends AnyFlatSpec with Matchers with BeforeAndAfter {
+class PartitionedFileDocumentSpec extends AnyFlatSpec with Matchers with BeforeAndAfter {
 
-  var partitionDocument: PartitionedItemizedFileDocument[ItemizedFileDocument[String], String] = _
+  var partitionDocument: PartitionedFileDocument[ItemizedFileDocument[String], String] = _
   val numOfPartitions = 3
   val partitionId: String = "partition_doc_test"
 
   before {
     // Initialize the PartitionDocument with a base ID and number of partitions
-    partitionDocument = new PartitionedItemizedFileDocument[ItemizedFileDocument[String], String](
+    partitionDocument = new PartitionedFileDocument[ItemizedFileDocument[String], String](
       partitionId,
       numOfPartitions,
       uri => new ItemizedFileDocument[String](uri)