diff --git a/main/src/main/scala/sbt/internal/Act.scala b/main/src/main/scala/sbt/internal/Act.scala
index a5fb38c91..3b8acdbd1 100644
--- a/main/src/main/scala/sbt/internal/Act.scala
+++ b/main/src/main/scala/sbt/internal/Act.scala
@@ -158,7 +158,7 @@ object Act {
       val taskSeq = tasks.toSeq
       def taskKeys(f: AttributeKey[_] => String): Seq[(String, AttributeKey[_])] = taskSeq.map(key => (f(key), key))
       val normKeys = taskKeys(_.label)
-      val valid = allKnown ++ normKeys ++ taskKeys(_.rawLabel)
+      val valid = allKnown ++ normKeys
       val suggested = normKeys.map(_._1).toSet
       val keyP = filterStrings(examples(ID, suggested, "key"), valid.keySet, "key") map valid
       (token(value(keyP) | GlobalString ^^^ ParsedGlobal) <~ token("::".id)) ?? Omitted
diff --git a/main/src/main/scala/sbt/internal/EvaluateConfigurations.scala b/main/src/main/scala/sbt/internal/EvaluateConfigurations.scala
index 4f2c9b327..248d77480 100644
--- a/main/src/main/scala/sbt/internal/EvaluateConfigurations.scala
+++ b/main/src/main/scala/sbt/internal/EvaluateConfigurations.scala
@@ -289,7 +289,7 @@ object Index {
   def attributeKeys(settings: Settings[Scope]): Set[AttributeKey[_]] =
     settings.data.values.flatMap(_.keys).toSet[AttributeKey[_]]
   def stringToKeyMap(settings: Set[AttributeKey[_]]): Map[String, AttributeKey[_]] =
-    stringToKeyMap0(settings)(_.rawLabel) ++ stringToKeyMap0(settings)(_.label)
+    stringToKeyMap0(settings)(_.label)
 
   private[this] def stringToKeyMap0(settings: Set[AttributeKey[_]])(label: AttributeKey[_] => String): Map[String, AttributeKey[_]] =
     {
diff --git a/main/src/main/scala/sbt/internal/KeyIndex.scala b/main/src/main/scala/sbt/internal/KeyIndex.scala
index a293d6929..3a24ae49d 100644
--- a/main/src/main/scala/sbt/internal/KeyIndex.scala
+++ b/main/src/main/scala/sbt/internal/KeyIndex.scala
@@ -70,7 +70,7 @@ trait ExtendableKeyIndex extends KeyIndex {
 }
 // task axis <-> key
 private[sbt] final class AKeyIndex(val data: Relation[Option[AttributeKey[_]], String]) {
-  def add(task: Option[AttributeKey[_]], key: AttributeKey[_]): AKeyIndex = new AKeyIndex(data + (task, key.rawLabel) + (task, key.label))
+  def add(task: Option[AttributeKey[_]], key: AttributeKey[_]): AKeyIndex = new AKeyIndex(data + (task, key.label))
   def keys(task: Option[AttributeKey[_]]): Set[String] = data.forward(task)
   def allKeys: Set[String] = data._2s.toSet
   def tasks: Set[AttributeKey[_]] = data._1s.flatten.toSet