diff --git a/compiler/parser/src/tokenizer/lexer.rs b/compiler/parser/src/tokenizer/lexer.rs
index 8aae138e3c..da372b9636 100644
--- a/compiler/parser/src/tokenizer/lexer.rs
+++ b/compiler/parser/src/tokenizer/lexer.rs
@@ -79,7 +79,6 @@ impl Token {
 
         if let Ok(hex) = u32::from_str_radix(&unicode, 16) {
             if let Some(character) = std::char::from_u32(hex) {
-                // scalar
                 Ok((len, Char::Scalar(character)))
             } else if hex <= 0x10FFFF {
                 Ok((len, Char::NonScalar(hex)))
diff --git a/docs/grammar/README.md b/docs/grammar/README.md
index 45be683ef5..b25a20102e 100644
Binary files a/docs/grammar/README.md and b/docs/grammar/README.md differ
diff --git a/docs/grammar/abnf-grammar.txt b/docs/grammar/abnf-grammar.txt
index 6dd159e16b..e340336d2a 100644
--- a/docs/grammar/abnf-grammar.txt
+++ b/docs/grammar/abnf-grammar.txt
@@ -222,9 +222,9 @@ address-type = %s"address"
 
 character-type = %s"char"
 
-scalar-type =  boolean-type / arithmetic-type / address-type / character-type
+primitive-type =  boolean-type / arithmetic-type / address-type / character-type
 
-type = scalar-type
+type = primitive-type
 
 group-coordinate = ( [ "-" ] numeral ) / "+" / "-" / "_"
 
diff --git a/tests/expectations/compiler/compiler/function/empty.leo.out b/tests/expectations/compiler/compiler/function/empty.leo.out
deleted file mode 100644
index f8d6a48a30..0000000000
--- a/tests/expectations/compiler/compiler/function/empty.leo.out
+++ /dev/null
@@ -1,8 +0,0 @@
----
-namespace: Compile
-expectation: Pass
-outputs:
-  - output:
-      - initial_input_ast: 607700876d69c8b063ce8dcae912b78737a29cf84b51aa85c78913f23084bc5d
-        symbol_table: d1ff083142697183ed20f1989dd069d1910f9732684ade2ec955004b77853b7a
-    initial_ast: 44bf4ac40eb75f876b48fac10e40513ef093da3c5cbe7f0b921a930408dafd46
diff --git a/tests/expectations/compiler/compiler/integers/u128/input.leo.out b/tests/expectations/compiler/compiler/integers/u128/input.leo.out
deleted file mode 100644
index 67eba92453..0000000000
--- a/tests/expectations/compiler/compiler/integers/u128/input.leo.out
+++ /dev/null
@@ -1,6 +0,0 @@
----
-namespace: Compile
-expectation: Pass
-outputs:
-  - output: []
-    initial_ast: e71aa829c241ac4f91b352383de03ac7aeff64b905adf1ca526de2912d453c69
diff --git a/tests/expectations/compiler/compiler/integers/u16/input.leo.out b/tests/expectations/compiler/compiler/integers/u16/input.leo.out
deleted file mode 100644
index b646d0cef0..0000000000
--- a/tests/expectations/compiler/compiler/integers/u16/input.leo.out
+++ /dev/null
@@ -1,6 +0,0 @@
----
-namespace: Compile
-expectation: Pass
-outputs:
-  - output: []
-    initial_ast: 26602b86aa76dae68c0ffaf4dea4b4817e67a903c546c48aba2a584ef47c02e9
diff --git a/tests/expectations/compiler/compiler/integers/u32/input.leo.out b/tests/expectations/compiler/compiler/integers/u32/input.leo.out
deleted file mode 100644
index 810195af4d..0000000000
--- a/tests/expectations/compiler/compiler/integers/u32/input.leo.out
+++ /dev/null
@@ -1,6 +0,0 @@
----
-namespace: Compile
-expectation: Pass
-outputs:
-  - output: []
-    initial_ast: f9745870f2b98fab4d64144a6271d4df3a6e8468bc44b3562c4251cd25007806
diff --git a/tests/expectations/compiler/compiler/integers/u64/input.leo.out b/tests/expectations/compiler/compiler/integers/u64/input.leo.out
deleted file mode 100644
index cf85be58f3..0000000000
--- a/tests/expectations/compiler/compiler/integers/u64/input.leo.out
+++ /dev/null
@@ -1,6 +0,0 @@
----
-namespace: Compile
-expectation: Pass
-outputs:
-  - output: []
-    initial_ast: 0d34afd6f2596e4fe1bd6ec5a9f545a0b77a5b9d966b998fe721ccf74e44b141
diff --git a/tests/expectations/compiler/compiler/integers/u8/input.leo.out b/tests/expectations/compiler/compiler/integers/u8/input.leo.out
deleted file mode 100644
index 27c6694e72..0000000000
--- a/tests/expectations/compiler/compiler/integers/u8/input.leo.out
+++ /dev/null
@@ -1,6 +0,0 @@
----
-namespace: Compile
-expectation: Pass
-outputs:
-  - output: []
-    initial_ast: 58ecb75b0239e1b37865eec65c7c75418d52038b990d0f9c0d25cbb2645c1107
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/implicit.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/implicit.leo.out
deleted file mode 100644
index 23822eb101..0000000000
--- a/tests/expectations/parser/parser/expression/literal/int_parse/implicit.leo.out
+++ /dev/null
@@ -1,634 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Value:
-      Implicit:
-        - "123"
-        - span:
-            lo: 0
-            hi: 3
-  - Value:
-      Implicit:
-        - "123"
-        - span:
-            lo: 0
-            hi: 3
-  - Value:
-      Implicit:
-        - "456"
-        - span:
-            lo: 0
-            hi: 3
-  - Value:
-      Implicit:
-        - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 80
-  - Value:
-      Implicit:
-        - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 400
-  - Value:
-      Implicit:
-        - "340130024"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "158951116"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "155529659"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "642023166"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "228481736"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "469712960"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "929437719"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "721072814"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "363254789"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "906732565"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "288246391"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "724940549"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "487101620"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "261373583"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "891163927"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "743967544"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "8372586"
-        - span:
-            lo: 0
-            hi: 7
-  - Value:
-      Implicit:
-        - "461793278"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "806307045"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "122764546"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "356336181"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "158370903"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "774460877"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "557174131"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "492401267"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "893445620"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "957757048"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "721540649"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "390746493"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "211251725"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "938266114"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "156985870"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "703831126"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "729964155"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "988151305"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "320872435"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "719287167"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "152289486"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "740067975"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "728627816"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "385008978"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "553967635"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "71980713"
-        - span:
-            lo: 0
-            hi: 8
-  - Value:
-      Implicit:
-        - "519444716"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "116499965"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "717422268"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "18966279"
-        - span:
-            lo: 0
-            hi: 8
-  - Value:
-      Implicit:
-        - "22458638"
-        - span:
-            lo: 0
-            hi: 8
-  - Value:
-      Implicit:
-        - "857282620"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "920675898"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "762235516"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "469018377"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "199986521"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "536679358"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "591399452"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "83083158"
-        - span:
-            lo: 0
-            hi: 8
-  - Value:
-      Implicit:
-        - "599449051"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "445442318"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "585486590"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "209278800"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "873568117"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "664470940"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "465262783"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "605652874"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "376803940"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "965247040"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "598474509"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "845119918"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "648159133"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "669051032"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "800600261"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "434689764"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "520060080"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "804659385"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "537828058"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "716600292"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "387020273"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "199375617"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "680337189"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "818479931"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "893693281"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "87377802"
-        - span:
-            lo: 0
-            hi: 8
-  - Value:
-      Implicit:
-        - "84699261"
-        - span:
-            lo: 0
-            hi: 8
-  - Value:
-      Implicit:
-        - "292826090"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "569171405"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "387436237"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "150682190"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "888770419"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "824696431"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "765659803"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "270163693"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "427940240"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "504997332"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "337808338"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "907200008"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "757177889"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "696697188"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "41376051"
-        - span:
-            lo: 0
-            hi: 8
-  - Value:
-      Implicit:
-        - "496293518"
-        - span:
-            lo: 0
-            hi: 9
-  - Value:
-      Implicit:
-        - "251218820"
-        - span:
-            lo: 0
-            hi: 9
diff --git a/tests/expectations/parser/parser/functions/const_function.leo.out b/tests/expectations/parser/parser/functions/const_function.leo.out
deleted file mode 100644
index 2dcf7b3e79..0000000000
--- a/tests/expectations/parser/parser/functions/const_function.leo.out
+++ /dev/null
@@ -1,32 +0,0 @@
----
-namespace: Parse
-expectation: Pass
-outputs:
-  - name: ""
-    expected_input: []
-    functions:
-      "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}":
-        identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-        input: []
-        const_: true
-        output: ~
-        core_mapping: ~
-        block:
-          statements:
-            - Return:
-                expression:
-                  Value:
-                    Implicit:
-                      - "0"
-                      - span:
-                          lo: 34
-                          hi: 35
-                span:
-                  lo: 27
-                  hi: 35
-          span:
-            lo: 21
-            hi: 38
-        span:
-          lo: 8
-          hi: 38