6 files changed, 17 insertions, 17 deletions

diff --git a/src/ast/generated.rs b/src/ast/generated.rs
index 612b04f86..b93c76d0c 100644
--- a/src/ast/generated.rs
+++ b/src/ast/generated.rs
@@ -22,14 +22,14 @@ impl<R: TreeRoot> AstNode<R> for File<R> {
 
 
 #[derive(Debug)]
-pub struct FnItem<R: TreeRoot = Arc<SyntaxRoot>> {
+pub struct Function<R: TreeRoot = Arc<SyntaxRoot>> {
     syntax: SyntaxNode<R>,
 }
 
-impl<R: TreeRoot> AstNode<R> for FnItem<R> {
+impl<R: TreeRoot> AstNode<R> for Function<R> {
     fn cast(syntax: SyntaxNode<R>) -> Option<Self> {
         match syntax.kind() {
-            FN_ITEM => Some(FnItem { syntax }),
+            FUNCTION => Some(Function { syntax }),
             _ => None,
         }
     }
diff --git a/src/ast/mod.rs b/src/ast/mod.rs
index dc7e006c9..317ed4f45 100644
--- a/src/ast/mod.rs
+++ b/src/ast/mod.rs
@@ -19,14 +19,14 @@ impl File<Arc<SyntaxRoot>> {
 }
 
 impl<R: TreeRoot> File<R> {
-    pub fn functions<'a>(&'a self) -> impl Iterator<Item = FnItem<R>> + 'a {
+    pub fn functions<'a>(&'a self) -> impl Iterator<Item = Function<R>> + 'a {
         self.syntax()
             .children()
-            .filter_map(FnItem::cast)
+            .filter_map(Function::cast)
     }
 }
 
-impl<R: TreeRoot> FnItem<R> {
+impl<R: TreeRoot> Function<R> {
     pub fn name(&self) -> Option<Name<R>> {
         self.syntax()
             .children()
diff --git a/src/grammar.ron b/src/grammar.ron
index b6a870d84..bcc79843a 100644
--- a/src/grammar.ron
+++ b/src/grammar.ron
@@ -110,7 +110,7 @@ Grammar(
 
         "STRUCT_ITEM",
         "ENUM_ITEM",
-        "FN_ITEM",
+        "FUNCTION",
         "EXTERN_CRATE_ITEM",
         "MOD_ITEM",
         "USE_ITEM",
@@ -218,7 +218,7 @@ Grammar(
             kind: "FILE"
         ),
         (
-            kind: "FN_ITEM"
+            kind: "FUNCTION"
         ),
         (
             kind: "NAME"
diff --git a/src/grammar/items/mod.rs b/src/grammar/items/mod.rs
index 824f1296c..3bf906f85 100644
--- a/src/grammar/items/mod.rs
+++ b/src/grammar/items/mod.rs
@@ -107,8 +107,8 @@ pub(super) fn maybe_item(p: &mut Parser) -> MaybeItem {
         // test unsafe_fn
         // unsafe fn foo() {}
         FN_KW => {
-            fn_item(p);
-            FN_ITEM
+            function(p);
+            FUNCTION
         }
 
         // test unsafe_trait
@@ -217,12 +217,12 @@ fn extern_block(p: &mut Parser) {
     p.expect(R_CURLY);
 }
 
-fn fn_item(p: &mut Parser) {
+fn function(p: &mut Parser) {
     assert!(p.at(FN_KW));
     p.bump();
 
     name(p);
-    // test fn_item_type_params
+    // test function_type_params
     // fn foo<T: Clone + Copy>(){}
     type_params::type_param_list(p);
 
@@ -231,12 +231,12 @@ fn fn_item(p: &mut Parser) {
     } else {
         p.error("expected function arguments");
     }
-    // test fn_item_ret_type
+    // test function_ret_type
     // fn foo() {}
     // fn bar() -> () {}
     fn_ret_type(p);
 
-    // test fn_item_where_clause
+    // test function_where_clause
     // fn foo<T>() where T: Copy {}
     type_params::where_clause(p);
 
diff --git a/src/grammar/mod.rs b/src/grammar/mod.rs
index 1e7d04ce9..e1329044d 100644
--- a/src/grammar/mod.rs
+++ b/src/grammar/mod.rs
@@ -14,7 +14,7 @@
 //! `// test name-of-the-test` comment and look like this:
 //!
 //! ```
-//! // test fn_item_with_zero_parameters
+//! // test function_with_zero_parameters
 //! // fn foo() {}
 //! ```
 //!
diff --git a/src/syntax_kinds/generated.rs b/src/syntax_kinds/generated.rs
index 84f90c593..de2807ba6 100644
--- a/src/syntax_kinds/generated.rs
+++ b/src/syntax_kinds/generated.rs
@@ -110,7 +110,7 @@ pub enum SyntaxKind {
     FILE,
     STRUCT_ITEM,
     ENUM_ITEM,
-    FN_ITEM,
+    FUNCTION,
     EXTERN_CRATE_ITEM,
     MOD_ITEM,
     USE_ITEM,
@@ -345,7 +345,7 @@ impl SyntaxKind {
             FILE => &SyntaxInfo { name: "FILE" },
             STRUCT_ITEM => &SyntaxInfo { name: "STRUCT_ITEM" },
             ENUM_ITEM => &SyntaxInfo { name: "ENUM_ITEM" },
-            FN_ITEM => &SyntaxInfo { name: "FN_ITEM" },
+            FUNCTION => &SyntaxInfo { name: "FUNCTION" },
             EXTERN_CRATE_ITEM => &SyntaxInfo { name: "EXTERN_CRATE_ITEM" },
             MOD_ITEM => &SyntaxInfo { name: "MOD_ITEM" },
             USE_ITEM => &SyntaxInfo { name: "USE_ITEM" },