diff --git a/vlib/v/checker/tests/add_op_wrong_type_err.out b/vlib/v/checker/tests/add_op_wrong_type_err.out
index 1cc9c857e3..1f8bff4a1c 100644
--- a/vlib/v/checker/tests/add_op_wrong_type_err.out
+++ b/vlib/v/checker/tests/add_op_wrong_type_err.out
@@ -1,39 +1,39 @@
-vlib/v/checker/tests/add_op_wrong_type_err.vv:3:13: error: mismatched types `Aaa` and `untyped int`
+vlib/v/checker/tests/add_op_wrong_type_err.vv:3:13: error: mismatched types `Aaa` and `any_int`
     1 | struct Aaa{}
     2 | fn main() {
     3 |     println(Aaa{} + 10)
       |             ~~~~~
     4 |     println(10 + Aaa{})
     5 |     println([1,2,3] + 10)
-vlib/v/checker/tests/add_op_wrong_type_err.vv:4:18: error: mismatched types `untyped int` and `Aaa`
+vlib/v/checker/tests/add_op_wrong_type_err.vv:4:18: error: mismatched types `any_int` and `Aaa`
     2 | fn main() {
     3 |     println(Aaa{} + 10)
     4 |     println(10 + Aaa{})
       |                  ~~~~~
     5 |     println([1,2,3] + 10)
     6 |     println(10 + [1,2,3])
-vlib/v/checker/tests/add_op_wrong_type_err.vv:5:13: error: mismatched types `[]int` and `untyped int`
+vlib/v/checker/tests/add_op_wrong_type_err.vv:5:13: error: mismatched types `[]int` and `any_int`
     3 |     println(Aaa{} + 10)
     4 |     println(10 + Aaa{})
     5 |     println([1,2,3] + 10)
       |             ~~~~~~~
     6 |     println(10 + [1,2,3])
     7 |     a := map[string]int
-vlib/v/checker/tests/add_op_wrong_type_err.vv:6:18: error: mismatched types `untyped int` and `[]int`
+vlib/v/checker/tests/add_op_wrong_type_err.vv:6:18: error: mismatched types `any_int` and `[]int`
     4 |     println(10 + Aaa{})
     5 |     println([1,2,3] + 10)
     6 |     println(10 + [1,2,3])
       |                  ~~~~~~~
     7 |     a := map[string]int
     8 |     println(a + 10)
-vlib/v/checker/tests/add_op_wrong_type_err.vv:8:13: error: mismatched types `map[string]int` and `untyped int`
+vlib/v/checker/tests/add_op_wrong_type_err.vv:8:13: error: mismatched types `map[string]int` and `any_int`
     6 |     println(10 + [1,2,3])
     7 |     a := map[string]int
     8 |     println(a + 10)
       |             ^
     9 |     println(10 + a)
    10 | }
-vlib/v/checker/tests/add_op_wrong_type_err.vv:9:18: error: mismatched types `untyped int` and `map[string]int`
+vlib/v/checker/tests/add_op_wrong_type_err.vv:9:18: error: mismatched types `any_int` and `map[string]int`
     7 |     a := map[string]int
     8 |     println(a + 10)
     9 |     println(10 + a)
diff --git a/vlib/v/checker/tests/any_int_float_ban_err.out b/vlib/v/checker/tests/any_int_float_ban_err.out
index b02cbead0e..624f2ef83b 100644
--- a/vlib/v/checker/tests/any_int_float_ban_err.out
+++ b/vlib/v/checker/tests/any_int_float_ban_err.out
@@ -1,41 +1,47 @@
-vlib/v/checker/tests/any_int_float_ban_err.vv:1:12: error: type `untyped int` doesn't exist
+vlib/v/checker/tests/any_int_float_ban_err.vv:1:12: error: type `any_int` doesn't exist
     1 | type Foo = any_int | any_float
       |            ~~~~~~~
     2 | type Fo2 = any_int
     3 |
-vlib/v/checker/tests/any_int_float_ban_err.vv:2:1: error: type `untyped int` doesn't exist
+vlib/v/checker/tests/any_int_float_ban_err.vv:2:1: error: type `any_int` doesn't exist
     1 | type Foo = any_int | any_float
     2 | type Fo2 = any_int
       | ~~~~~~~~
     3 | 
     4 | struct Int {
-vlib/v/checker/tests/any_int_float_ban_err.vv:5:7: error: unknown type `untyped int`.
-Did you mean `int`?
+vlib/v/checker/tests/any_int_float_ban_err.vv:5:7: error: unknown type `any_int`.
+Did you mean `any_float`?
     3 | 
     4 | struct Int {
     5 |     i any_int
       |       ~~~~~~~
     6 |     f any_float
     7 | }
-vlib/v/checker/tests/any_int_float_ban_err.vv:6:7: error: unknown type `untyped float`.
-Did you mean `f64`?
+vlib/v/checker/tests/any_int_float_ban_err.vv:6:7: error: unknown type `any_float`.
+Did you mean `any_int`?
     4 | struct Int {
     5 |     i any_int
     6 |     f any_float
       |       ~~~~~~~~~
     7 | }
     8 |
-vlib/v/checker/tests/any_int_float_ban_err.vv:9:1: error: unknown type `untyped int`
+vlib/v/checker/tests/any_int_float_ban_err.vv:9:1: error: unknown type `any_int`
     7 | }
     8 | 
     9 | fn foo(i any_int) any_int {
       | ~~~~~~~~~~~~~~~~~~~~~~~~~
    10 |     return i
    11 | }
-vlib/v/checker/tests/any_int_float_ban_err.vv:13:1: error: unknown type `untyped int`
+vlib/v/checker/tests/any_int_float_ban_err.vv:13:1: error: unknown type `any_int`
    11 | }
    12 | 
    13 | fn foo2() any_int {
       | ~~~~~~~~~~~~~~~~~
    14 |     return 1
    15 | }
