diff --git a/crates/solidity/inputs/language/definition/01-file-structure/04-imports/productions.yml b/crates/solidity/inputs/language/definition/01-file-structure/04-imports/productions.yml
index 00456cb5d2..755603087f 100644
--- a/crates/solidity/inputs/language/definition/01-file-structure/04-imports/productions.yml
+++ b/crates/solidity/inputs/language/definition/01-file-structure/04-imports/productions.yml
@@ -75,7 +75,7 @@
         parser:
           sequence:
             - reference: "UsingKeyword"
-            - reference: "UsingDirectivePath"
+            - reference: "IdentifierPath"
             - reference: "ForKeyword"
             - choice:
                 - reference: "Asterisk"
@@ -89,7 +89,7 @@
           sequence:
             - reference: "UsingKeyword"
             - choice:
-                - reference: "UsingDirectivePath"
+                - reference: "IdentifierPath"
                 - reference: "UsingDirectiveDeconstruction"
             - reference: "ForKeyword"
             - choice:
@@ -100,11 +100,6 @@
         terminator:
           reference: "Semicolon"
 
-- name: "UsingDirectivePath"
-  kind: "Parser"
-  unversioned:
-    reference: "IdentifierPath"
-
 - name: "UsingDirectiveDeconstruction"
   kind: "Parser"
   versioned:
diff --git a/crates/solidity/inputs/language/definition/04-statements/02-declaration-statements/productions.yml b/crates/solidity/inputs/language/definition/04-statements/02-declaration-statements/productions.yml
index 5510916ed4..2371ffc86b 100644
--- a/crates/solidity/inputs/language/definition/04-statements/02-declaration-statements/productions.yml
+++ b/crates/solidity/inputs/language/definition/04-statements/02-declaration-statements/productions.yml
@@ -49,7 +49,10 @@
     terminatedBy:
       parser:
         sequence:
-          - reference: "VariableDeclaration"
+          - reference: "VariableDeclarationType"
+          - optional:
+              reference: "DataLocation"
+          - reference: "Identifier"
           - optional:
               sequence:
                 - reference: "Equal"
@@ -57,24 +60,17 @@
       terminator:
         reference: "Semicolon"
 
-- name: "VariableDeclaration"
+- name: "VariableDeclarationType"
   kind: "Parser"
+  inlined: true
   versioned:
     0.4.11:
-      sequence:
-        - choice:
-            - reference: "VarKeyword"
-            - reference: "TypeName"
-        - optional:
-            reference: "DataLocation"
-        - reference: "Identifier"
+      choice:
+        - reference: "VarKeyword"
+        - reference: "TypeName"
     0.5.0:
       # removed "VarKeyword"
-      sequence:
-        - reference: "TypeName"
-        - optional:
-            reference: "DataLocation"
-        - reference: "Identifier"
+      reference: "TypeName"
 
 - name: "DataLocation"
   kind: "Parser"
