diff --git a/core/src/main/scala/org/apache/spark/internal/config/Worker.scala b/core/src/main/scala/org/apache/spark/internal/config/Worker.scala
index fda3a57546b67..ab0005a3e44aa 100644
--- a/core/src/main/scala/org/apache/spark/internal/config/Worker.scala
+++ b/core/src/main/scala/org/apache/spark/internal/config/Worker.scala
@@ -84,7 +84,7 @@ private[spark] object Worker {
       .createWithDefault(100)
 
   val WORKER_DECOMMISSION_SIGNAL =
-    ConfigBuilder("spark.worker.decommission.signal")
+    ConfigBuilder("spark.decommission.worker.signal")
       .doc("The signal that used to trigger the worker to start decommission.")
       .version("3.2.0")
       .stringConf
diff --git a/core/src/main/scala/org/apache/spark/internal/config/package.scala b/core/src/main/scala/org/apache/spark/internal/config/package.scala
index 84c66470288ff..057bf9f8fdf40 100644
--- a/core/src/main/scala/org/apache/spark/internal/config/package.scala
+++ b/core/src/main/scala/org/apache/spark/internal/config/package.scala
@@ -421,14 +421,14 @@ package object config {
       .createWithDefault(1)
 
   private[spark] val STORAGE_DECOMMISSION_ENABLED =
-    ConfigBuilder("spark.storage.decommission.enabled")
+    ConfigBuilder("spark.decommission.storage.enabled")
       .doc("Whether to decommission the block manager when decommissioning executor")
       .version("3.1.0")
       .booleanConf
       .createWithDefault(false)
 
   private[spark] val STORAGE_DECOMMISSION_SHUFFLE_BLOCKS_ENABLED =
-    ConfigBuilder("spark.storage.decommission.shuffleBlocks.enabled")
+    ConfigBuilder("spark.decommission.storage.shuffleBlocks.enabled")
       .doc("Whether to transfer shuffle blocks during block manager decommissioning. Requires " +
         "a migratable shuffle resolver (like sort based shuffle)")
       .version("3.1.0")
@@ -436,7 +436,7 @@ package object config {
       .createWithDefault(false)
 
   private[spark] val STORAGE_DECOMMISSION_SHUFFLE_MAX_THREADS =
-    ConfigBuilder("spark.storage.decommission.shuffleBlocks.maxThreads")
+    ConfigBuilder("spark.decommission.storage.shuffleBlocks.maxThreads")
       .doc("Maximum number of threads to use in migrating shuffle files.")
       .version("3.1.0")
       .intConf
@@ -444,14 +444,14 @@ package object config {
       .createWithDefault(8)
 
   private[spark] val STORAGE_DECOMMISSION_RDD_BLOCKS_ENABLED =
-    ConfigBuilder("spark.storage.decommission.rddBlocks.enabled")
+    ConfigBuilder("spark.decommission.storage.rddBlocks.enabled")
       .doc("Whether to transfer RDD blocks during block manager decommissioning.")
       .version("3.1.0")
       .booleanConf
       .createWithDefault(false)
 
   private[spark] val STORAGE_DECOMMISSION_MAX_REPLICATION_FAILURE_PER_BLOCK =
-    ConfigBuilder("spark.storage.decommission.maxReplicationFailuresPerBlock")
+    ConfigBuilder("spark.decommission.storage.maxReplicationFailuresPerBlock")
       .internal()
       .doc("Maximum number of failures which can be handled for the replication of " +
         "one RDD block when block manager is decommissioning and trying to move its " +
@@ -461,7 +461,7 @@ package object config {
       .createWithDefault(3)
 
   private[spark] val STORAGE_DECOMMISSION_REPLICATION_REATTEMPT_INTERVAL =
-    ConfigBuilder("spark.storage.decommission.replicationReattemptInterval")
+    ConfigBuilder("spark.decommission.storage.replicationReattemptInterval")
       .internal()
       .doc("The interval of time between consecutive cache block replication reattempts " +
         "happening on each decommissioning executor (due to storage decommissioning).")
@@ -472,7 +472,7 @@ package object config {
       .createWithDefaultString("30s")
 
   private[spark] val STORAGE_DECOMMISSION_FALLBACK_STORAGE_PATH =
-    ConfigBuilder("spark.storage.decommission.fallbackStorage.path")
+    ConfigBuilder("spark.decommission.storage.fallbackStoragePath")
       .doc("The location for fallback storage during block manager decommissioning. " +
         "For example, `s3a://spark-storage/`. In case of empty, fallback storage is disabled. " +
         "The storage should be managed by TTL because Spark will not clean it up.")
@@ -1917,7 +1917,7 @@ package object config {
       .createWithDefault(false)
 
   private[spark] val EXECUTOR_DECOMMISSION_KILL_INTERVAL =
-    ConfigBuilder("spark.executor.decommission.killInterval")
+    ConfigBuilder("spark.decommission.executor.killInterval")
       .doc("Duration after which a decommissioned executor will be killed forcefully." +
         "This config is useful for cloud environments where we know in advance when " +
         "an executor is going to go down after decommissioning signal i.e. around 2 mins " +
@@ -1928,7 +1928,7 @@ package object config {
       .createOptional
 
   private[spark] val EXECUTOR_DECOMMISSION_SIGNAL =
-    ConfigBuilder("spark.executor.decommission.signal")
+    ConfigBuilder("spark.decommission.executor.signal")
       .doc("The signal that used to trigger the executor to start decommission.")
       .version("3.2.0")
       .stringConf