diff --git a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md
index 53e4fbdfea968..309da565ec4b5 100644
--- a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md
+++ b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md
@@ -1,11 +1,12 @@
 ## Release History
 
 ### 4.0.0-beta.4 (Unreleased)
+#### Configuration Renames
+* Renamed data source name `cosmos.changeFeed` to `cosmos.oltp.changeFeed`, See [PR](https://github.com/Azure/azure-sdk-for-java/pull/21184).
 
 ### 4.0.0-beta.3 (2021-05-05)
 * Cosmos DB Spark 3.1.1 Connector Preview `4.0.0-beta.3` Release.
 #### Configuration Renames
-* Renamed data source name `cosmos.items` to `cosmos.oltp`, See [PR](https://github.com/Azure/azure-sdk-for-java/pull/21121). 
 * Renamed data source name `cosmos.changeFeed` to `cosmos.oltp.changeFeed`, see [PR](https://github.com/Azure/azure-sdk-for-java/pull/21121).
 * Configuration renamed. See [PR](https://github.com/Azure/azure-sdk-for-java/pull/21004) for list of changes. See [Configuration-Reference](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/cosmos/azure-cosmos-spark_3-1_2-12/docs/configuration-reference.md) for more details.
 
diff --git a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/Samples/Python/NYC-Taxi-Data/01_Batch.ipynb b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/Samples/Python/NYC-Taxi-Data/01_Batch.ipynb
index d88fc4c3ab678..d253e77dbdf3e 100644
--- a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/Samples/Python/NYC-Taxi-Data/01_Batch.ipynb
+++ b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/Samples/Python/NYC-Taxi-Data/01_Batch.ipynb
@@ -370,7 +370,7 @@
     "  \"spark.cosmos.changeFeed.startFrom\" : \"Beginning\",\n",
     "  \"spark.cosmos.changeFeed.mode\" : \"Incremental\"\n",
     "}\n",
-    "changeFeed_df = spark.read.format(\"cosmos.changeFeed\").options(**changeFeedCfg).load()\n",
+    "changeFeed_df = spark.read.format(\"cosmos.oltp.changeFeed\").options(**changeFeedCfg).load()\n",
     "count_changeFeed = changeFeed_df.count()\n",
     "print(\"Number of records retrieved via change feed: \", count_changeFeed) \n",
     "print(\"Finished validation via change feed: \", datetime.datetime.utcnow().strftime(\"%Y-%m-%d %H:%M:%S.%f\"))\n",
diff --git a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/Samples/Python/NYC-Taxi-Data/02_StructuredStreaming.ipynb b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/Samples/Python/NYC-Taxi-Data/02_StructuredStreaming.ipynb
index f0b32e49428d1..a9ec2584bee6e 100644
--- a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/Samples/Python/NYC-Taxi-Data/02_StructuredStreaming.ipynb
+++ b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/Samples/Python/NYC-Taxi-Data/02_StructuredStreaming.ipynb
@@ -267,7 +267,7 @@
     "\n",
     "  changeFeedDF = spark \\\n",
     "    .readStream  \\\n",
-    "    .format(\"cosmos.changeFeed\") \\\n",
+    "    .format(\"cosmos.oltp.changeFeed\") \\\n",
     "    .options(**changeFeedCfg) \\\n",
     "    .load()\n",
     " \n",
diff --git a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/src/main/scala/com/azure/cosmos/spark/CosmosConstants.scala b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/src/main/scala/com/azure/cosmos/spark/CosmosConstants.scala
index eaa00bbd3d8a0..7eac1f0adeeee 100644
--- a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/src/main/scala/com/azure/cosmos/spark/CosmosConstants.scala
+++ b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/src/main/scala/com/azure/cosmos/spark/CosmosConstants.scala
@@ -14,7 +14,7 @@ private object CosmosConstants {
 
   object Names {
     val ItemsDataSourceShortName = "cosmos.oltp"
-    val ChangeFeedDataSourceShortName = "cosmos.changeFeed"
+    val ChangeFeedDataSourceShortName = "cosmos.oltp.changeFeed"
   }
 
   object Properties {
diff --git a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/src/test/scala/com/azure/cosmos/spark/SparkE2EChangeFeedITest.scala b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/src/test/scala/com/azure/cosmos/spark/SparkE2EChangeFeedITest.scala
index f8d746575205e..ce00b61024792 100644
--- a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/src/test/scala/com/azure/cosmos/spark/SparkE2EChangeFeedITest.scala
+++ b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/src/test/scala/com/azure/cosmos/spark/SparkE2EChangeFeedITest.scala
@@ -42,7 +42,7 @@ class SparkE2EChangeFeedITest
       "spark.cosmos.read.inferSchema.enabled" -> "false"
     )
 
-    val df = spark.read.format("cosmos.changeFeed").options(cfg).load()
+    val df = spark.read.format("cosmos.oltp.changeFeed").options(cfg).load()
     val rowsArray = df.collect()
     rowsArray should have size 2
     df.schema.equals(
@@ -57,7 +57,7 @@ class SparkE2EChangeFeedITest
       "spark.cosmos.changeFeed.mode" -> "Incremental"
     )
 
-    val dfExplicit = spark.read.format("cosmos.changeFeed").options(cfgExplicit).load()
+    val dfExplicit = spark.read.format("cosmos.oltp.changeFeed").options(cfgExplicit).load()
     val rowsArrayExplicit = dfExplicit.collect()
     rowsArrayExplicit should have size 2
     dfExplicit.schema.equals(
@@ -94,7 +94,7 @@ class SparkE2EChangeFeedITest
       StructField("isAlive", BooleanType)
     ))
 
-    val df = spark.read.schema(customSchema).format("cosmos.changeFeed").options(cfg).load()
+    val df = spark.read.schema(customSchema).format("cosmos.oltp.changeFeed").options(cfg).load()
     val rowsArray = df.collect()
     rowsArray should have size 2
     df.schema.equals(customSchema) shouldEqual true
@@ -124,7 +124,7 @@ class SparkE2EChangeFeedITest
       "spark.cosmos.changeFeed.startFrom" -> "NOW"
     )
 
-    val df = spark.read.format("cosmos.changeFeed").options(cfg).load()
+    val df = spark.read.format("cosmos.oltp.changeFeed").options(cfg).load()
     val rowsArray = df.collect()
     rowsArray should have size 0
     df.schema.equals(
@@ -177,7 +177,7 @@ class SparkE2EChangeFeedITest
 
       val changeFeedDF = spark
         .readStream
-        .format("cosmos.changeFeed")
+        .format("cosmos.oltp.changeFeed")
         .options(readCfg)
         .load()
       val microBatchQuery = changeFeedDF
diff --git a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/src/test/scala/com/azure/cosmos/spark/SparkE2EStructuredStreamingITest.scala b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/src/test/scala/com/azure/cosmos/spark/SparkE2EStructuredStreamingITest.scala
index 2475d26fa5724..5bde1720e9065 100644
--- a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/src/test/scala/com/azure/cosmos/spark/SparkE2EStructuredStreamingITest.scala
+++ b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/src/test/scala/com/azure/cosmos/spark/SparkE2EStructuredStreamingITest.scala
@@ -66,7 +66,7 @@ class SparkE2EStructuredStreamingITest
 
     val changeFeedDF = spark
       .readStream
-      .format("cosmos.changeFeed")
+      .format("cosmos.oltp.changeFeed")
       .options(changeFeedCfg)
       .load()
 
@@ -107,7 +107,7 @@ class SparkE2EStructuredStreamingITest
 
     val secondChangeFeedDF = spark
       .readStream
-      .format("cosmos.changeFeed")
+      .format("cosmos.oltp.changeFeed")
       .options(changeFeedCfg)
       .load()