diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java
index 9814ec9c98..aefa755201 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java
@@ -82,7 +82,7 @@
 import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
 import org.apache.hadoop.yarn.factories.RecordFactory;
 import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
-import org.apache.hadoop.yarn.security.client.RMTokenSelector;
+import org.apache.hadoop.yarn.security.client.RMDelegationTokenSelector;
 import org.apache.hadoop.yarn.util.ConverterUtils;
 import org.apache.hadoop.yarn.util.ProtoUtils;
 
@@ -187,7 +187,7 @@ void addHistoryToken(Credentials ts) throws IOException, InterruptedException {
        * note that get delegation token was called. Again this is hack for oozie
        * to make sure we add history server delegation tokens to the credentials
        */
-      RMTokenSelector tokenSelector = new RMTokenSelector();
+      RMDelegationTokenSelector tokenSelector = new RMDelegationTokenSelector();
       Text service = SecurityUtil.buildTokenService(resMgrDelegate
           .getConnectAddress());
       if (tokenSelector.selectToken(service, ts.getAllTokens()) != null) {
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index a52ec9c4eb..3b10f1ae80 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -147,11 +147,14 @@ Release 2.1.0-beta - UNRELEASED
     He via vinodkv)
 
     YARN-821. Renamed setFinishApplicationStatus to setFinalApplicationStatus in
-    FinishApplicationMasterRequest for consistency. (Jian He via vinodk)
+    FinishApplicationMasterRequest for consistency. (Jian He via vinodkv)
 
     YARN-787. Removed minimum resource from RegisterApplicationMasterResponse.
     (tucu via acmurthy)
 
+    YARN-829. Renamed RMTokenSelector to be RMDelegationTokenSelector. (Zhijie
+    Shen via vinodkv)
+
   NEW FEATURES
 
     YARN-482. FS: Extend SchedulingMode to intermediate queues. 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientRMSecurityInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientRMSecurityInfo.java
index 0e1e6781a5..2dcefd9c00 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientRMSecurityInfo.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientRMSecurityInfo.java
@@ -72,7 +72,7 @@ public Class<? extends Annotation> annotationType() {
       @Override
       public Class<? extends TokenSelector<? extends TokenIdentifier>>
           value() {
-        return RMTokenSelector.class;
+        return RMDelegationTokenSelector.class;
       }
     };
   }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMTokenSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenSelector.java
similarity index 95%
rename from hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMTokenSelector.java
rename to hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenSelector.java
index 2b59337984..5cb54dc52e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMTokenSelector.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenSelector.java
@@ -27,11 +27,11 @@
 import org.apache.hadoop.security.token.TokenIdentifier;
 import org.apache.hadoop.security.token.TokenSelector;
 
-public class RMTokenSelector implements
+public class RMDelegationTokenSelector implements
     TokenSelector<RMDelegationTokenIdentifier> {
 
   private static final Log LOG = LogFactory
-      .getLog(RMTokenSelector.class);
+      .getLog(RMDelegationTokenSelector.class);
 
   @SuppressWarnings("unchecked")
   public Token<RMDelegationTokenIdentifier> selectToken(Text service,