diff --git a/compiler/assemble.pas b/compiler/assemble.pas
index dcaff9b1f0..510b340b75 100644
--- a/compiler/assemble.pas
+++ b/compiler/assemble.pas
@@ -91,7 +91,7 @@ Implementation
 uses
   cutils,script,fmodule,systems,verbose
 {$ifdef unix}
-  ,linux
+  ,unix
 {$endif}
 {$ifdef i386}
   {$ifndef NoAg386Bin}
@@ -597,7 +597,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.9  2001-01-12 19:19:44  peter
+  Revision 1.10  2001-01-21 20:32:45  marco
+   * Renamefest. Compiler part. Not that hard.
+
+  Revision 1.9  2001/01/12 19:19:44  peter
     * fixed searching for utils
 
   Revision 1.8  2000/12/25 00:07:25  peter
diff --git a/compiler/catch.pas b/compiler/catch.pas
index de8448dc51..a6cc3fecfb 100644
--- a/compiler/catch.pas
+++ b/compiler/catch.pas
@@ -38,7 +38,7 @@ interface
 uses
 {$ifdef unix}
   {$define has_signal}
-  linux,
+  Unix,
 {$endif}
 {$ifdef go32v2}
   {$define has_signal}
@@ -101,7 +101,10 @@ end.
 
 {
   $Log$
-  Revision 1.5  2000-11-13 15:26:12  marco
+  Revision 1.6  2001-01-21 20:32:45  marco
+   * Renamefest. Compiler part. Not that hard.
+
+  Revision 1.5  2000/11/13 15:26:12  marco
    * Renamefest
 
   Revision 1.4  2000/09/24 15:06:11  peter
diff --git a/compiler/comphook.pas b/compiler/comphook.pas
index fc157431f1..0a09cfd5d0 100644
--- a/compiler/comphook.pas
+++ b/compiler/comphook.pas
@@ -139,7 +139,7 @@ implementation
 
   uses
 {$ifdef Unix}
-   linux,
+   Unix,
 {$endif}
 {$ifdef delphi}
    dmisc
@@ -363,7 +363,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.11  2000-12-26 15:58:29  peter
+  Revision 1.12  2001-01-21 20:32:45  marco
+   * Renamefest. Compiler part. Not that hard.
+
+  Revision 1.11  2000/12/26 15:58:29  peter
     * check for verbosity in verbose instead of comphook
 
   Revision 1.10  2000/12/25 00:07:25  peter
diff --git a/compiler/globals.pas b/compiler/globals.pas
index 48150df850..aa350c5891 100644
--- a/compiler/globals.pas
+++ b/compiler/globals.pas
@@ -31,7 +31,7 @@ interface
       windows,
 {$endif}
 {$ifdef unix}
-      linux,
+      unix,
 {$endif}
 {$ifdef os2}
       doscalls,
@@ -957,7 +957,7 @@ implementation
       {$endif}
       begin
       {$ifdef unix}
-        GetEnvPchar:=Linux.Getenv(envname);
+        GetEnvPchar:=Unix.Getenv(envname);
         {$define GETENVOK}
       {$endif}
       {$ifdef win32}
@@ -1017,7 +1017,7 @@ implementation
         expansion under linux }
       {$ifdef unix}
       begin
-        Linux.Shell(command);
+        Unix.Shell(command);
       end;
       {$else}
       var
@@ -1299,7 +1299,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.24  2001-01-20 18:32:52  hajny
+  Revision 1.25  2001-01-21 20:32:45  marco
+   * Renamefest. Compiler part. Not that hard.
+
+  Revision 1.24  2001/01/20 18:32:52  hajny
     + APPTYPE support under OS/2, app_fs, GetEnvPChar for OS/2
 
   Revision 1.23  2001/01/13 00:03:41  peter
diff --git a/compiler/script.pas b/compiler/script.pas
index 5f56c95b51..30164d5d66 100644
--- a/compiler/script.pas
+++ b/compiler/script.pas
@@ -68,7 +68,7 @@ implementation
 
 uses
 {$ifdef Unix}
-  linux,
+  Unix,
 {$endif}
   globals,systems;
 
@@ -237,7 +237,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.5  2000-12-25 00:07:29  peter
+  Revision 1.6  2001-01-21 20:32:45  marco
+   * Renamefest. Compiler part. Not that hard.
+
+  Revision 1.5  2000/12/25 00:07:29  peter
     + new tlinkedlist class (merge of old tstringqueue,tcontainer and
       tlinkedlist objects)