diff --git a/crates/solidity/testing/snapshots/bindings_output/expressions/type_expr_minmax/generated/0.4.11-failure.txt b/crates/solidity/testing/snapshots/bindings_output/expressions/type_expr_minmax/generated/0.4.11-failure.txt
index 8bb64d8421..a759f22a82 100644
--- a/crates/solidity/testing/snapshots/bindings_output/expressions/type_expr_minmax/generated/0.4.11-failure.txt
+++ b/crates/solidity/testing/snapshots/bindings_output/expressions/type_expr_minmax/generated/0.4.11-failure.txt
@@ -11,3 +11,4 @@ Error: Expected ContractKeyword or ImportKeyword or InterfaceKeyword or LibraryK
     │ ╰─────── Error occurred here.
 ────╯
 References and definitions: 
+Definiens: 
diff --git a/crates/solidity/testing/snapshots/bindings_output/expressions/type_expr_minmax/generated/0.6.0-failure.txt b/crates/solidity/testing/snapshots/bindings_output/expressions/type_expr_minmax/generated/0.6.0-failure.txt
index 7c5560b7eb..ae4ac88a5c 100644
--- a/crates/solidity/testing/snapshots/bindings_output/expressions/type_expr_minmax/generated/0.6.0-failure.txt
+++ b/crates/solidity/testing/snapshots/bindings_output/expressions/type_expr_minmax/generated/0.6.0-failure.txt
@@ -5,21 +5,21 @@ References and definitions:
     │
   1 │ enum Answer {
     │      ───┬──  
-    │         ╰──── def: 1
+    │         ╰──── name: 1
   2 │   Yes
     │   ─┬─  
-    │    ╰─── def: 2
+    │    ╰─── name: 2
     │ 
   5 │ library Id {
     │         ─┬  
-    │          ╰── def: 3
+    │          ╰── name: 3
   6 │   function id(Answer ans) returns (Answer) {
     │            ─┬ ───┬── ─┬─           ───┬──  
-    │             ╰────────────────────────────── def: 4
+    │             ╰────────────────────────────── name: 4
     │                  │    │               │    
     │                  ╰───────────────────────── ref: 1
     │                       │               │    
-    │                       ╰──────────────────── def: 5
+    │                       ╰──────────────────── name: 5
     │                                       │    
     │                                       ╰──── ref: 1
   7 │     return ans;
@@ -28,7 +28,7 @@ References and definitions:
     │ 
  11 │ contract Test {
     │          ──┬─  
-    │            ╰─── def: 6
+    │            ╰─── name: 6
  12 │   using Id for Answer;
     │         ─┬     ───┬──  
     │          ╰───────────── ref: 3
@@ -37,7 +37,7 @@ References and definitions:
     │ 
  14 │   function testFunc() {
     │            ────┬───  
-    │                ╰───── def: 7
+    │                ╰───── name: 7
  15 │     type(Answer).min.id();
     │          ───┬──  ─┬─ ─┬  
     │             ╰──────────── ref: 1
@@ -53,3 +53,36 @@ References and definitions:
     │                       │  
     │                       ╰── unresolved
 ────╯
+Definiens: 
+    ╭─[input.sol:1:1]
+    │
+  1 │         ╭─▶ enum Answer {
+  2 │         │     Yes
+    │         │     ─┬─  
+    │         │      ╰─── definiens: 2
+  3 │     │   ├─▶ }
+    │     │   │       
+    │     │   ╰─────── definiens: 1
+  4 │     ╭─────▶ 
+    ┆     ┆ ┆     
+  6 │     │ ╭───▶   function id(Answer ans) returns (Answer) {
+    │     │ │                   ─────┬────  
+    │     │ │                        ╰────── definiens: 5
+    ┆     ┆ ┆     
+  8 │     │ ├───▶   }
+    │     │ │           
+    │     │ ╰─────────── definiens: 4
+  9 │ │   ├─────▶ }
+    │ │   │           
+    │ │   ╰─────────── definiens: 3
+ 10 │ ╭─────────▶ 
+    ┆ ┆           
+ 13 │ │ ╭───────▶ 
+    ┆ ┆ ┆         
+ 17 │ │ ├───────▶   }
+    │ │ │               
+    │ │ ╰─────────────── definiens: 7
+ 18 │ ├─────────▶ }
+    │ │               
+    │ ╰─────────────── definiens: 6
+────╯
diff --git a/crates/solidity/testing/snapshots/bindings_output/expressions/type_expr_minmax/generated/0.6.8-success.txt b/crates/solidity/testing/snapshots/bindings_output/expressions/type_expr_minmax/generated/0.6.8-success.txt
index d50253aa15..fa55cac0cf 100644
--- a/crates/solidity/testing/snapshots/bindings_output/expressions/type_expr_minmax/generated/0.6.8-success.txt
+++ b/crates/solidity/testing/snapshots/bindings_output/expressions/type_expr_minmax/generated/0.6.8-success.txt
@@ -5,21 +5,21 @@ References and definitions:
     │
   1 │ enum Answer {
     │      ───┬──  
-    │         ╰──── def: 1
+    │         ╰──── name: 1
   2 │   Yes
     │   ─┬─  
-    │    ╰─── def: 2
+    │    ╰─── name: 2
     │ 
   5 │ library Id {
     │         ─┬  
-    │          ╰── def: 3
+    │          ╰── name: 3
   6 │   function id(Answer ans) returns (Answer) {
     │            ─┬ ───┬── ─┬─           ───┬──  
-    │             ╰────────────────────────────── def: 4
+    │             ╰────────────────────────────── name: 4
     │                  │    │               │    
     │                  ╰───────────────────────── ref: 1
     │                       │               │    
-    │                       ╰──────────────────── def: 5
+    │                       ╰──────────────────── name: 5
     │                                       │    
     │                                       ╰──── ref: 1
   7 │     return ans;
@@ -28,7 +28,7 @@ References and definitions:
     │ 
  11 │ contract Test {
     │          ──┬─  
-    │            ╰─── def: 6
+    │            ╰─── name: 6
  12 │   using Id for Answer;
     │         ─┬     ───┬──  
     │          ╰───────────── ref: 3
@@ -37,7 +37,7 @@ References and definitions:
     │ 
  14 │   function testFunc() {
     │            ────┬───  
-    │                ╰───── def: 7
+    │                ╰───── name: 7
  15 │     type(Answer).min.id();
     │          ───┬──  ─┬─ ─┬  
     │             ╰──────────── ref: 1
@@ -53,3 +53,36 @@ References and definitions:
     │                       │  
     │                       ╰── ref: 4
 ────╯
+Definiens: 
+    ╭─[input.sol:1:1]
+    │
+  1 │         ╭─▶ enum Answer {
+  2 │         │     Yes
+    │         │     ─┬─  
+    │         │      ╰─── definiens: 2
+  3 │     │   ├─▶ }
+    │     │   │       
+    │     │   ╰─────── definiens: 1
+  4 │     ╭─────▶ 
+    ┆     ┆ ┆     
+  6 │     │ ╭───▶   function id(Answer ans) returns (Answer) {
+    │     │ │                   ─────┬────  
+    │     │ │                        ╰────── definiens: 5
+    ┆     ┆ ┆     
+  8 │     │ ├───▶   }
+    │     │ │           
+    │     │ ╰─────────── definiens: 4
+  9 │ │   ├─────▶ }
+    │ │   │           
+    │ │   ╰─────────── definiens: 3
+ 10 │ ╭─────────▶ 
+    ┆ ┆           
+ 13 │ │ ╭───────▶ 
+    ┆ ┆ ┆         
+ 17 │ │ ├───────▶   }
+    │ │ │               
+    │ │ ╰─────────────── definiens: 7
+ 18 │ ├─────────▶ }
+    │ │               
+    │ ╰─────────────── definiens: 6
+────╯
diff --git a/crates/solidity/testing/snapshots/bindings_output/using/binding_enum/generated/0.4.11-failure.txt b/crates/solidity/testing/snapshots/bindings_output/using/binding_enum/generated/0.4.11-failure.txt
index 8bb64d8421..a759f22a82 100644
--- a/crates/solidity/testing/snapshots/bindings_output/using/binding_enum/generated/0.4.11-failure.txt
+++ b/crates/solidity/testing/snapshots/bindings_output/using/binding_enum/generated/0.4.11-failure.txt
@@ -11,3 +11,4 @@ Error: Expected ContractKeyword or ImportKeyword or InterfaceKeyword or LibraryK
     │ ╰─────── Error occurred here.
 ────╯
 References and definitions: 
+Definiens: 
diff --git a/crates/solidity/testing/snapshots/bindings_output/using/binding_enum/generated/0.6.0-success.txt b/crates/solidity/testing/snapshots/bindings_output/using/binding_enum/generated/0.6.0-success.txt
index 3388a66eb7..b0f91de648 100644
--- a/crates/solidity/testing/snapshots/bindings_output/using/binding_enum/generated/0.6.0-success.txt
+++ b/crates/solidity/testing/snapshots/bindings_output/using/binding_enum/generated/0.6.0-success.txt
@@ -5,21 +5,21 @@ References and definitions:
     │
   1 │ enum Answer {
     │      ───┬──  
-    │         ╰──── def: 1
+    │         ╰──── name: 1
   2 │   Yes
     │   ─┬─  
-    │    ╰─── def: 2
+    │    ╰─── name: 2
     │ 
   5 │ library Id {
     │         ─┬  
-    │          ╰── def: 3
+    │          ╰── name: 3
   6 │   function id(Answer ans) returns (Answer) {
     │            ─┬ ───┬── ─┬─           ───┬──  
-    │             ╰────────────────────────────── def: 4
+    │             ╰────────────────────────────── name: 4
     │                  │    │               │    
     │                  ╰───────────────────────── ref: 1
     │                       │               │    
-    │                       ╰──────────────────── def: 5
+    │                       ╰──────────────────── name: 5
     │                                       │    
     │                                       ╰──── ref: 1
   7 │     return ans;
@@ -28,7 +28,7 @@ References and definitions:
     │ 
  11 │ contract Test {
     │          ──┬─  
-    │            ╰─── def: 6
+    │            ╰─── name: 6
  12 │   using Id for Answer;
     │         ─┬     ───┬──  
     │          ╰───────────── ref: 3
@@ -37,14 +37,14 @@ References and definitions:
     │ 
  14 │   function testFunc() returns (Answer) {
     │            ────┬───            ───┬──  
-    │                ╰─────────────────────── def: 7
+    │                ╰─────────────────────── name: 7
     │                                   │    
     │                                   ╰──── ref: 1
  15 │     Answer value = Answer.Yes;
     │     ───┬── ──┬──   ───┬── ─┬─  
     │        ╰─────────────────────── ref: 1
     │              │        │    │   
-    │              ╰───────────────── def: 8
+    │              ╰───────────────── name: 8
     │                       │    │   
     │                       ╰──────── ref: 1
     │                            │   
@@ -55,3 +55,40 @@ References and definitions:
     │            │  
     │            ╰── ref: 4
 ────╯
+Definiens: 
+    ╭─[input.sol:1:1]
+    │
+  1 │         ╭─▶ enum Answer {
+  2 │         │     Yes
+    │         │     ─┬─  
+    │         │      ╰─── definiens: 2
+  3 │     │   ├─▶ }
+    │     │   │       
+    │     │   ╰─────── definiens: 1
+  4 │     ╭─────▶ 
+    ┆     ┆ ┆     
+  6 │     │ ╭───▶   function id(Answer ans) returns (Answer) {
+    │     │ │                   ─────┬────  
+    │     │ │                        ╰────── definiens: 5
+    ┆     ┆ ┆     
+  8 │     │ ├───▶   }
+    │     │ │           
+    │     │ ╰─────────── definiens: 4
+  9 │ │   ├─────▶ }
+    │ │   │           
+    │ │   ╰─────────── definiens: 3
+ 10 │ ╭─────────▶ 
+    ┆ ┆           
+ 13 │ │ ╭───────▶ 
+    ┆ ┆ ┆         
+ 15 │ │ │             Answer value = Answer.Yes;
+    │ │ │         ───────────────┬───────────────  
+    │ │ │                        ╰───────────────── definiens: 8
+    ┆ ┆ ┆         
+ 17 │ │ ├───────▶   }
+    │ │ │               
+    │ │ ╰─────────────── definiens: 7
+ 18 │ ├─────────▶ }
+    │ │               
+    │ ╰─────────────── definiens: 6
+────╯
diff --git a/crates/solidity/testing/snapshots/bindings_output/using/binding_enum_member/generated/0.4.11-failure.txt b/crates/solidity/testing/snapshots/bindings_output/using/binding_enum_member/generated/0.4.11-failure.txt
index cf5e986cd3..ae5537b644 100644
--- a/crates/solidity/testing/snapshots/bindings_output/using/binding_enum_member/generated/0.4.11-failure.txt
+++ b/crates/solidity/testing/snapshots/bindings_output/using/binding_enum_member/generated/0.4.11-failure.txt
@@ -11,3 +11,4 @@ Error: Expected ContractKeyword or ImportKeyword or InterfaceKeyword or LibraryK
     │ ╰─────── Error occurred here.
 ────╯
 References and definitions: 
+Definiens: 
diff --git a/crates/solidity/testing/snapshots/bindings_output/using/binding_enum_member/generated/0.6.0-failure.txt b/crates/solidity/testing/snapshots/bindings_output/using/binding_enum_member/generated/0.6.0-failure.txt
index 12d33d6f84..70bd440092 100644
--- a/crates/solidity/testing/snapshots/bindings_output/using/binding_enum_member/generated/0.6.0-failure.txt
+++ b/crates/solidity/testing/snapshots/bindings_output/using/binding_enum_member/generated/0.6.0-failure.txt
@@ -5,21 +5,21 @@ References and definitions:
     │
   1 │ enum Answer {
     │      ───┬──  
-    │         ╰──── def: 1
+    │         ╰──── name: 1
   2 │   Yes
     │   ─┬─  
-    │    ╰─── def: 2
+    │    ╰─── name: 2
     │ 
   5 │ library Id {
     │         ─┬  
-    │          ╰── def: 3
+    │          ╰── name: 3
   6 │   function id(Answer ans) returns (Answer) {
     │            ─┬ ───┬── ─┬─           ───┬──  
-    │             ╰────────────────────────────── def: 4
+    │             ╰────────────────────────────── name: 4
     │                  │    │               │    
     │                  ╰───────────────────────── ref: 1
     │                       │               │    
-    │                       ╰──────────────────── def: 5
+    │                       ╰──────────────────── name: 5
     │                                       │    
     │                                       ╰──── ref: 1
   7 │     return ans;
@@ -28,7 +28,7 @@ References and definitions:
     │ 
  11 │ contract Test {
     │          ──┬─  
-    │            ╰─── def: 6
+    │            ╰─── name: 6
  12 │   using Id for Answer;
     │         ─┬     ───┬──  
     │          ╰───────────── ref: 3
@@ -37,7 +37,7 @@ References and definitions:
     │ 
  14 │   function testFunc() returns (Answer) {
     │            ────┬───            ───┬──  
-    │                ╰─────────────────────── def: 7
+    │                ╰─────────────────────── name: 7
     │                                   │    
     │                                   ╰──── ref: 1
  15 │     Answer.Yes.id();
@@ -48,3 +48,36 @@ References and definitions:
     │                 │  
     │                 ╰── unresolved
 ────╯
+Definiens: 
+    ╭─[input.sol:1:1]
+    │
+  1 │         ╭─▶ enum Answer {
+  2 │         │     Yes
+    │         │     ─┬─  
+    │         │      ╰─── definiens: 2
+  3 │   │     ├─▶ }
+    │   │     │       
+    │   │     ╰─────── definiens: 1
+  4 │   ╭───────▶ 
+    ┆   ┆   ┆     
+  6 │   │   ╭───▶   function id(Answer ans) returns (Answer) {
+    │   │   │                   ─────┬────  
+    │   │   │                        ╰────── definiens: 5
+    ┆   ┆   ┆     
+  8 │   │   ├───▶   }
+    │   │   │           
+    │   │   ╰─────────── definiens: 4
+  9 │ │ ├───────▶ }
+    │ │ │             
+    │ │ ╰───────────── definiens: 3
+ 10 │ ╭─────────▶ 
+    ┆ ┆           
+ 13 │ │   ╭─────▶ 
+    ┆ ┆   ┆       
+ 16 │ │   ├─────▶   }
+    │ │   │             
+    │ │   ╰───────────── definiens: 7
+ 17 │ ├─────────▶ }
+    │ │               
+    │ ╰─────────────── definiens: 6
+────╯
diff --git a/crates/solidity/testing/snapshots/bindings_output/using/binding_enum_member/generated/0.6.8-success.txt b/crates/solidity/testing/snapshots/bindings_output/using/binding_enum_member/generated/0.6.8-success.txt
index 495d16b0fc..f15392b433 100644
--- a/crates/solidity/testing/snapshots/bindings_output/using/binding_enum_member/generated/0.6.8-success.txt
+++ b/crates/solidity/testing/snapshots/bindings_output/using/binding_enum_member/generated/0.6.8-success.txt
@@ -5,21 +5,21 @@ References and definitions:
     │
   1 │ enum Answer {
     │      ───┬──  
-    │         ╰──── def: 1
+    │         ╰──── name: 1
   2 │   Yes
     │   ─┬─  
-    │    ╰─── def: 2
+    │    ╰─── name: 2
     │ 
   5 │ library Id {
     │         ─┬  
-    │          ╰── def: 3
+    │          ╰── name: 3
   6 │   function id(Answer ans) returns (Answer) {
     │            ─┬ ───┬── ─┬─           ───┬──  
-    │             ╰────────────────────────────── def: 4
+    │             ╰────────────────────────────── name: 4
     │                  │    │               │    
     │                  ╰───────────────────────── ref: 1
     │                       │               │    
-    │                       ╰──────────────────── def: 5
+    │                       ╰──────────────────── name: 5
     │                                       │    
     │                                       ╰──── ref: 1
   7 │     return ans;
@@ -28,7 +28,7 @@ References and definitions:
     │ 
  11 │ contract Test {
     │          ──┬─  
-    │            ╰─── def: 6
+    │            ╰─── name: 6
  12 │   using Id for Answer;
     │         ─┬     ───┬──  
     │          ╰───────────── ref: 3
@@ -37,7 +37,7 @@ References and definitions:
     │ 
  14 │   function testFunc() returns (Answer) {
     │            ────┬───            ───┬──  
-    │                ╰─────────────────────── def: 7
+    │                ╰─────────────────────── name: 7
     │                                   │    
     │                                   ╰──── ref: 1
  15 │     Answer.Yes.id();
@@ -48,3 +48,36 @@ References and definitions:
     │                 │  
     │                 ╰── ref: 4
 ────╯
+Definiens: 
+    ╭─[input.sol:1:1]
+    │
+  1 │         ╭─▶ enum Answer {
+  2 │         │     Yes
+    │         │     ─┬─  
+    │         │      ╰─── definiens: 2
+  3 │   │     ├─▶ }
+    │   │     │       
+    │   │     ╰─────── definiens: 1
+  4 │   ╭───────▶ 
+    ┆   ┆   ┆     
+  6 │   │   ╭───▶   function id(Answer ans) returns (Answer) {
+    │   │   │                   ─────┬────  
+    │   │   │                        ╰────── definiens: 5
+    ┆   ┆   ┆     
+  8 │   │   ├───▶   }
+    │   │   │           
+    │   │   ╰─────────── definiens: 4
+  9 │ │ ├───────▶ }
+    │ │ │             
+    │ │ ╰───────────── definiens: 3
+ 10 │ ╭─────────▶ 
+    ┆ ┆           
+ 13 │ │   ╭─────▶ 
+    ┆ ┆   ┆       
+ 16 │ │   ├─────▶   }
+    │ │   │             
+    │ │   ╰───────────── definiens: 7
+ 17 │ ├─────────▶ }
+    │ │               
+    │ ╰─────────────── definiens: 6
+────╯