diff --git a/compiler/aarch64/symcpu.pas b/compiler/aarch64/symcpu.pas
index 8e2450fb94..9151a90de5 100644
--- a/compiler/aarch64/symcpu.pas
+++ b/compiler/aarch64/symcpu.pas
@@ -100,7 +100,7 @@ type
   tcpuprocsym = class(tprocsym)
   end;
 
-  tcpuypesym = class(ttypesym)
+  tcputypesym = class(ttypesym)
   end;
 
   tcpufieldvarsym = class(tfieldvarsym)
@@ -164,7 +164,7 @@ begin
   cunitsym:=tcpuunitsym;
   cnamespacesym:=tcpunamespacesym;
   cprocsym:=tcpuprocsym;
-  ctypesym:=tcpuypesym;
+  ctypesym:=tcputypesym;
   cfieldvarsym:=tcpufieldvarsym;
   clocalvarsym:=tcpulocalvarsym;
   cparavarsym:=tcpuparavarsym;
diff --git a/compiler/alpha/symcpu.pas b/compiler/alpha/symcpu.pas
index 76cf661034..399fe6e82c 100644
--- a/compiler/alpha/symcpu.pas
+++ b/compiler/alpha/symcpu.pas
@@ -123,9 +123,9 @@ type
   end;
   tcpuprocsymclass = class of tcpuprocsym;
 
-  tcpuypesym = class(ttypesym)
+  tcputypesym = class(ttypesym)
   end;
-  tcpuypesymclass = class of tcpuypesym;
+  tcpuypesymclass = class of tcputypesym;
 
   tcpufieldvarsym = class(tfieldvarsym)
   end;
@@ -197,7 +197,7 @@ begin
   cunitsym:=tcpuunitsym;
   cnamespacesym:=tcpunamespacesym;
   cprocsym:=tcpuprocsym;
-  ctypesym:=tcpuypesym;
+  ctypesym:=tcputypesym;
   cfieldvarsym:=tcpufieldvarsym;
   clocalvarsym:=tcpulocalvarsym;
   cparavarsym:=tcpuparavarsym;
diff --git a/compiler/arm/symcpu.pas b/compiler/arm/symcpu.pas
index a982ae490c..97fc48ebaa 100644
--- a/compiler/arm/symcpu.pas
+++ b/compiler/arm/symcpu.pas
@@ -127,9 +127,9 @@ type
   end;
   tcpuprocsymclass = class of tcpuprocsym;
 
-  tcpuypesym = class(ttypesym)
+  tcputypesym = class(ttypesym)
   end;
-  tcpuypesymclass = class of tcpuypesym;
+  tcpuypesymclass = class of tcputypesym;
 
   tcpufieldvarsym = class(tfieldvarsym)
   end;
@@ -201,7 +201,7 @@ begin
   cunitsym:=tcpuunitsym;
   cnamespacesym:=tcpunamespacesym;
   cprocsym:=tcpuprocsym;
-  ctypesym:=tcpuypesym;
+  ctypesym:=tcputypesym;
   cfieldvarsym:=tcpufieldvarsym;
   clocalvarsym:=tcpulocalvarsym;
   cparavarsym:=tcpuparavarsym;
diff --git a/compiler/avr/symcpu.pas b/compiler/avr/symcpu.pas
index fc61cff9f8..0aa2548a99 100644
--- a/compiler/avr/symcpu.pas
+++ b/compiler/avr/symcpu.pas
@@ -123,9 +123,9 @@ type
   end;
   tcpuprocsymclass = class of tcpuprocsym;
 
-  tcpuypesym = class(ttypesym)
+  tcputypesym = class(ttypesym)
   end;
-  tcpuypesymclass = class of tcpuypesym;
+  tcpuypesymclass = class of tcputypesym;
 
   tcpufieldvarsym = class(tfieldvarsym)
   end;
@@ -197,7 +197,7 @@ begin
   cunitsym:=tcpuunitsym;
   cnamespacesym:=tcpunamespacesym;
   cprocsym:=tcpuprocsym;
