3 files changed, 3 insertions, 7 deletions
diff --git a/tests/good/complex-types.defs b/tests/good/complex-types.defs
index a10fc21..0a5c952 100644
--- a/tests/good/complex-types.defs
+++ b/tests/good/complex-types.defs
@@ -22,8 +22,8 @@ subsystem types 0;
 import <stdint.h>;
 import "types.h";
 
-type char = MACH_MSG_TYPE_BYTE;
-type intptr_t = ^char;
+type byte = MACH_MSG_TYPE_BYTE;
+type intptr_t = ^byte;
 type pointer_t = ^array[] of MACH_MSG_TYPE_BYTE
 	ctype: vm_offset_t;
 
diff --git a/tests/good/directions.defs b/tests/good/directions.defs
index 37c5767..daae678 100644
--- a/tests/good/directions.defs
+++ b/tests/good/directions.defs
@@ -19,9 +19,6 @@
 /* Tests arguments with different directions.  */
 subsystem directions 100;
 
-type char = MACH_MSG_TYPE_BYTE;
-type int = MACH_MSG_TYPE_INTEGER_32;
-
 type mach_port_t = MACH_MSG_TYPE_COPY_SEND;
 type mach_port_array_t = array[] of mach_port_t;
 
diff --git a/tests/good/types.defs b/tests/good/types.defs
index a27c191..5ef041c 100644
--- a/tests/good/types.defs
+++ b/tests/good/types.defs
@@ -23,7 +23,6 @@ import <stdint.h>;
 import "types.h";
 #include "../base_types.defs"
 
-type char = MACH_MSG_TYPE_CHAR;
 type int16_t = MACH_MSG_TYPE_INTEGER_16;
 type boolean_t = MACH_MSG_TYPE_BOOLEAN;
 type uint16_t = MACH_MSG_TYPE_INTEGER_16;
@@ -50,7 +49,7 @@ type trans_int = int
         outtran: int int8_to_int(int8_t);
 
 routine alltypes(port : mach_port_t;
-                 c : char; s : int16_t; i : int;
+                 c : char; s1 : int16_t; s2 : short; i : int;
                  i32 : int32_t; i64 : int64_t; bool : boolean_t;
                  ui16 : uint16_t; ui32 : uint32_t; ui64 : uint64_t);