diff --git a/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hdfs-site.xml b/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hdfs-site.xml
index 64e06a5414..ee91f9e73f 100644
--- a/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hdfs-site.xml
+++ b/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hdfs-site.xml
@@ -27,7 +27,7 @@
 <!-- file system properties -->
 
   <property>
-    <name>dfs.name.dir</name>
+    <name>dfs.namenode.name.dir</name>
     <value>${HADOOP_NN_DIR}</value>
     <description>Determines where on the local filesystem the DFS name node
       should store the name table.  If this is a comma-delimited list
@@ -37,7 +37,7 @@
   </property>
 
   <property>
-    <name>dfs.data.dir</name>
+    <name>dfs.datanode.data.dir</name>
     <value>${HADOOP_DN_DIR}</value>
     <description>Determines where on the local filesystem an DFS data node
        should store its blocks.  If this is a comma-delimited
@@ -49,11 +49,11 @@
   </property>
 
   <property>
-    <name>dfs.safemode.threshold.pct</name>
+    <name>dfs.namenode.safemode.threshold-pct</name>
     <value>1.0f</value>
     <description>
-        Specifies the percentage of blocks that should satisfy 
-        the minimal replication requirement defined by dfs.replication.min.
+        Specifies the percentage of blocks that should satisfy the minimal 
+        replication requirement defined by dfs.namenode.replication.min. 
         Values less than or equal to 0 mean not to start in safe mode.
         Values greater than 1 will make safe mode permanent.
         </description>
@@ -70,7 +70,7 @@
   </property>
 
   <property>
-    <name>dfs.http.address</name>
+    <name>dfs.namenode.http-address</name>
     <value>${HADOOP_NN_HOST}:50070</value>
     <description>The name of the default file system.  Either the
        literal string "local" or a host:port for NDFS.
@@ -195,7 +195,7 @@
   </property>
 
   <property>
-    <name>dfs.https.address</name>
+    <name>dfs.namenode.https-address</name>
     <value>${HADOOP_NN_HOST}:50470</value>
     <description>The https address where namenode binds</description>
   </property>
@@ -203,9 +203,9 @@
   <property>
     <name>dfs.datanode.data.dir.perm</name>
     <value>${DFS_DATANODE_DIR_PERM}</value>
-    <description>The permissions that should be there on dfs.data.dir
+    <description>The permissions that should be there on dfs.datanode.data.dir
       directories. The datanode will not come up if the permissions are
-      different on existing dfs.data.dir directories. If the directories
+      different on existing dfs.datanode.data.dir directories. If the directories
       don't exist, they will be created with this permission.
     </description>
   </property>
@@ -237,7 +237,7 @@
   </property>
 
   <property>
-    <name>dfs.secondary.http.address</name>
+    <name>dfs.namenode.secondary.http-address</name>
     <value>${HADOOP_SNN_HOST}:50090</value>
     <description>
       The secondary namenode http server address and port.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 59f0fde54a..f216d0515e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -254,6 +254,8 @@ Release 0.23.1 - UNRELEASED
     HDFS-2335. DataNodeCluster and NNStorage always pull fresh entropy.
     (Uma Maheswara Rao G via eli)
 
+    HDFS-2574. Remove references to some deprecated properties in conf templates and defaults files. (Joe Crobak via harsh)
+
   OPTIMIZATIONS
 
     HDFS-2130. Switch default checksum to CRC32C. (todd)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/packages/templates/conf/hdfs-site.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/packages/templates/conf/hdfs-site.xml
index 178159e0ca..6fe4457c8e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/packages/templates/conf/hdfs-site.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/packages/templates/conf/hdfs-site.xml
@@ -22,11 +22,11 @@
     <value>${HADOOP_REPLICATION}</value>
   </property>
   <property>
-    <name>dfs.name.dir</name>
+    <name>dfs.namenode.name.dir</name>
     <value>${HADOOP_NN_DIR}</value>
   </property>
   <property>
-    <name>dfs.data.dir</name>
+    <name>dfs.datanode.data.dir</name>
     <value>${HADOOP_DN_DIR}</value>
   </property>
   <property>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
index 11ca83a1fe..394a2319c1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
@@ -199,8 +199,8 @@ creations/deletions), or "all".</description>
   <name>dfs.namenode.name.dir.restore</name>
   <value>false</value>
   <description>Set to true to enable NameNode to attempt recovering a
-      previously failed dfs.name.dir. When enabled, a recovery of any failed
-      directory is attempted during checkpoint.</description>
+      previously failed dfs.namenode.name.dir. When enabled, a recovery of any
+      failed directory is attempted during checkpoint.</description>
 </property>
 
 <property>
@@ -223,7 +223,7 @@ creations/deletions), or "all".</description>
   <description>Determines where on the local filesystem the DFS name node
       should store the transaction (edits) file. If this is a comma-delimited list
       of directories then the transaction file is replicated in all of the 
-      directories, for redundancy. Default value is same as dfs.name.dir
+      directories, for redundancy. Default value is same as dfs.namenode.name.dir
   </description>
 </property>
 <property>