-  ctypesym:=tcpuypesym;
+  ctypesym:=tcputypesym;
   cfieldvarsym:=tcpufieldvarsym;
   clocalvarsym:=tcpulocalvarsym;
   cparavarsym:=tcpuparavarsym;
diff --git a/compiler/generic/symcpu.pas b/compiler/generic/symcpu.pas
index 23cc9713d6..11624c96db 100644
--- a/compiler/generic/symcpu.pas
+++ b/compiler/generic/symcpu.pas
@@ -123,9 +123,9 @@ type
   end;
   tcpuprocsymclass = class of tcpuprocsym;
 
-  tcpuypesym = class(ttypesym)
+  tcputypesym = class(ttypesym)
   end;
-  tcpuypesymclass = class of tcpuypesym;
+  tcpuypesymclass = class of tcputypesym;
 
   tcpufieldvarsym = class(tfieldvarsym)
   end;
@@ -197,7 +197,7 @@ begin
   cunitsym:=tcpuunitsym;
   cnamespacesym:=tcpunamespacesym;
   cprocsym:=tcpuprocsym;
-  ctypesym:=tcpuypesym;
+  ctypesym:=tcputypesym;
   cfieldvarsym:=tcpufieldvarsym;
   clocalvarsym:=tcpulocalvarsym;
   cparavarsym:=tcpuparavarsym;
diff --git a/compiler/i386/symcpu.pas b/compiler/i386/symcpu.pas
index 2b769c2468..da1e1d7a3c 100644
--- a/compiler/i386/symcpu.pas
+++ b/compiler/i386/symcpu.pas
@@ -123,9 +123,9 @@ type
   end;
   tcpuprocsymclass = class of tcpuprocsym;
 
-  tcpuypesym = class(ttypesym)
+  tcputypesym = class(ttypesym)
   end;
-  tcpuypesymclass = class of tcpuypesym;
+  tcpuypesymclass = class of tcputypesym;
 
   tcpufieldvarsym = class(tfieldvarsym)
   end;
@@ -197,7 +197,7 @@ begin
   cunitsym:=tcpuunitsym;
   cnamespacesym:=tcpunamespacesym;
   cprocsym:=tcpuprocsym;
-  ctypesym:=tcpuypesym;
+  ctypesym:=tcputypesym;
   cfieldvarsym:=tcpufieldvarsym;
   clocalvarsym:=tcpulocalvarsym;
   cparavarsym:=tcpuparavarsym;
diff --git a/compiler/i8086/symcpu.pas b/compiler/i8086/symcpu.pas
index e1a5d21000..f2b675f1c9 100644
--- a/compiler/i8086/symcpu.pas
+++ b/compiler/i8086/symcpu.pas
@@ -125,9 +125,9 @@ type
   end;
   tcpuprocsymclass = class of tcpuprocsym;
 
-  tcpuypesym = class(ttypesym)
+  tcputypesym = class(ttypesym)
   end;
-  tcpuypesymclass = class of tcpuypesym;
+  tcpuypesymclass = class of tcputypesym;
 
   tcpufieldvarsym = class(tfieldvarsym)
   end;
@@ -239,7 +239,7 @@ begin
   cunitsym:=tcpuunitsym;
   cnamespacesym:=tcpunamespacesym;
   cprocsym:=tcpuprocsym;
-  ctypesym:=tcpuypesym;
+  ctypesym:=tcputypesym;
   cfieldvarsym:=tcpufieldvarsym;
   clocalvarsym:=tcpulocalvarsym;
   cparavarsym:=tcpuparavarsym;
diff --git a/compiler/ia64/symcpu.pas b/compiler/ia64/symcpu.pas
index df2b935cad..0c79c1078c 100644
--- a/compiler/ia64/symcpu.pas
+++ b/compiler/ia64/symcpu.pas
@@ -123,9 +123,9 @@ type
   end;
   tcpuprocsymclass = class of tcpuprocsym;
 
-  tcpuypesym = class(ttypesym)
+  tcputypesym = class(ttypesym)
   end;
-  tcpuypesymclass = class of tcpuypesym;
+  tcpuypesymclass = class of tcputypesym;
 
   tcpufieldvarsym = class(tfieldvarsym)
   end;