+vlib/v/checker/tests/any_int_float_ban_err.vv:14:12: error: cannot use `untyped int` as type `any_int` in return argument
+   12 | 
+   13 | fn foo2() any_int {
+   14 |     return 1
+      |            ^
+   15 | }
diff --git a/vlib/v/checker/tests/bit_op_wrong_left_type_err.out b/vlib/v/checker/tests/bit_op_wrong_left_type_err.out
index d01db5ff5e..1c327322b8 100644
--- a/vlib/v/checker/tests/bit_op_wrong_left_type_err.out
+++ b/vlib/v/checker/tests/bit_op_wrong_left_type_err.out
@@ -1,4 +1,4 @@
-vlib/v/checker/tests/bit_op_wrong_left_type_err.vv:2:10: error: left type of `&` cannot be non-integer type any_float
+vlib/v/checker/tests/bit_op_wrong_left_type_err.vv:2:10: error: left type of `&` cannot be non-integer type untyped float
     1 | fn main() {
     2 |     println(0.5 & 1)
       |             ~~~
diff --git a/vlib/v/checker/tests/bit_op_wrong_right_type_err.out b/vlib/v/checker/tests/bit_op_wrong_right_type_err.out
index 681fc9c2b3..be0a7f0667 100644
--- a/vlib/v/checker/tests/bit_op_wrong_right_type_err.out
+++ b/vlib/v/checker/tests/bit_op_wrong_right_type_err.out
@@ -1,4 +1,4 @@
-vlib/v/checker/tests/bit_op_wrong_right_type_err.vv:2:14: error: right type of `|` cannot be non-integer type any_float
+vlib/v/checker/tests/bit_op_wrong_right_type_err.vv:2:14: error: right type of `|` cannot be non-integer type untyped float
     1 | fn main() {
     2 |     println(1 | 0.5)
       |                 ~~~
diff --git a/vlib/v/checker/tests/cannot_cast_to_struct.out b/vlib/v/checker/tests/cannot_cast_to_struct.out
index 69a29eb95f..31ead0fa8e 100644
--- a/vlib/v/checker/tests/cannot_cast_to_struct.out
+++ b/vlib/v/checker/tests/cannot_cast_to_struct.out
@@ -1,5 +1,5 @@
 vlib/v/checker/tests/cannot_cast_to_struct.vv:10:7: error: cannot convert struct `Abc` to struct `Test`
-    8 |
+    8 | 
     9 | fn main() {
    10 |     _ := Test(Abc{})
       |          ~~~~~~~~~~~
@@ -12,7 +12,7 @@ vlib/v/checker/tests/cannot_cast_to_struct.vv:12:6: error: cannot cast `Alphabet
       |         ~~~~~~~~
    13 |     _ = Xyz(5)
    14 |     s := Abc{}
-vlib/v/checker/tests/cannot_cast_to_struct.vv:13:6: error: cannot cast `untyped int` to struct
+vlib/v/checker/tests/cannot_cast_to_struct.vv:13:6: error: cannot cast `any_int` to struct
    11 |     sum := Alphabet(Xyz{})
    12 |     _ = Xyz(sum)
    13 |     _ = Xyz(5)
@@ -24,4 +24,4 @@ vlib/v/checker/tests/cannot_cast_to_struct.vv:15:6: error: cannot cast `&Abc` to
    14 |     s := Abc{}
    15 |     _ = Xyz(&s)
       |         ~~~~~~~
-   16 | }
\ No newline at end of file
+   16 | }
diff --git a/vlib/v/checker/tests/cast_string_err.out b/vlib/v/checker/tests/cast_string_err.out
index 3ae66dd5bd..efd606a1a7 100644
--- a/vlib/v/checker/tests/cast_string_err.out
+++ b/vlib/v/checker/tests/cast_string_err.out
@@ -1,6 +1,6 @@
-vlib/v/checker/tests/cast_string_err.vv:2:7: error: cannot cast type `untyped int` to string, use `x.str()` instead
+vlib/v/checker/tests/cast_string_err.vv:2:7: error: cannot cast type `any_int` to string, use `x.str()` instead
     1 | fn main() {
     2 |     a := string(1)
       |          ~~~~~~~~~
     3 |     println(a)
-    4 | }
\ No newline at end of file
+    4 | }
diff --git a/vlib/v/checker/tests/div_op_wrong_type_err.out b/vlib/v/checker/tests/div_op_wrong_type_err.out
index 4e1356b916..f50520e761 100644
--- a/vlib/v/checker/tests/div_op_wrong_type_err.out
+++ b/vlib/v/checker/tests/div_op_wrong_type_err.out
@@ -1,39 +1,39 @@
-vlib/v/checker/tests/div_op_wrong_type_err.vv:3:13: error: mismatched types `Aaa` and `untyped int`
+vlib/v/checker/tests/div_op_wrong_type_err.vv:3:13: error: mismatched types `Aaa` and `any_int`
     1 | struct Aaa{}
     2 | fn main() {
     3 |     println(Aaa{} / 10)
       |             ~~~~~
     4 |     println(10 / Aaa{})
     5 |     println([1,2,3] / 10)
-vlib/v/checker/tests/div_op_wrong_type_err.vv:4:18: error: mismatched types `untyped int` and `Aaa`
+vlib/v/checker/tests/div_op_wrong_type_err.vv:4:18: error: mismatched types `any_int` and `Aaa`
     2 | fn main() {
     3 |     println(Aaa{} / 10)
     4 |     println(10 / Aaa{})
       |                  ~~~~~
     5 |     println([1,2,3] / 10)
     6 |     println(10 / [1,2,3])
-vlib/v/checker/tests/div_op_wrong_type_err.vv:5:13: error: mismatched types `[]int` and `untyped int`
+vlib/v/checker/tests/div_op_wrong_type_err.vv:5:13: error: mismatched types `[]int` and `any_int`
     3 |     println(Aaa{} / 10)
     4 |     println(10 / Aaa{})
     5 |     println([1,2,3] / 10)
       |             ~~~~~~~
     6 |     println(10 / [1,2,3])
     7 |     a := map[string]int
-vlib/v/checker/tests/div_op_wrong_type_err.vv:6:18: error: mismatched types `untyped int` and `[]int`
+vlib/v/checker/tests/div_op_wrong_type_err.vv:6:18: error: mismatched types `any_int` and `[]int`
     4 |     println(10 / Aaa{})
     5 |     println([1,2,3] / 10)
     6 |     println(10 / [1,2,3])
       |                  ~~~~~~~
     7 |     a := map[string]int
     8 |     println(a / 10)
-vlib/v/checker/tests/div_op_wrong_type_err.vv:8:13: error: mismatched types `map[string]int` and `untyped int`
+vlib/v/checker/tests/div_op_wrong_type_err.vv:8:13: error: mismatched types `map[string]int` and `any_int`
     6 |     println(10 / [1,2,3])
     7 |     a := map[string]int
     8 |     println(a / 10)
       |             ^
     9 |     println(10 / a)
    10 | }
-vlib/v/checker/tests/div_op_wrong_type_err.vv:9:18: error: mismatched types `untyped int` and `map[string]int`
+vlib/v/checker/tests/div_op_wrong_type_err.vv:9:18: error: mismatched types `any_int` and `map[string]int`
     7 |     a := map[string]int
     8 |     println(a / 10)
     9 |     println(10 / a)
diff --git a/vlib/v/checker/tests/fn_var.out b/vlib/v/checker/tests/fn_var.out
index ef231cfaad..6d244f9a4e 100644
--- a/vlib/v/checker/tests/fn_var.out
+++ b/vlib/v/checker/tests/fn_var.out
@@ -1,4 +1,4 @@
-vlib/v/checker/tests/fn_var.vv:2:5: error: cannot assign to `f`: expected `fn (int) byte`, not `untyped int`
+vlib/v/checker/tests/fn_var.vv:2:5: error: cannot assign to `f`: expected `fn (int) byte`, not `any_int`
     1 | mut f := fn(i int) byte {}
     2 | f = 4
       |     ^
diff --git a/vlib/v/checker/tests/for_in_index_type.out b/vlib/v/checker/tests/for_in_index_type.out
index d118ab4861..b75614e626 100644
--- a/vlib/v/checker/tests/for_in_index_type.out
+++ b/vlib/v/checker/tests/for_in_index_type.out
@@ -1,4 +1,4 @@
-vlib/v/checker/tests/for_in_index_type.vv:2:11: error: for in: cannot index `untyped int` 
+vlib/v/checker/tests/for_in_index_type.vv:2:11: error: for in: cannot index `any_int`
     1 | fn main() {
     2 |     for a in 52 {
       |              ~~
diff --git a/vlib/v/checker/tests/if_expr_mismatch.out b/vlib/v/checker/tests/if_expr_mismatch.out
index 926a740c13..aa9b68d302 100644
--- a/vlib/v/checker/tests/if_expr_mismatch.out
+++ b/vlib/v/checker/tests/if_expr_mismatch.out
@@ -1,4 +1,4 @@
-vlib/v/checker/tests/if_expr_mismatch.vv:2:7: error: mismatched types `string` and `untyped int` 
+vlib/v/checker/tests/if_expr_mismatch.vv:2:7: error: mismatched types `string` and `any_int`
     1 | fn main() {
     2 |     s := if true { '12' } else { 12 }
       |          ~~
diff --git a/vlib/v/checker/tests/in_mismatch_type.out b/vlib/v/checker/tests/in_mismatch_type.out
index 651968a02e..8c02b4376c 100644
--- a/vlib/v/checker/tests/in_mismatch_type.out
+++ b/vlib/v/checker/tests/in_mismatch_type.out
@@ -1,18 +1,18 @@
-vlib/v/checker/tests/in_mismatch_type.vv:10:7: error: left operand to `in` does not match the array element type: expected `string`, not `untyped int`
+vlib/v/checker/tests/in_mismatch_type.vv:10:7: error: left operand to `in` does not match the array element type: expected `string`, not `any_int`
     8 |     }
     9 |     s := 'abcd'
    10 |     if 1 in a_s {
       |          ~~
    11 |         println('ok')
    12 |     }
-vlib/v/checker/tests/in_mismatch_type.vv:13:7: error: left operand to `in` does not match the map key type: expected `string`, not `untyped int`
+vlib/v/checker/tests/in_mismatch_type.vv:13:7: error: left operand to `in` does not match the map key type: expected `string`, not `any_int`
    11 |         println('ok')
    12 |     }
    13 |     if 2 in m {
       |          ~~
    14 |         println('yeah')
    15 |     }
-vlib/v/checker/tests/in_mismatch_type.vv:16:7: error: left operand to `in` does not match: expected `string`, not `untyped int`
+vlib/v/checker/tests/in_mismatch_type.vv:16:7: error: left operand to `in` does not match: expected `string`, not `any_int`
    14 |         println('yeah')
    15 |     }
    16 |     if 3 in s {
@@ -54,7 +54,7 @@ vlib/v/checker/tests/in_mismatch_type.vv:31:9: error: left operand to `in` does
       |            ~~
    32 |         println('all right')
    33 |     }
-vlib/v/checker/tests/in_mismatch_type.vv:34:7: error: left operand to `!in` does not match the array element type: expected `string`, not `untyped int`
+vlib/v/checker/tests/in_mismatch_type.vv:34:7: error: left operand to `!in` does not match the array element type: expected `string`, not `any_int`
    32 |         println('all right')
    33 |     }
    34 |     if 1 !in a_s {
@@ -68,7 +68,7 @@ vlib/v/checker/tests/in_mismatch_type.vv:37:9: error: left operand to `!in` does
       |            ~~~
    38 |         println('good')
    39 |     }
-vlib/v/checker/tests/in_mismatch_type.vv:41:7: error: left operand to `!in` does not match the map key type: expected `string`, not `untyped int`
+vlib/v/checker/tests/in_mismatch_type.vv:41:7: error: left operand to `!in` does not match the map key type: expected `string`, not `any_int`
    39 |     }
    40 | 
    41 |     if 5 !in m {
diff --git a/vlib/v/checker/tests/is_type_not_exist.out b/vlib/v/checker/tests/is_type_not_exist.out
index 7751f2e567..2d0bc7421c 100644
--- a/vlib/v/checker/tests/is_type_not_exist.out
+++ b/vlib/v/checker/tests/is_type_not_exist.out
@@ -1,14 +1,14 @@
-vlib/v/checker/tests/is_type_not_exist.vv:4:25: error: cannot use `untyped int` as `Integer` in argument 1 to `fn_with_sum_type_param`
-    2 |
+vlib/v/checker/tests/is_type_not_exist.vv:4:25: error: cannot use `any_int` as `Integer` in argument 1 to `fn_with_sum_type_param`
+    2 | 
     3 | fn main() {
     4 |     fn_with_sum_type_param(1)
       |                            ^
     5 | }
     6 |
 vlib/v/checker/tests/is_type_not_exist.vv:8:10: error: is: type `SomethingThatDontExist` does not exist
-    6 |
+    6 | 
     7 | fn fn_with_sum_type_param(i Integer) {
     8 |     if i is SomethingThatDontExist {
       |             ~~~~~~~~~~~~~~~~~~~~~~
     9 |         println('It should fail !')
-   10 |     }
\ No newline at end of file
+   10 |     }
diff --git a/vlib/v/checker/tests/match_undefined_cond.out b/vlib/v/checker/tests/match_undefined_cond.out
index 016712684d..2800eb3715 100644
--- a/vlib/v/checker/tests/match_undefined_cond.out
+++ b/vlib/v/checker/tests/match_undefined_cond.out
@@ -1,18 +1,18 @@
 vlib/v/checker/tests/match_undefined_cond.vv:4:15: error: undefined ident: `Asd`
-    2 |
+    2 | 
     3 | fn main() {
     4 |     res := match Asd {
       |                  ~~~
     5 |         1 { 'foo' }
     6 |         2 { 'test' }
-vlib/v/checker/tests/match_undefined_cond.vv:5:3: error: cannot match `untyped int` with `void` condition
+vlib/v/checker/tests/match_undefined_cond.vv:5:3: error: cannot match `any_int` with `void` condition
     3 | fn main() {
     4 |     res := match Asd {
     5 |         1 { 'foo' }
       |         ^
     6 |         2 { 'test' }
     7 |         else { '' }
-vlib/v/checker/tests/match_undefined_cond.vv:6:3: error: cannot match `untyped int` with `void` condition
+vlib/v/checker/tests/match_undefined_cond.vv:6:3: error: cannot match `any_int` with `void` condition
     4 |     res := match Asd {
     5 |         1 { 'foo' }
     6 |         2 { 'test' }
diff --git a/vlib/v/checker/tests/minus_op_wrong_type_err.out b/vlib/v/checker/tests/minus_op_wrong_type_err.out
index b255d8d76d..5bb8cb4ba4 100644
--- a/vlib/v/checker/tests/minus_op_wrong_type_err.out
+++ b/vlib/v/checker/tests/minus_op_wrong_type_err.out
@@ -1,39 +1,39 @@
-vlib/v/checker/tests/minus_op_wrong_type_err.vv:3:13: error: mismatched types `Aaa` and `untyped int`
+vlib/v/checker/tests/minus_op_wrong_type_err.vv:3:13: error: mismatched types `Aaa` and `any_int`
     1 | struct Aaa{}
     2 | fn main() {
     3 |     println(Aaa{} - 10)
       |             ~~~~~
     4 |     println(10 - Aaa{})
     5 |     println([1,2,3] - 10)
-vlib/v/checker/tests/minus_op_wrong_type_err.vv:4:18: error: mismatched types `untyped int` and `Aaa`
+vlib/v/checker/tests/minus_op_wrong_type_err.vv:4:18: error: mismatched types `any_int` and `Aaa`
     2 | fn main() {
     3 |     println(Aaa{} - 10)
     4 |     println(10 - Aaa{})
       |                  ~~~~~
     5 |     println([1,2,3] - 10)
     6 |     println(10 - [1,2,3])
-vlib/v/checker/tests/minus_op_wrong_type_err.vv:5:13: error: mismatched types `[]int` and `untyped int`
+vlib/v/checker/tests/minus_op_wrong_type_err.vv:5:13: error: mismatched types `[]int` and `any_int`
     3 |     println(Aaa{} - 10)
     4 |     println(10 - Aaa{})
     5 |     println([1,2,3] - 10)
       |             ~~~~~~~
     6 |     println(10 - [1,2,3])
     7 |     a := map[string]int
-vlib/v/checker/tests/minus_op_wrong_type_err.vv:6:18: error: mismatched types `untyped int` and `[]int`
+vlib/v/checker/tests/minus_op_wrong_type_err.vv:6:18: error: mismatched types `any_int` and `[]int`
     4 |     println(10 - Aaa{})
     5 |     println([1,2,3] - 10)
     6 |     println(10 - [1,2,3])
       |                  ~~~~~~~
     7 |     a := map[string]int
     8 |     println(a - 10)
-vlib/v/checker/tests/minus_op_wrong_type_err.vv:8:13: error: mismatched types `map[string]int` and `untyped int`
+vlib/v/checker/tests/minus_op_wrong_type_err.vv:8:13: error: mismatched types `map[string]int` and `any_int`
     6 |     println(10 - [1,2,3])
     7 |     a := map[string]int
     8 |     println(a - 10)
       |             ^
     9 |     println(10 - a)
    10 | }
-vlib/v/checker/tests/minus_op_wrong_type_err.vv:9:18: error: mismatched types `untyped int` and `map[string]int`
+vlib/v/checker/tests/minus_op_wrong_type_err.vv:9:18: error: mismatched types `any_int` and `map[string]int`
     7 |     a := map[string]int
     8 |     println(a - 10)
     9 |     println(10 - a)
diff --git a/vlib/v/checker/tests/mod_op_wrong_type_err.out b/vlib/v/checker/tests/mod_op_wrong_type_err.out
index 8c8d9ed630..d11eb2800f 100644
--- a/vlib/v/checker/tests/mod_op_wrong_type_err.out
+++ b/vlib/v/checker/tests/mod_op_wrong_type_err.out
@@ -12,42 +12,42 @@ vlib/v/checker/tests/mod_op_wrong_type_err.vv:4:14: error: float modulo not allo
       |                 ~~~
     5 |     println([1,2,3] % 1)
     6 |     println(1 % [1,2,3])
-vlib/v/checker/tests/mod_op_wrong_type_err.vv:5:10: error: mismatched types `[]int` and `untyped int`
+vlib/v/checker/tests/mod_op_wrong_type_err.vv:5:10: error: mismatched types `[]int` and `any_int`
     3 |     println(0.5 % 1)
     4 |     println(1 % 0.5)
     5 |     println([1,2,3] % 1)
       |             ~~~~~~~
     6 |     println(1 % [1,2,3])
     7 |     a := Aaa{}
-vlib/v/checker/tests/mod_op_wrong_type_err.vv:6:14: error: mismatched types `untyped int` and `[]int`
+vlib/v/checker/tests/mod_op_wrong_type_err.vv:6:14: error: mismatched types `any_int` and `[]int`
     4 |     println(1 % 0.5)
     5 |     println([1,2,3] % 1)
     6 |     println(1 % [1,2,3])
       |                 ~~~~~~~
     7 |     a := Aaa{}
     8 |     println(a % 1)
-vlib/v/checker/tests/mod_op_wrong_type_err.vv:8:10: error: mismatched types `Aaa` and `untyped int`
+vlib/v/checker/tests/mod_op_wrong_type_err.vv:8:10: error: mismatched types `Aaa` and `any_int`
     6 |     println(1 % [1,2,3])
     7 |     a := Aaa{}
     8 |     println(a % 1)
       |             ^
     9 |     println(1 % a)
    10 |     b := map[string]int
-vlib/v/checker/tests/mod_op_wrong_type_err.vv:9:14: error: mismatched types `untyped int` and `Aaa`
+vlib/v/checker/tests/mod_op_wrong_type_err.vv:9:14: error: mismatched types `any_int` and `Aaa`
     7 |     a := Aaa{}
     8 |     println(a % 1)
     9 |     println(1 % a)
       |                 ^
    10 |     b := map[string]int
    11 |     println(b % 1)
-vlib/v/checker/tests/mod_op_wrong_type_err.vv:11:10: error: mismatched types `map[string]int` and `untyped int`
+vlib/v/checker/tests/mod_op_wrong_type_err.vv:11:10: error: mismatched types `map[string]int` and `any_int`
     9 |     println(1 % a)
    10 |     b := map[string]int
    11 |     println(b % 1)
       |             ^
    12 |     println(1 % b)
    13 | }
-vlib/v/checker/tests/mod_op_wrong_type_err.vv:12:14: error: mismatched types `untyped int` and `map[string]int`
+vlib/v/checker/tests/mod_op_wrong_type_err.vv:12:14: error: mismatched types `any_int` and `map[string]int`
    10 |     b := map[string]int
    11 |     println(b % 1)
    12 |     println(1 % b)
diff --git a/vlib/v/checker/tests/mul_op_wrong_type_err.out b/vlib/v/checker/tests/mul_op_wrong_type_err.out
index 654e9e9bcc..db7194c143 100644
--- a/vlib/v/checker/tests/mul_op_wrong_type_err.out
+++ b/vlib/v/checker/tests/mul_op_wrong_type_err.out
@@ -1,39 +1,39 @@
-vlib/v/checker/tests/mul_op_wrong_type_err.vv:5:13: error: mismatched types `Aaa` and `untyped int`
+vlib/v/checker/tests/mul_op_wrong_type_err.vv:5:13: error: mismatched types `Aaa` and `any_int`
     3 | struct Aaa{}
     4 | fn main() {
     5 |     println(Aaa{} * 10)
       |             ~~~~~
     6 |     println(10 * Aaa{})
     7 |     println([1,2,3] * 10)
-vlib/v/checker/tests/mul_op_wrong_type_err.vv:6:18: error: mismatched types `untyped int` and `Aaa`
+vlib/v/checker/tests/mul_op_wrong_type_err.vv:6:18: error: mismatched types `any_int` and `Aaa`
     4 | fn main() {
     5 |     println(Aaa{} * 10)
     6 |     println(10 * Aaa{})
       |                  ~~~~~
     7 |     println([1,2,3] * 10)
     8 |     println(10 * [1,2,3])
-vlib/v/checker/tests/mul_op_wrong_type_err.vv:7:13: error: mismatched types `[]int` and `untyped int`
+vlib/v/checker/tests/mul_op_wrong_type_err.vv:7:13: error: mismatched types `[]int` and `any_int`
     5 |     println(Aaa{} * 10)
     6 |     println(10 * Aaa{})
     7 |     println([1,2,3] * 10)
       |             ~~~~~~~
     8 |     println(10 * [1,2,3])
     9 |     a := map[string]int
-vlib/v/checker/tests/mul_op_wrong_type_err.vv:8:18: error: mismatched types `untyped int` and `[]int`
+vlib/v/checker/tests/mul_op_wrong_type_err.vv:8:18: error: mismatched types `any_int` and `[]int`
     6 |     println(10 * Aaa{})
     7 |     println([1,2,3] * 10)
     8 |     println(10 * [1,2,3])
       |                  ~~~~~~~
     9 |     a := map[string]int
    10 |     println(a * 10)
-vlib/v/checker/tests/mul_op_wrong_type_err.vv:10:13: error: mismatched types `map[string]int` and `untyped int`
+vlib/v/checker/tests/mul_op_wrong_type_err.vv:10:13: error: mismatched types `map[string]int` and `any_int`
     8 |     println(10 * [1,2,3])
     9 |     a := map[string]int
    10 |     println(a * 10)
       |             ^
    11 |     println(10 * a)
    12 |     c1 := cmplx.complex(1,-2)
-vlib/v/checker/tests/mul_op_wrong_type_err.vv:11:18: error: mismatched types `untyped int` and `map[string]int`
+vlib/v/checker/tests/mul_op_wrong_type_err.vv:11:18: error: mismatched types `any_int` and `map[string]int`
     9 |     a := map[string]int
    10 |     println(a * 10)
    11 |     println(10 * a)
diff --git a/vlib/v/checker/tests/optional_or_block_returns_value_of_incompatible_type.out b/vlib/v/checker/tests/optional_or_block_returns_value_of_incompatible_type.out
index 0c71a32091..c8ced1d94d 100644
--- a/vlib/v/checker/tests/optional_or_block_returns_value_of_incompatible_type.out
+++ b/vlib/v/checker/tests/optional_or_block_returns_value_of_incompatible_type.out
@@ -1,4 +1,4 @@
-vlib/v/checker/tests/optional_or_block_returns_value_of_incompatible_type.vv:13:3: error: the default expression type in the `or` block should be `string`, instead you gave a value of type `untyped int`
+vlib/v/checker/tests/optional_or_block_returns_value_of_incompatible_type.vv:13:3: error: the default expression type in the `or` block should be `string`, instead you gave a value of type `any_int`
    11 |         // must be of the same type of the return
    12 |         // type of the `test_optional` function
    13 |         123
diff --git a/vlib/v/checker/tests/ptr_assign.out b/vlib/v/checker/tests/ptr_assign.out
index 4f1a66c744..a8675578c6 100644
--- a/vlib/v/checker/tests/ptr_assign.out
+++ b/vlib/v/checker/tests/ptr_assign.out
@@ -1,4 +1,4 @@
-vlib/v/checker/tests/ptr_assign.vv:3:5: error: cannot assign to `p`: expected `&int`, not `untyped int`
+vlib/v/checker/tests/ptr_assign.vv:3:5: error: cannot assign to `p`: expected `&int`, not `any_int`
     1 | mut v := 43
     2 | mut p := &v
     3 | p = 4
diff --git a/vlib/v/checker/tests/rshift_op_wrong_right_type_err.out b/vlib/v/checker/tests/rshift_op_wrong_right_type_err.out
index 2981c21b54..e99ae9b708 100644
--- a/vlib/v/checker/tests/rshift_op_wrong_right_type_err.out
+++ b/vlib/v/checker/tests/rshift_op_wrong_right_type_err.out
@@ -1,4 +1,4 @@
-vlib/v/checker/tests/rshift_op_wrong_right_type_err.vv:2:15: error: cannot shift non-integer type any_float into type any_int
+vlib/v/checker/tests/rshift_op_wrong_right_type_err.vv:2:15: error: cannot shift non-integer type untyped float into type untyped int
     1 | fn main() {
     2 |     println(1 >> 0.5)
       |                  ~~~
diff --git a/vlib/v/checker/tests/shift_op_wrong_right_type_err.out b/vlib/v/checker/tests/shift_op_wrong_right_type_err.out
index 6b8d0f8d24..91175b4675 100644
--- a/vlib/v/checker/tests/shift_op_wrong_right_type_err.out
+++ b/vlib/v/checker/tests/shift_op_wrong_right_type_err.out
@@ -1,4 +1,4 @@
-vlib/v/checker/tests/shift_op_wrong_right_type_err.vv:2:15: error: cannot shift non-integer type any_float into type any_int
+vlib/v/checker/tests/shift_op_wrong_right_type_err.vv:2:15: error: cannot shift non-integer type untyped float into type untyped int
     1 | fn main() {
     2 |     println(1 << 0.5)
       |                  ~~~