diff --git a/compiler/cheaders.v b/compiler/cheaders.v
index ddc8a5570f..b2c935c888 100644
--- a/compiler/cheaders.v
+++ b/compiler/cheaders.v
@@ -73,16 +73,13 @@ void pthread_mutex_unlock(HANDLE *m) {
 
 //================================== TYPEDEFS ================================*/
 
-typedef unsigned char byte;
-typedef unsigned int uint;
 typedef int64_t i64;
-typedef int32_t i32;
 typedef int16_t i16;
 typedef int8_t i8;
 typedef uint64_t u64;
 typedef uint32_t u32;
 typedef uint16_t u16;
-typedef uint8_t u8;
+typedef uint8_t byte;
 typedef uint32_t rune;
 typedef float f32;
 typedef double f64;
@@ -94,8 +91,6 @@ typedef struct map map;
 typedef array array_string;
 typedef array array_int;
 typedef array array_byte;
-typedef array array_uint;
-typedef array array_float;
 typedef array array_f32;
 typedef array array_f64;
 typedef map map_int;
diff --git a/compiler/parser.v b/compiler/parser.v
index edc3ba2d73..e874fb9b52 100644
--- a/compiler/parser.v
+++ b/compiler/parser.v
@@ -1619,8 +1619,8 @@ fn (p mut Parser) name_expr() string {
 					if orig_name == 'i32' {
 						println('`i32` alias was removed, use `int` instead')
 					}
-					if orig_name == 'u8' {
-						println('`u8` alias was removed, use `byte` instead')
+					if orig_name == 'byte' {
+						println('`byte` alias was removed, use `byte` instead')
 					}
 					p.error('undefined: `$orig_name`')
 				}
@@ -1949,7 +1949,7 @@ fn (p mut Parser) index_expr(typ_ string, fn_ph int) string {
 		if is_arr {
 			index_pos := p.cgen.cur_line.len
 			T := p.table.find_type(p.expression())
-			// Allows only i8-64 and u8-64 to be used when accessing an array
+			// Allows only i8-64 and byte-64 to be used when accessing an array
 			if T.parent != 'int' && T.parent != 'u32' {
 				p.check_types(T.name, 'int')
 			}
diff --git a/compiler/table.v b/compiler/table.v
index 639f306f58..177e139f53 100644
--- a/compiler/table.v
+++ b/compiler/table.v
@@ -758,7 +758,7 @@ fn (table &Table) cgen_name_type_pair(name, typ string) string {
 fn is_valid_int_const(val, typ string) bool {
 	x := val.int()
 	switch typ {
-	case 'u8': return 0 <= x && x <= math.MaxU8
+	case 'byte': return 0 <= x && x <= math.MaxU8
 	case 'u16': return 0 <= x && x <= math.MaxU16
 	//case 'u32': return 0 <= x && x <= math.MaxU32
 	//case 'u64': return 0 <= x && x <= math.MaxU64
diff --git a/compiler/tests/msvc_test.v b/compiler/tests/msvc_test.v
index 13c811d257..45e3bcaaae 100644
--- a/compiler/tests/msvc_test.v
+++ b/compiler/tests/msvc_test.v
@@ -46,4 +46,4 @@ fn test_flag_parsing() {
 	for i, f in flags {
 		assert f == result[i] 
 	}
-}
\ No newline at end of file
+}
diff --git a/vlib/builtin/int.v b/vlib/builtin/int.v
index b8ebfe21a3..35ba7a60d2 100644
--- a/vlib/builtin/int.v
+++ b/vlib/builtin/int.v
@@ -81,20 +81,20 @@ pub fn (nn u32) str() string {
 }
 
 /*
-pub fn (nn u8) str() string {
+pub fn (nn byte) str() string {
 	 mut n := nn
-	if n == u8(0) {
+	if n == byte(0) {
 		return '0'
 	}
 	max := 5
 	mut buf := malloc(max)
 	mut len := 0
 	// Fill the string from the end
-	for n > u8(0) {
-		d := n % u8(10)
-		buf[max - len - 1] = d + u8(`0`)
+	for n > byte(0) {
+		d := n % byte(10)
+		buf[max - len - 1] = d + byte(`0`)
 		len++
-		n = n / u8(10)
+		n = n / byte(10)
 	}
 	return tos(buf + max - len, len)
 }
diff --git a/vlib/builtin/int_test.v b/vlib/builtin/int_test.v
index 179776ce16..85059e4f90 100644
--- a/vlib/builtin/int_test.v
+++ b/vlib/builtin/int_test.v
@@ -20,8 +20,8 @@ fn test_str_methods() {
 	assert i64(1).str() == '1'
 	assert i64(-1).str() == '-1'
 
-	assert u8(1).str() == '1'
-	assert u8(-1).str() == '255'
+	assert byte(1).str() == '1'
+	assert byte(-1).str() == '255'
 	assert u16(1).str() == '1'
 	assert u16(-1).str() == '65535'
 	assert u32(1).str() == '1'
diff --git a/vlib/builtin/string_test.v b/vlib/builtin/string_test.v
index 7fa15c51dc..505a45b2aa 100644
--- a/vlib/builtin/string_test.v
+++ b/vlib/builtin/string_test.v
@@ -417,4 +417,4 @@ fn test_for_loop_two() {
 	for i, c in s {
 		assert c == s[i]
 	}
-}
\ No newline at end of file
+}
diff --git a/vlib/crypto/aes/block_generic.v b/vlib/crypto/aes/block_generic.v
index 8a5c0e7c75..18f8af2034 100644
--- a/vlib/crypto/aes/block_generic.v
+++ b/vlib/crypto/aes/block_generic.v
@@ -64,10 +64,10 @@ fn encrypt_block_generic(xk []u32, dst, src []byte) {
 	mut t2 := u32(0)
 	mut t3 := u32(0)
 	for r := 0; r < nr; r++ {
-		t0 = xk[u32(k+0)] ^ u32(Te0[u8(s0>>u32(24))]) ^ u32(Te1[u8(s1>>u32(16))]) ^ u32(Te2[u8(s2>>u32(8))]) ^ u32(Te3[u8(s3)])
-		t1 = xk[u32(k+1)] ^ u32(Te0[u8(s1>>u32(24))]) ^ u32(Te1[u8(s2>>u32(16))]) ^ u32(Te2[u8(s3>>u32(8))]) ^ u32(Te3[u8(s0)])
-		t2 = xk[u32(k+2)] ^ u32(Te0[u8(s2>>u32(24))]) ^ u32(Te1[u8(s3>>u32(16))]) ^ u32(Te2[u8(s0>>u32(8))]) ^ u32(Te3[u8(s1)])
-		t3 = xk[u32(k+3)] ^ u32(Te0[u8(s3>>u32(24))]) ^ u32(Te1[u8(s0>>u32(16))]) ^ u32(Te2[u8(s1>>u32(8))]) ^ u32(Te3[u8(s2)])
+		t0 = xk[u32(k+0)] ^ u32(Te0[byte(s0>>u32(24))]) ^ u32(Te1[byte(s1>>u32(16))]) ^ u32(Te2[byte(s2>>u32(8))]) ^ u32(Te3[byte(s3)])
+		t1 = xk[u32(k+1)] ^ u32(Te0[byte(s1>>u32(24))]) ^ u32(Te1[byte(s2>>u32(16))]) ^ u32(Te2[byte(s3>>u32(8))]) ^ u32(Te3[byte(s0)])
+		t2 = xk[u32(k+2)] ^ u32(Te0[byte(s2>>u32(24))]) ^ u32(Te1[byte(s3>>u32(16))]) ^ u32(Te2[byte(s0>>u32(8))]) ^ u32(Te3[byte(s1)])
+		t3 = xk[u32(k+3)] ^ u32(Te0[byte(s3>>u32(24))]) ^ u32(Te1[byte(s0>>u32(16))]) ^ u32(Te2[byte(s1>>u32(8))]) ^ u32(Te3[byte(s2)])
 		k += 4
 		s0 = t0
 		s1 = t1
@@ -117,10 +117,10 @@ fn decrypt_block_generic(xk []u32, dst, src []byte) {
 	mut t3 := u32(0)
 	for r := 0; r < nr; r++ {
 		// println('### 1')
-		t0 = xk[u32(k+0)] ^ u32(Td0[u8(s0>>u32(24))]) ^ u32(Td1[u8(s3>>u32(16))]) ^ u32(Td2[u8(s2>>u32(8))]) ^ u32(Td3[u8(s1)])
-		t1 = xk[u32(k+1)] ^ u32(Td0[u8(s1>>u32(24))]) ^ u32(Td1[u8(s0>>u32(16))]) ^ u32(Td2[u8(s3>>u32(8))]) ^ u32(Td3[u8(s2)])
-		t2 = xk[u32(k+2)] ^ u32(Td0[u8(s2>>u32(24))]) ^ u32(Td1[u8(s1>>u32(16))]) ^ u32(Td2[u8(s0>>u32(8))]) ^ u32(Td3[u8(s3)])
-		t3 = xk[u32(k+3)] ^ u32(Td0[u8(s3>>u32(24))]) ^ u32(Td1[u8(s2>>u32(16))]) ^ u32(Td2[u8(s1>>u32(8))]) ^ u32(Td3[u8(s0)])
+		t0 = xk[u32(k+0)] ^ u32(Td0[byte(s0>>u32(24))]) ^ u32(Td1[byte(s3>>u32(16))]) ^ u32(Td2[byte(s2>>u32(8))]) ^ u32(Td3[byte(s1)])
+		t1 = xk[u32(k+1)] ^ u32(Td0[byte(s1>>u32(24))]) ^ u32(Td1[byte(s0>>u32(16))]) ^ u32(Td2[byte(s3>>u32(8))]) ^ u32(Td3[byte(s2)])
+		t2 = xk[u32(k+2)] ^ u32(Td0[byte(s2>>u32(24))]) ^ u32(Td1[byte(s1>>u32(16))]) ^ u32(Td2[byte(s0>>u32(8))]) ^ u32(Td3[byte(s3)])
+		t3 = xk[u32(k+3)] ^ u32(Td0[byte(s3>>u32(24))]) ^ u32(Td1[byte(s2>>u32(16))]) ^ u32(Td2[byte(s1>>u32(8))]) ^ u32(Td3[byte(s0)])
 		// println('### 1 end')
 		k += 4
 		s0 = t0
diff --git a/vlib/crypto/rc4/rc4.v b/vlib/crypto/rc4/rc4.v
index a8bef7cb40..4ebfd4a8e7 100644
--- a/vlib/crypto/rc4/rc4.v
+++ b/vlib/crypto/rc4/rc4.v
@@ -19,8 +19,8 @@ import crypto.internal.subtle
 struct Cipher {
 mut:
 	s []u32
-	i u8
-	j u8
+	i byte
+	j byte
 }
 
 // new_cipher creates and returns a new Cipher. The key argument should be the
@@ -35,9 +35,9 @@ pub fn new_cipher(key []byte) ?Cipher {
 	for i := 0; i < 256; i++ {
 		c.s[i] = u32(i)
 	}
-	mut j := u8(0)
+	mut j := byte(0)
 	for i := 0; i < 256; i++ {
-		j += u8(c.s[i]) + u8(key[i%key.len])
+		j += byte(c.s[i]) + byte(key[i%key.len])
 		tmp := c.s[i]
 		c.s[i] = c.s[j]
 		c.s[j] = tmp
@@ -53,8 +53,8 @@ pub fn (c mut Cipher) reset() {
 	for i in c.s {
 		c.s[i] = u32(0)
 	}
-	c.i = u8(0)
-	c.j = u8(0)
+	c.i = byte(0)
+	c.j = byte(0)
 }
 
 // xor_key_stream sets dst to the result of XORing src with the key stream.
@@ -71,13 +71,13 @@ pub fn (c mut Cipher) xor_key_stream(dst mut []byte, src []byte) {
 	_ := dst[src.len-1]
 	*dst = dst.left(src.len) // eliminate bounds check from loop
 	for k, v in src {
-		i += u8(1)
+		i += byte(1)
 		x := c.s[i]
-		j += u8(x)
+		j += byte(x)
 		y := c.s[j]
 		c.s[i] = y
 		c.s[j] = x
-		dst[k] = v ^ byte(c.s[u8(x+y)])
+		dst[k] = v ^ byte(c.s[byte(x+y)])
 	}
 	c.i = i
 	c.j = j
diff --git a/vlib/math/bits/bits.v b/vlib/math/bits/bits.v
index 85e07aba83..d25d9c9a4f 100644
--- a/vlib/math/bits/bits.v
+++ b/vlib/math/bits/bits.v
@@ -10,10 +10,10 @@ module bits
 // To rotate x right by k bits, call rotate_left_8(x, -k).
 //
 // This function's execution time does not depend on the inputs.
-pub fn rotate_left_8(x u8, k int) u8 {
-	n := u8(8)
-	s := u8(k) & u8(n - u8(1))
-	return u8((x<<s) | (x>>(n-s)))
+pub fn rotate_left_8(x byte, k int) byte {
+	n := byte(8)
+	s := byte(k) & byte(n - byte(1))
+	return byte((x<<s) | (x>>(n-s)))
 }
 
 // rotate_left_16 returns the value of x rotated left by (k mod 16) bits.
diff --git a/vlib/term/colors.v b/vlib/term/colors.v
index e5ff44d894..b382ffd277 100644
--- a/vlib/term/colors.v
+++ b/vlib/term/colors.v
@@ -200,4 +200,4 @@ pub fn yellow(msg string) string {
 
 pub fn bright_yellow(msg string) string {
 	return format(msg, '93', '39')
-}
\ No newline at end of file
+}
diff --git a/vlib/term/colors_nix.v b/vlib/term/colors_nix.v
index ce77340f24..efbc5313ec 100644
--- a/vlib/term/colors_nix.v
+++ b/vlib/term/colors_nix.v
@@ -10,4 +10,4 @@ pub fn format(msg, open, close string) string {
 
 pub fn format_rgb(r, g, b int, msg, open, close string) string {
 	return _format_rgb(r, g, b, msg, open, close)
-}
\ No newline at end of file
+}