@@ -197,7 +197,7 @@ begin
   cunitsym:=tcpuunitsym;
   cnamespacesym:=tcpunamespacesym;
   cprocsym:=tcpuprocsym;
-  ctypesym:=tcpuypesym;
+  ctypesym:=tcputypesym;
   cfieldvarsym:=tcpufieldvarsym;
   clocalvarsym:=tcpulocalvarsym;
   cparavarsym:=tcpuparavarsym;
diff --git a/compiler/jvm/symcpu.pas b/compiler/jvm/symcpu.pas
index ac46acbde7..207a70b4bd 100644
--- a/compiler/jvm/symcpu.pas
+++ b/compiler/jvm/symcpu.pas
@@ -153,9 +153,9 @@ type
   end;
   tcpuprocsymclass = class of tcpuprocsym;
 
-  tcpuypesym = class(ttypesym)
+  tcputypesym = class(ttypesym)
   end;
-  tcpuypesymclass = class of tcpuypesym;
+  tcpuypesymclass = class of tcputypesym;
 
   tcpufieldvarsym = class(tfieldvarsym)
     procedure set_externalname(const s: string); override;
@@ -535,7 +535,7 @@ begin
   cunitsym:=tcpuunitsym;
   cnamespacesym:=tcpunamespacesym;
   cprocsym:=tcpuprocsym;
-  ctypesym:=tcpuypesym;
+  ctypesym:=tcputypesym;
   cfieldvarsym:=tcpufieldvarsym;
   clocalvarsym:=tcpulocalvarsym;
   cparavarsym:=tcpuparavarsym;
diff --git a/compiler/m68k/symcpu.pas b/compiler/m68k/symcpu.pas
index f0e08ac8c1..93702598cb 100644
--- a/compiler/m68k/symcpu.pas
+++ b/compiler/m68k/symcpu.pas
@@ -132,9 +132,9 @@ type
   end;
   tcpuprocsymclass = class of tcpuprocsym;
 
-  tcpuypesym = class(ttypesym)
+  tcputypesym = class(ttypesym)
   end;
-  tcpuypesymclass = class of tcpuypesym;
+  tcpuypesymclass = class of tcputypesym;
 
   tcpufieldvarsym = class(tfieldvarsym)
   end;
@@ -245,7 +245,7 @@ begin
   cunitsym:=tcpuunitsym;
   cnamespacesym:=tcpunamespacesym;
   cprocsym:=tcpuprocsym;
-  ctypesym:=tcpuypesym;
+  ctypesym:=tcputypesym;
   cfieldvarsym:=tcpufieldvarsym;
   clocalvarsym:=tcpulocalvarsym;
   cparavarsym:=tcpuparavarsym;
diff --git a/compiler/mips/symcpu.pas b/compiler/mips/symcpu.pas
index 34a93a0b51..ce2a5e73df 100644
--- a/compiler/mips/symcpu.pas
+++ b/compiler/mips/symcpu.pas
@@ -125,9 +125,9 @@ type
   end;
   tcpuprocsymclass = class of tcpuprocsym;
 
-  tcpuypesym = class(ttypesym)
+  tcputypesym = class(ttypesym)
   end;
-  tcpuypesymclass = class of tcpuypesym;
+  tcpuypesymclass = class of tcputypesym;
 
   tcpufieldvarsym = class(tfieldvarsym)
   end;
@@ -199,7 +199,7 @@ begin
   cunitsym:=tcpuunitsym;
   cnamespacesym:=tcpunamespacesym;
   cprocsym:=tcpuprocsym;
-  ctypesym:=tcpuypesym;
+  ctypesym:=tcputypesym;
   cfieldvarsym:=tcpufieldvarsym;
   clocalvarsym:=tcpulocalvarsym;
   cparavarsym:=tcpuparavarsym;
diff --git a/compiler/powerpc/symcpu.pas b/compiler/powerpc/symcpu.pas
index 12bb2e07b5..0e76662a88 100644
--- a/compiler/powerpc/symcpu.pas
+++ b/compiler/powerpc/symcpu.pas
@@ -132,9 +132,9 @@ type
   end;
   tcpuprocsymclass = class of tcpuprocsym;
 
