diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index f41e5d6713..6ecaff32aa 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -488,6 +488,9 @@ Release 2.7.0 - UNRELEASED
     YARN-3101. In Fair Scheduler, fix canceling of reservations for exceeding
     max share (Anubhav Dhoot via Sandy Ryza)
 
+    YARN-3149. Fix typo in message for invalid application id.
+    (Bibin A Chundatt via xgong)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ConverterUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ConverterUtils.java
index 73ec90607e..0aa68a2268 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ConverterUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ConverterUtils.java
@@ -204,7 +204,7 @@ public static ApplicationId toApplicationId(
     try {
       return toApplicationId(it);
     } catch (NumberFormatException n) {
-      throw new IllegalArgumentException("Invalid AppAttemptId: "
+      throw new IllegalArgumentException("Invalid ApplicationId: "
           + appIdStr, n);
     }
   }