diff --git a/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/HoodieCopyOnWriteTableInputFormat.java b/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/HoodieCopyOnWriteTableInputFormat.java
index 2636159fb7dc..8283d3d75577 100644
--- a/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/HoodieCopyOnWriteTableInputFormat.java
+++ b/hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/HoodieCopyOnWriteTableInputFormat.java
@@ -270,7 +270,7 @@ private List<FileStatus> listStatusForSnapshotMode(JobConf job,
                 .collect(Collectors.toList())
         );
       } else {
-        // If hoodie.metadata.enabled is set to false and the table doesn't have the metadata,
+        // If hoodie.metadata.enable is set to false and the table doesn't have the metadata,
         // read the table using fs view cache instead of file index.
         // This is because there's no file index in non-metadata table.
         String basePath = tableMetaClient.getBasePath().toString();
diff --git a/hudi-platform-service/hudi-metaserver/README.md b/hudi-platform-service/hudi-metaserver/README.md
index a1d59597491c..50de6b0614a7 100644
--- a/hudi-platform-service/hudi-metaserver/README.md
+++ b/hudi-platform-service/hudi-metaserver/README.md
@@ -78,7 +78,7 @@ hoodie.database.name=default
 hoodie.table.name=test
 hoodie.base.path=${path}
 hoodie.metaserver.enabled=true
-hoodie.metadata.enabled=false
+hoodie.metadata.enable=false
 hoodie.metaserver.uris=thrift://${serverIP}:9090
 ```
 
diff --git a/packaging/bundle-validation/service/read.scala b/packaging/bundle-validation/service/read.scala
index 275d26349e28..b9780ffa5766 100644
--- a/packaging/bundle-validation/service/read.scala
+++ b/packaging/bundle-validation/service/read.scala
@@ -21,7 +21,7 @@ val basePath = "file:///tmp/hudi-bundles/tests/" + tableName
 spark.read.format("hudi").
   option("hoodie.table.name", tableName).
   option("hoodie.database.name", "default").
-  option("hoodie.metadata.enabled", "false").
+  option("hoodie.metadata.enable", "false").
   option("hoodie.metaserver.enabled", "true").
   option("hoodie.metaserver.uris", "thrift://localhost:9090").
   load(basePath).coalesce(1).write.csv("/tmp/metaserver-bundle/sparkdatasource/trips/results")
diff --git a/packaging/bundle-validation/service/write.scala b/packaging/bundle-validation/service/write.scala
index cf2781a1830b..86fd759d9236 100644
--- a/packaging/bundle-validation/service/write.scala
+++ b/packaging/bundle-validation/service/write.scala
@@ -40,7 +40,7 @@ df.write.format("hudi").
   option("hoodie.database.name", database).
   option("hoodie.datasource.meta.sync.enable", "false").
   option("hoodie.datasource.hive_sync.enable", "false").
-  option("hoodie.metadata.enabled", "false").
+  option("hoodie.metadata.enable", "false").
   option("hoodie.metaserver.enabled", "true").
   option("hoodie.metaserver.uris", "thrift://localhost:9090").
   mode(Overwrite).