diff --git a/tools/spec_parser/Dart.g b/tools/spec_parser/Dart.g
index f4804a6deae..f228af5f4b3 100644
--- a/tools/spec_parser/Dart.g
+++ b/tools/spec_parser/Dart.g
@@ -3,6 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 // CHANGES:
+// v0.31 Inline `identifierNotFUNCTION` into `identifier`. Replace all
+// other references with `identifier` to match the spec.
 //
 // v0.30 Add support for the class modifiers `sealed`, `final`, `base`,
 // `interface`, and for `mixin class` declarations. Also add support for
@@ -280,7 +282,7 @@ initializedIdentifierList
     ;
 
 functionSignature
-    :    type? identifierNotFUNCTION formalParameterPart
+    :    type? identifier formalParameterPart
     ;
 
 functionBody
@@ -337,7 +339,7 @@ normalFormalParameterNoMetadata
 
 // NB: It is an anomaly that a functionFormalParameter cannot be FINAL.
 functionFormalParameter
-    :    COVARIANT? type? identifierNotFUNCTION formalParameterPart '?'?
+    :    COVARIANT? type? identifier formalParameterPart '?'?
     ;
 
 simpleFormalParameter
@@ -997,18 +999,13 @@ assignableSelector
     |    '?' '[' expression ']'
     ;
 
-identifierNotFUNCTION
+identifier
     :    IDENTIFIER
     |    builtInIdentifier
     |    otherIdentifier
     |    { asyncEtcPredicate(getCurrentToken().getType()) }? (AWAIT|YIELD)
     ;
 
-identifier
-    :    identifierNotFUNCTION
-    |    FUNCTION // Built-in identifier that can be used as a type.
-    ;
-
 qualifiedName
     :    typeIdentifier '.' identifierOrNew
     |    typeIdentifier '.' typeIdentifier '.' identifierOrNew