diff --git a/crates/solidity/inputs/language/src/dsl.rs b/crates/solidity/inputs/language/src/dsl.rs
index 26c658439f..302b13573f 100644
--- a/crates/solidity/inputs/language/src/dsl.rs
+++ b/crates/solidity/inputs/language/src/dsl.rs
@@ -550,7 +550,7 @@ slang_grammar! {
 
         parser UserDefinedValueTypeDefinition = { introduced in "0.8.8" ((TypeKeyword Identifier IsKeyword ElementaryType) terminated by Semicolon) } ;
 
-        parser UsingDirective = ((UsingKeyword (UsingDirectivePath | UsingDirectiveDeconstruction) ForKeyword (Asterisk | TypeName) ({ introduced in "0.8.13" GlobalKeyword } ?)) terminated by Semicolon) ;
+        parser UsingDirective = ((UsingKeyword (IdentifierPath | UsingDirectiveDeconstruction) ForKeyword (Asterisk | TypeName) ({ introduced in "0.8.13" GlobalKeyword } ?)) terminated by Semicolon) ;
 
         parser UsingDirectiveDeconstruction = { introduced in "0.8.13" (UsingDirectiveSymbolsList delimited by OpenBrace and CloseBrace) };
 
@@ -558,17 +558,15 @@ slang_grammar! {
             introduced in "0.8.19" (Ampersand | Asterisk | BangEqual | Bar | Caret | EqualEqual | GreaterThan | GreaterThanEqual | LessThan | LessThanEqual | Minus | Percent | Plus | Slash | Tilde)
         } ;
 
-        parser UsingDirectivePath = IdentifierPath ;
-
         parser UsingDirectiveSymbol = {
             introduced in "0.8.13" (IdentifierPath { introduced in "0.8.19" ((AsKeyword UsingDirectiveOperator) ?) } )
         } ;
 
         parser UsingDirectiveSymbolsList = (UsingDirectiveSymbol separated by Comma) ;
 
-        parser VariableDeclaration = (
-            ({ removed in "0.5.0" VarKeyword } | TypeName) (DataLocation ?) Identifier
-        ) ;
+        parser VariableDeclaration = (VariableDeclarationType (DataLocation ?) Identifier) ;
+
+        inline parser VariableDeclarationType = ({ removed in "0.5.0" VarKeyword } | TypeName) ;
 
         parser VariableDeclarationStatement = ((VariableDeclaration ((Equal Expression) ?)) terminated by Semicolon) ;
 
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs b/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs
index 143e1306a9..3eab6c6c27 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs
+++ b/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs
@@ -128,7 +128,6 @@ pub enum ProductionKind {
     UserDefinedValueTypeDefinition,
     UsingDirective,
     UsingDirectiveDeconstruction,
-    UsingDirectivePath,
     UsingDirectiveSymbol,
     UsingDirectiveSymbolsList,
     VariableDeclaration,
@@ -293,7 +292,6 @@ pub enum RuleKind {
     UserDefinedValueTypeDefinition,
     UsingDirective,
     UsingDirectiveDeconstruction,
-    UsingDirectivePath,
     UsingDirectiveSymbol,
     UsingDirectiveSymbolsList,
     VariableDeclaration,
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/language.rs b/crates/solidity/outputs/cargo/crate/src/generated/language.rs
index f0310d5894..3740bf1e1d 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/language.rs
+++ b/crates/solidity/outputs/cargo/crate/src/generated/language.rs
@@ -4369,7 +4369,7 @@ impl Language {
                         TokenKind::UsingKeyword,
                     ))?;
                     seq.elem(ChoiceHelper::run(input, |mut choice, input| {
-                        let result = self.using_directive_path(input);
+                        let result = self.identifier_path(input);
                         choice.consider(input, result)?;
                         let result = self.using_directive_deconstruction(input);
                         choice.consider(input, result)?;
@@ -4446,12 +4446,6 @@ impl Language {
         .with_kind(RuleKind::UsingDirectiveDeconstruction)
     }
 
-    #[allow(unused_assignments, unused_parens)]
-    fn using_directive_path(&self, input: &mut ParserContext) -> ParserResult {
-        self.identifier_path(input)
-            .with_kind(RuleKind::UsingDirectivePath)
-    }
-
     #[allow(unused_assignments, unused_parens)]
     fn using_directive_symbol(&self, input: &mut ParserContext) -> ParserResult {
         if self.version_is_at_least_0_8_13 {
@@ -6120,7 +6114,6 @@ impl Language {
             ProductionKind::UsingDirectiveDeconstruction => {
                 Self::using_directive_deconstruction.parse(self, input)
             }
-            ProductionKind::UsingDirectivePath => Self::using_directive_path.parse(self, input),
             ProductionKind::UsingDirectiveSymbol => Self::using_directive_symbol.parse(self, input),
             ProductionKind::UsingDirectiveSymbolsList => {
                 Self::using_directive_symbols_list.parse(self, input)
diff --git a/crates/solidity/outputs/npm/crate/src/generated/kinds.rs b/crates/solidity/outputs/npm/crate/src/generated/kinds.rs
index 143e1306a9..3eab6c6c27 100644
--- a/crates/solidity/outputs/npm/crate/src/generated/kinds.rs
+++ b/crates/solidity/outputs/npm/crate/src/generated/kinds.rs
@@ -128,7 +128,6 @@ pub enum ProductionKind {
     UserDefinedValueTypeDefinition,
     UsingDirective,
     UsingDirectiveDeconstruction,
-    UsingDirectivePath,
     UsingDirectiveSymbol,
     UsingDirectiveSymbolsList,
     VariableDeclaration,
@@ -293,7 +292,6 @@ pub enum RuleKind {
     UserDefinedValueTypeDefinition,
     UsingDirective,
     UsingDirectiveDeconstruction,
-    UsingDirectivePath,
     UsingDirectiveSymbol,
     UsingDirectiveSymbolsList,
     VariableDeclaration,
diff --git a/crates/solidity/outputs/npm/crate/src/generated/language.rs b/crates/solidity/outputs/npm/crate/src/generated/language.rs
index f0310d5894..3740bf1e1d 100644
--- a/crates/solidity/outputs/npm/crate/src/generated/language.rs
+++ b/crates/solidity/outputs/npm/crate/src/generated/language.rs
@@ -4369,7 +4369,7 @@ impl Language {
                         TokenKind::UsingKeyword,
                     ))?;
                     seq.elem(ChoiceHelper::run(input, |mut choice, input| {
-                        let result = self.using_directive_path(input);
+                        let result = self.identifier_path(input);
                         choice.consider(input, result)?;
                         let result = self.using_directive_deconstruction(input);
                         choice.consider(input, result)?;
@@ -4446,12 +4446,6 @@ impl Language {
         .with_kind(RuleKind::UsingDirectiveDeconstruction)
     }
 
-    #[allow(unused_assignments, unused_parens)]
-    fn using_directive_path(&self, input: &mut ParserContext) -> ParserResult {
-        self.identifier_path(input)
-            .with_kind(RuleKind::UsingDirectivePath)
-    }
-
     #[allow(unused_assignments, unused_parens)]
     fn using_directive_symbol(&self, input: &mut ParserContext) -> ParserResult {
         if self.version_is_at_least_0_8_13 {
@@ -6120,7 +6114,6 @@ impl Language {
             ProductionKind::UsingDirectiveDeconstruction => {
                 Self::using_directive_deconstruction.parse(self, input)
             }
-            ProductionKind::UsingDirectivePath => Self::using_directive_path.parse(self, input),
             ProductionKind::UsingDirectiveSymbol => Self::using_directive_symbol.parse(self, input),
             ProductionKind::UsingDirectiveSymbolsList => {
                 Self::using_directive_symbols_list.parse(self, input)
diff --git a/crates/solidity/outputs/npm/package/src/generated/index.d.ts b/crates/solidity/outputs/npm/package/src/generated/index.d.ts
index 2d0f793da6..ea08a08ceb 100644
--- a/crates/solidity/outputs/npm/package/src/generated/index.d.ts
+++ b/crates/solidity/outputs/npm/package/src/generated/index.d.ts
@@ -123,7 +123,6 @@ export namespace kinds {
     UserDefinedValueTypeDefinition = "UserDefinedValueTypeDefinition",
     UsingDirective = "UsingDirective",
     UsingDirectiveDeconstruction = "UsingDirectiveDeconstruction",
-    UsingDirectivePath = "UsingDirectivePath",
     UsingDirectiveSymbol = "UsingDirectiveSymbol",
     UsingDirectiveSymbolsList = "UsingDirectiveSymbolsList",
     VariableDeclaration = "VariableDeclaration",
@@ -274,7 +273,6 @@ export namespace kinds {
     UserDefinedValueTypeDefinition = "UserDefinedValueTypeDefinition",
     UsingDirective = "UsingDirective",
     UsingDirectiveDeconstruction = "UsingDirectiveDeconstruction",
-    UsingDirectivePath = "UsingDirectivePath",
     UsingDirectiveSymbol = "UsingDirectiveSymbol",
     UsingDirectiveSymbolsList = "UsingDirectiveSymbolsList",
     VariableDeclaration = "VariableDeclaration",
diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md
index e96aac0233..2201d6c85d 100644
--- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md
+++ b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md
@@ -1,5 +1,5 @@
 <!-- This file is generated automatically by infrastructure scripts. Please don't edit by hand. -->
 
 ```{ .ebnf .slang-ebnf #UsingDirective }
-UsingDirective = USING_KEYWORD UsingDirectivePath FOR_KEYWORD (ASTERISK | TypeName) SEMICOLON;
+UsingDirective = USING_KEYWORD IdentifierPath FOR_KEYWORD (ASTERISK | TypeName) SEMICOLON;
 ```
diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md
index c175e6eeaa..138c41fd7c 100644
--- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md
+++ b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md
@@ -1,5 +1,5 @@
 <!-- This file is generated automatically by infrastructure scripts. Please don't edit by hand. -->
 
 ```{ .ebnf .slang-ebnf #UsingDirective }
-UsingDirective = USING_KEYWORD (UsingDirectivePath | UsingDirectiveDeconstruction) FOR_KEYWORD (ASTERISK | TypeName) GLOBAL_KEYWORD? SEMICOLON;
+UsingDirective = USING_KEYWORD (IdentifierPath | UsingDirectiveDeconstruction) FOR_KEYWORD (ASTERISK | TypeName) GLOBAL_KEYWORD? SEMICOLON;
 ```
diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md
index a9258168c4..440bbdde95 100644
--- a/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md
+++ b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md
@@ -1,5 +1,5 @@
 <!-- This file is generated automatically by infrastructure scripts. Please don't edit by hand. -->
 
 ```{ .ebnf .slang-ebnf #VariableDeclarationStatement }
-VariableDeclarationStatement = VariableDeclaration (EQUAL Expression)? SEMICOLON;
+VariableDeclarationStatement = «VariableDeclarationType» «DataLocation»? IDENTIFIER (EQUAL Expression)? SEMICOLON;
 ```
diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.4.11.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.4.11.md
new file mode 100644
index 0000000000..19c3378283
--- /dev/null
+++ b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.4.11.md
@@ -0,0 +1,5 @@
+<!-- This file is generated automatically by infrastructure scripts. Please don't edit by hand. -->
+
+```{ .ebnf .slang-ebnf #VariableDeclarationType }
+«VariableDeclarationType» = VAR_KEYWORD | TypeName;
+```
diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md
similarity index 53%
rename from crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md
rename to crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md
index c44b7e4ca7..cb639085eb 100644
--- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md
+++ b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md
@@ -1,5 +1,5 @@
 <!-- This file is generated automatically by infrastructure scripts. Please don't edit by hand. -->
 
-```{ .ebnf .slang-ebnf #UsingDirectivePath }
-UsingDirectivePath = IdentifierPath;
+```{ .ebnf .slang-ebnf #VariableDeclarationType }
+«VariableDeclarationType» = TypeName;
 ```
diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.4.11.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.4.11.md
deleted file mode 100644
index fa67b4c739..0000000000
--- a/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.4.11.md
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This file is generated automatically by infrastructure scripts. Please don't edit by hand. -->
-
-```{ .ebnf .slang-ebnf #VariableDeclaration }
-VariableDeclaration = (VAR_KEYWORD | TypeName) «DataLocation»? IDENTIFIER;
-```
diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md
deleted file mode 100644
index db64d0dd38..0000000000
--- a/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This file is generated automatically by infrastructure scripts. Please don't edit by hand. -->
-
-```{ .ebnf .slang-ebnf #VariableDeclaration }
-VariableDeclaration = TypeName «DataLocation»? IDENTIFIER;
-```
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.4.11/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.4.11/index.md
index 8b4438ed52..a40054ea0e 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.4.11/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.4.11/index.md
@@ -33,7 +33,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 
 ### 1.5. Trivia
 
@@ -276,7 +275,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.4.11.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.4.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.4.11.md"
 
 ### 4.3. Control Statements
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.4.21/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.4.21/index.md
index 241595cea0..7d34ed0bba 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.4.21/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.4.21/index.md
@@ -33,7 +33,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 
 ### 1.5. Trivia
 
@@ -277,7 +276,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.4.11.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.4.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.4.11.md"
 
 ### 4.3. Control Statements
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.4.22/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.4.22/index.md
index e49026840a..2eb20eea6e 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.4.22/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.4.22/index.md
@@ -33,7 +33,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 
 ### 1.5. Trivia
 
@@ -281,7 +280,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.4.11.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.4.11.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.4.11.md"
 
 ### 4.3. Control Statements
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.5.0/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.5.0/index.md
index d992fb3670..785ff2ea5b 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.5.0/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.5.0/index.md
@@ -33,7 +33,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 
 ### 1.5. Trivia
 
@@ -279,7 +278,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md"
 
 ### 4.3. Control Statements
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.5.3/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.5.3/index.md
index 7ad073d643..ee62644955 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.5.3/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.5.3/index.md
@@ -33,7 +33,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 
 ### 1.5. Trivia
 
@@ -280,7 +279,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md"
 
 ### 4.3. Control Statements
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.0/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.0/index.md
index bf59df9831..3b938f5ffb 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.0/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.0/index.md
@@ -33,7 +33,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 
 ### 1.5. Trivia
 
@@ -288,7 +287,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md"
 
 ### 4.3. Control Statements
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.11/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.11/index.md
index 72553b031a..73069e0636 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.11/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.11/index.md
@@ -33,7 +33,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 
 ### 1.5. Trivia
 
@@ -290,7 +289,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md"
 
 ### 4.3. Control Statements
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.2/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.2/index.md
index ce322bc9d2..d9f5a9d8d5 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.2/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.2/index.md
@@ -33,7 +33,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 
 ### 1.5. Trivia
 
@@ -288,7 +287,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md"
 
 ### 4.3. Control Statements
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.5/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.5/index.md
index 19c2a166a3..bf95f4acb4 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.5/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.5/index.md
@@ -33,7 +33,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 
 ### 1.5. Trivia
 
@@ -289,7 +288,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md"
 
 ### 4.3. Control Statements
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.7.0/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.7.0/index.md
index a7837a750f..ef40192e5c 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.7.0/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.7.0/index.md
@@ -33,7 +33,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 
 ### 1.5. Trivia
 
@@ -288,7 +287,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md"
 
 ### 4.3. Control Statements
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.7.1/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.7.1/index.md
index 47c602f270..ebd93bcc37 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.7.1/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.7.1/index.md
@@ -33,7 +33,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 
 ### 1.5. Trivia
 
@@ -288,7 +287,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md"
 
 ### 4.3. Control Statements
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.7.4/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.7.4/index.md
index 0f6beaade4..3e11a49229 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.7.4/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.7.4/index.md
@@ -33,7 +33,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 
 ### 1.5. Trivia
 
@@ -292,7 +291,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md"
 
 ### 4.3. Control Statements
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.0/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.0/index.md
index faa76ddf35..d0b33770ab 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.0/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.0/index.md
@@ -33,7 +33,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 
 ### 1.5. Trivia
 
@@ -293,7 +292,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md"
 
 ### 4.3. Control Statements
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.13/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.13/index.md
index 8e78d6c022..0f9b72f178 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.13/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.13/index.md
@@ -33,7 +33,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/0.8.13.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/0.8.13.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbol/0.8.13.md"
@@ -310,7 +309,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md"
 
 ### 4.3. Control Statements
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.18/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.18/index.md
index ec48238014..a14c6ec90d 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.18/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.18/index.md
@@ -33,7 +33,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/0.8.13.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/0.8.13.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbol/0.8.13.md"
@@ -310,7 +309,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md"
 
 ### 4.3. Control Statements
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.19/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.19/index.md
index 454fa972d6..bb3c49ceac 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.19/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.19/index.md
@@ -33,7 +33,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/0.8.13.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/0.8.13.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbol/0.8.19.md"
@@ -311,7 +310,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md"
 
 ### 4.3. Control Statements
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.22/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.22/index.md
index 6db1521640..97ac274167 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.22/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.22/index.md
@@ -33,7 +33,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/0.8.13.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/0.8.13.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbol/0.8.19.md"
@@ -311,7 +310,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md"
 
 ### 4.3. Control Statements
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.4/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.4/index.md
index 3026fb4682..3c8ff21e10 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.4/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.4/index.md
@@ -33,7 +33,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 
 ### 1.5. Trivia
 
@@ -302,7 +301,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md"
 
 ### 4.3. Control Statements
diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.8/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.8/index.md
index e543651f3d..a106d0b93d 100644
--- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.8/index.md
+++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.8/index.md
@@ -33,7 +33,6 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md"
 
 ### 1.5. Trivia
 
@@ -306,7 +305,7 @@
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md"
---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md"
+--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md"
 --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md"
 
 ### 4.3. Control Statements
diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_using_directive/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_using_directive/generated/0.4.11-success.yml
index 157803ac80..37687b71fd 100644
--- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_using_directive/generated/0.4.11-success.yml
+++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_using_directive/generated/0.4.11-success.yml
@@ -15,9 +15,8 @@ Tree:
       - ContractMembersList (Rule): # 18..35 "  using x for *;\n"
           - UsingDirective (Rule): # 18..35 "  using x for *;\n"
               - UsingKeyword (Token): "using" # 20..25
-              - UsingDirectivePath (Rule): # 25..27 " x"
-                  - IdentifierPath (Rule): # 25..27 " x"
-                      - Identifier (Token): "x" # 26..27
+              - IdentifierPath (Rule): # 25..27 " x"
+                  - Identifier (Token): "x" # 26..27
               - ForKeyword (Token): "for" # 28..31
               - Asterisk (Token): "*" # 32..33
               - Semicolon (Token): ";" # 33..34
diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml
index 24a7c853a4..0262b08709 100644
--- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml
@@ -60,9 +60,8 @@ Tree:
               - Semicolon (Token): ";" # 40..41
           - UsingDirective (Rule): # 42..58 "\nusing A for B;\n"
               - UsingKeyword (Token): "using" # 43..48
-              - UsingDirectivePath (Rule): # 48..50 " A"
-                  - IdentifierPath (Rule): # 48..50 " A"
-                      - Identifier (Token): "A" # 49..50
+              - IdentifierPath (Rule): # 48..50 " A"
+                  - Identifier (Token): "A" # 49..50
               - ForKeyword (Token): "for" # 51..54
               - TypeName (Rule): # 54..56 " B"
                   - IdentifierPath (Rule): # 54..56 " B"
diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.22-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.22-success.yml
index 666ca12442..01121b182a 100644
--- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.22-success.yml
+++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.22-success.yml
@@ -52,9 +52,8 @@ Tree:
               - Semicolon (Token): ";" # 40..41
           - UsingDirective (Rule): # 42..58 "\nusing A for B;\n"
               - UsingKeyword (Token): "using" # 43..48
-              - UsingDirectivePath (Rule): # 48..50 " A"
-                  - IdentifierPath (Rule): # 48..50 " A"
-                      - Identifier (Token): "A" # 49..50
+              - IdentifierPath (Rule): # 48..50 " A"
+                  - Identifier (Token): "A" # 49..50
               - ForKeyword (Token): "for" # 51..54
               - TypeName (Rule): # 54..56 " B"
                   - IdentifierPath (Rule): # 54..56 " B"
diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.13-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.13-success.yml
index 29a05d2130..c7dd8b6d9b 100644
--- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.13-success.yml
+++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.13-success.yml
@@ -50,9 +50,8 @@ Tree:
               - Semicolon (Token): ";" # 54..55
           - UsingDirective (Rule): # 56..98 "\nusing EnvelopeUtils for Envelope global;\n"
               - UsingKeyword (Token): "using" # 57..62
-              - UsingDirectivePath (Rule): # 62..76 " EnvelopeUtils"
-                  - IdentifierPath (Rule): # 62..76 " EnvelopeUtils"
-                      - Identifier (Token): "EnvelopeUtils" # 63..76
+              - IdentifierPath (Rule): # 62..76 " EnvelopeUtils"
+                  - Identifier (Token): "EnvelopeUtils" # 63..76
               - ForKeyword (Token): "for" # 77..80
               - TypeName (Rule): # 80..89 " Envelope"
                   - IdentifierPath (Rule): # 80..89 " Envelope"
@@ -61,9 +60,8 @@ Tree:
               - Semicolon (Token): ";" # 96..97
           - UsingDirective (Rule): # 98..145 "using TransactionUtils for Transaction global;\n"
               - UsingKeyword (Token): "using" # 98..103
-              - UsingDirectivePath (Rule): # 103..120 " TransactionUtils"
-                  - IdentifierPath (Rule): # 103..120 " TransactionUtils"
-                      - Identifier (Token): "TransactionUtils" # 104..120
+              - IdentifierPath (Rule): # 103..120 " TransactionUtils"
+                  - Identifier (Token): "TransactionUtils" # 104..120
               - ForKeyword (Token): "for" # 121..124
               - TypeName (Rule): # 124..136 " Transaction"
                   - IdentifierPath (Rule): # 124..136 " Transaction"
diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.4.11-failure.yml
index d4a79bcd2d..018c4d3271 100644
--- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.4.11-failure.yml
+++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.4.11-failure.yml
@@ -16,9 +16,8 @@ Errors: # 1 total
 Tree:
   - UsingDirective (Rule): # 0..25 "using foo for bar global;"
       - UsingKeyword (Token): "using" # 0..5
-      - UsingDirectivePath (Rule): # 5..9 " foo"
-          - IdentifierPath (Rule): # 5..9 " foo"
-              - Identifier (Token): "foo" # 6..9
+      - IdentifierPath (Rule): # 5..9 " foo"
+          - Identifier (Token): "foo" # 6..9
       - ForKeyword (Token): "for" # 10..13
       - TypeName (Rule): # 13..17 " bar"
           - IdentifierPath (Rule): # 13..17 " bar"
diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.8.13-success.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.8.13-success.yml
index 2bfac291a4..89d625eca2 100644
--- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.8.13-success.yml
+++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.8.13-success.yml
@@ -8,9 +8,8 @@ Errors: []
 Tree:
   - UsingDirective (Rule): # 0..25 "using foo for bar global;"
       - UsingKeyword (Token): "using" # 0..5
-      - UsingDirectivePath (Rule): # 5..9 " foo"
-          - IdentifierPath (Rule): # 5..9 " foo"
-              - Identifier (Token): "foo" # 6..9
+      - IdentifierPath (Rule): # 5..9 " foo"
+          - Identifier (Token): "foo" # 6..9
       - ForKeyword (Token): "for" # 10..13
       - TypeName (Rule): # 13..17 " bar"
           - IdentifierPath (Rule): # 13..17 " bar"
diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_unnamed/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_unnamed/generated/0.4.11-success.yml
index c94ba36a51..87bf1887eb 100644
--- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_unnamed/generated/0.4.11-success.yml
+++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_unnamed/generated/0.4.11-success.yml
@@ -8,9 +8,8 @@ Errors: []
 Tree:
   - UsingDirective (Rule): # 0..16 "using foo for *;"
       - UsingKeyword (Token): "using" # 0..5
-      - UsingDirectivePath (Rule): # 5..9 " foo"
-          - IdentifierPath (Rule): # 5..9 " foo"
-              - Identifier (Token): "foo" # 6..9
+      - IdentifierPath (Rule): # 5..9 " foo"
+          - Identifier (Token): "foo" # 6..9
       - ForKeyword (Token): "for" # 10..13
       - Asterisk (Token): "*" # 14..15
       - Semicolon (Token): ";" # 15..16