diff --git a/compiler/i8086/cgcpu.pas b/compiler/i8086/cgcpu.pas
index 274a7d13b6..8795b5d5b0 100644
--- a/compiler/i8086/cgcpu.pas
+++ b/compiler/i8086/cgcpu.pas
@@ -1,7 +1,7 @@
 {
     Copyright (c) 1998-2002 by Florian Klaempfl
 
-    This unit implements the code generator for the i386
+    This unit implements the code generator for the i8086
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -75,7 +75,7 @@ unit cgcpu;
         procedure get_32bit_ops(op: TOpCG; out op1,op2: TAsmOp);
      end;
 
-      tcg64f386 = class(tcg64f32)
+      tcg64f8086 = class(tcg64f32)
 {        procedure a_op64_ref_reg(list : TAsmList;op:TOpCG;size : tcgsize;const ref : treference;reg : tregister64);override;}
         procedure a_op64_reg_reg(list : TAsmList;op:TOpCG;size : tcgsize;regsrc,regdst : tregister64);override;
         procedure a_op64_const_reg(list : TAsmList;op:TOpCG;size : tcgsize;value : int64;reg : tregister64);override;
@@ -1309,7 +1309,7 @@ unit cgcpu;
 
 { ************* 64bit operations ************ }
 
-    procedure tcg64f386.get_64bit_ops(op:TOpCG;var op1,op2:TAsmOp);
+    procedure tcg64f8086.get_64bit_ops(op:TOpCG;var op1,op2:TAsmOp);
       begin
         case op of
           OP_ADD :
@@ -1343,7 +1343,7 @@ unit cgcpu;
       end;
 
 
-(*    procedure tcg64f386.a_op64_ref_reg(list : TAsmList;op:TOpCG;size : tcgsize;const ref : treference;reg : tregister64);
+(*    procedure tcg64f8086.a_op64_ref_reg(list : TAsmList;op:TOpCG;size : tcgsize;const ref : treference;reg : tregister64);
       var
         op1,op2 : TAsmOp;
         tempref : treference;
@@ -1365,7 +1365,7 @@ unit cgcpu;
       end;*)
 
 
-    procedure tcg64f386.a_op64_reg_reg(list : TAsmList;op:TOpCG;size : tcgsize;regsrc,regdst : tregister64);
+    procedure tcg64f8086.a_op64_reg_reg(list : TAsmList;op:TOpCG;size : tcgsize;regsrc,regdst : tregister64);
       var
         op1,op2 : TAsmOp;
       begin
@@ -1398,7 +1398,7 @@ unit cgcpu;
       end;
 
 
-    procedure tcg64f386.a_op64_const_reg(list : TAsmList;op:TOpCG;size : tcgsize;value : int64;reg : tregister64);
+    procedure tcg64f8086.a_op64_const_reg(list : TAsmList;op:TOpCG;size : tcgsize;value : int64;reg : tregister64);
       var
         op1,op2 : TAsmOp;
       begin
@@ -1423,7 +1423,7 @@ unit cgcpu;
       end;
 
 
-(*    procedure tcg64f386.a_op64_const_ref(list : TAsmList;op:TOpCG;size : tcgsize;value : int64;const ref : treference);
+(*    procedure tcg64f8086.a_op64_const_ref(list : TAsmList;op:TOpCG;size : tcgsize;value : int64;const ref : treference);
       var
         op1,op2 : TAsmOp;
         tempref : treference;
@@ -1453,7 +1453,7 @@ unit cgcpu;
     procedure create_codegen;
       begin
         cg := tcg8086.create;
-        cg64 := tcg64f386.create;
+        cg64 := tcg64f8086.create;
       end;
 
 end.
diff --git a/compiler/i8086/cpupara.pas b/compiler/i8086/cpupara.pas
index 4b07f3bcc0..d828b5cd75 100644
--- a/compiler/i8086/cpupara.pas
+++ b/compiler/i8086/cpupara.pas
@@ -1,7 +1,7 @@
 {
     Copyright (c) 2002 by Florian Klaempfl
 
-    Generates the argument location information for i386
+    Generates the argument location information for i8086
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/compiler/i8086/cpupi.pas b/compiler/i8086/cpupi.pas
index f4282afd37..931b8e4a61 100644
--- a/compiler/i8086/cpupi.pas
+++ b/compiler/i8086/cpupi.pas
@@ -31,7 +31,7 @@ unit cpupi;
        psub,procinfo,aasmdata;
 
     type
-       ti386procinfo = class(tcgprocinfo)
+       ti8086procinfo = class(tcgprocinfo)
          constructor create(aparent:tprocinfo);override;
          procedure set_first_temp_offset;override;
          function calc_stackframe_size:longint;override;
@@ -50,14 +50,14 @@ unit cpupi;
       cgutils,
       symconst;
 
-    constructor ti386procinfo.create(aparent:tprocinfo);
+    constructor ti8086procinfo.create(aparent:tprocinfo);
       begin
         inherited create(aparent);
         got:=NR_EBX;
       end;
 
 
-    procedure ti386procinfo.set_first_temp_offset;
+    procedure ti8086procinfo.set_first_temp_offset;
       begin
         if paramanager.use_fixed_stack then
           begin
@@ -72,7 +72,7 @@ unit cpupi;
       end;
 
 
-    function ti386procinfo.calc_stackframe_size:longint;
+    function ti8086procinfo.calc_stackframe_size:longint;
       begin
         { align to 4 bytes at least
           otherwise all those subl $2,%esp are meaningless PM }
@@ -85,7 +85,7 @@ unit cpupi;
       end;
 
 
-    procedure ti386procinfo.generate_parameter_info;
+    procedure ti8086procinfo.generate_parameter_info;
       begin
         inherited generate_parameter_info;
         { Para_stack_size is only used to determine how many bytes to remove }
@@ -95,7 +95,7 @@ unit cpupi;
           para_stack_size := 0;
       end;
 
-    procedure ti386procinfo.allocate_got_register(list: tasmlist);
+    procedure ti8086procinfo.allocate_got_register(list: tasmlist);
       begin
         if (target_info.system in [system_i386_darwin,system_i386_iphonesim]) and
            (cs_create_pic in current_settings.moduleswitches) then
@@ -105,5 +105,5 @@ unit cpupi;
       end;
 
 begin
-   cprocinfo:=ti386procinfo;
+   cprocinfo:=ti8086procinfo;
 end.
diff --git a/compiler/i8086/n8086add.pas b/compiler/i8086/n8086add.pas
index d9150100c8..5bcf77da8f 100644
--- a/compiler/i8086/n8086add.pas
+++ b/compiler/i8086/n8086add.pas
@@ -1,7 +1,7 @@
 {
     Copyright (c) 2000-2002 by Florian Klaempfl
 
-    Code generation for add nodes on the i386
+    Code generation for add nodes on the i8086
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by