-  tcpuypesym = class(ttypesym)
+  tcputypesym = class(ttypesym)
   end;
-  tcpuypesymclass = class of tcpuypesym;
+  tcpuypesymclass = class of tcputypesym;
 
   tcpufieldvarsym = class(tfieldvarsym)
   end;
@@ -245,7 +245,7 @@ begin
   cunitsym:=tcpuunitsym;
   cnamespacesym:=tcpunamespacesym;
   cprocsym:=tcpuprocsym;
-  ctypesym:=tcpuypesym;
+  ctypesym:=tcputypesym;
   cfieldvarsym:=tcpufieldvarsym;
   clocalvarsym:=tcpulocalvarsym;
   cparavarsym:=tcpuparavarsym;
diff --git a/compiler/powerpc64/symcpu.pas b/compiler/powerpc64/symcpu.pas
index c9cbe9a002..d252b9897a 100644
--- a/compiler/powerpc64/symcpu.pas
+++ b/compiler/powerpc64/symcpu.pas
@@ -123,9 +123,9 @@ type
   end;
   tcpuprocsymclass = class of tcpuprocsym;
 
-  tcpuypesym = class(ttypesym)
+  tcputypesym = class(ttypesym)
   end;
-  tcpuypesymclass = class of tcpuypesym;
+  tcpuypesymclass = class of tcputypesym;
 
   tcpufieldvarsym = class(tfieldvarsym)
   end;
@@ -197,7 +197,7 @@ begin
   cunitsym:=tcpuunitsym;
   cnamespacesym:=tcpunamespacesym;
   cprocsym:=tcpuprocsym;
-  ctypesym:=tcpuypesym;
+  ctypesym:=tcputypesym;
   cfieldvarsym:=tcpufieldvarsym;
   clocalvarsym:=tcpulocalvarsym;
   cparavarsym:=tcpuparavarsym;
diff --git a/compiler/sparc/symcpu.pas b/compiler/sparc/symcpu.pas
index f49adc7320..082064ca19 100644
--- a/compiler/sparc/symcpu.pas
+++ b/compiler/sparc/symcpu.pas
@@ -123,9 +123,9 @@ type
   end;
   tcpuprocsymclass = class of tcpuprocsym;
 
-  tcpuypesym = class(ttypesym)
+  tcputypesym = class(ttypesym)
   end;
-  tcpuypesymclass = class of tcpuypesym;
+  tcpuypesymclass = class of tcputypesym;
 
   tcpufieldvarsym = class(tfieldvarsym)
   end;
@@ -197,7 +197,7 @@ begin
   cunitsym:=tcpuunitsym;
   cnamespacesym:=tcpunamespacesym;
   cprocsym:=tcpuprocsym;
-  ctypesym:=tcpuypesym;
+  ctypesym:=tcputypesym;
   cfieldvarsym:=tcpufieldvarsym;
   clocalvarsym:=tcpulocalvarsym;
   cparavarsym:=tcpuparavarsym;
diff --git a/compiler/x86_64/symcpu.pas b/compiler/x86_64/symcpu.pas
index baba54b9e9..4e33d0ceb9 100644
--- a/compiler/x86_64/symcpu.pas
+++ b/compiler/x86_64/symcpu.pas
@@ -123,9 +123,9 @@ type
   end;
   tcpuprocsymclass = class of tcpuprocsym;
 
-  tcpuypesym = class(ttypesym)
+  tcputypesym = class(ttypesym)
   end;
-  tcpuypesymclass = class of tcpuypesym;
+  tcpuypesymclass = class of tcputypesym;
 
   tcpufieldvarsym = class(tfieldvarsym)
   end;
@@ -197,7 +197,7 @@ begin
   cunitsym:=tcpuunitsym;
   cnamespacesym:=tcpunamespacesym;
   cprocsym:=tcpuprocsym;
-  ctypesym:=tcpuypesym;
+  ctypesym:=tcputypesym;
   cfieldvarsym:=tcpufieldvarsym;
   clocalvarsym:=tcpulocalvarsym;
   cparavarsym:=tcpuparavarsym;