diff --git a/CHANGES.txt b/CHANGES.txt
index 0eaff1ac1c0..19b47a76b16 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,9 @@ Hadoop Change Log
 Trunk (unreleased changes)
 
   IMPROVEMENTS
+    HADOOP-6633. normalize property names for JT/NN kerberos principal 
+    names in configuration (boryas)
+
     HADOOP-6627. "Bad Connection to FS" message in FSShell should print 
     message from the exception (boryas)
 
diff --git a/src/java/org/apache/hadoop/security/authorize/ProxyUsers.java b/src/java/org/apache/hadoop/security/authorize/ProxyUsers.java
index 0ae4c0532ed..9d1504a22a1 100644
--- a/src/java/org/apache/hadoop/security/authorize/ProxyUsers.java
+++ b/src/java/org/apache/hadoop/security/authorize/ProxyUsers.java
@@ -36,7 +36,7 @@ public class ProxyUsers {
    * @return configuration key for superuser groups
    */
   public static String getProxySuperuserGroupConfKey(String userName) {
-    return "hadoop.proxyuser."+userName+".users";
+    return "hadoop.proxyuser."+userName+".groups";
   }
   
   /*
@@ -46,7 +46,7 @@ public class ProxyUsers {
    * @return configuration key for superuser ip-addresses
    */
   public static String getProxySuperuserIpConfKey(String userName) {
-    return "hadoop.proxyuser."+userName+".ip-addresses";
+    return "hadoop.proxyuser."+userName+".hosts";
   }
   
   /*