diff --git a/.gitattributes b/.gitattributes
index 9cc5b35868..05784af871 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8928,8 +8928,8 @@ packager/pkglinksdlg.pas svneol=native#text/plain
 packager/pkgmanager.pas svneol=native#text/pascal
 packager/pkgregisterbase.pas svneol=native#text/pascal
 packager/pkgvirtualuniteditor.pas svneol=native#text/pascal
-packager/projpackbase.pas svneol=native#text/pascal
 packager/projpackchecks.pas svneol=native#text/pascal
+packager/projpackcommon.pas svneol=native#text/pascal
 packager/registration/Makefile.compiled svneol=native#text/plain
 packager/registration/README.txt svneol=native#text/plain
 packager/registration/fcl.lpk svneol=native#text/plain
diff --git a/converter/convertdelphi.pas b/converter/convertdelphi.pas
index 04711f3332..c7c10208cd 100644
--- a/converter/convertdelphi.pas
+++ b/converter/convertdelphi.pas
@@ -43,7 +43,7 @@ uses
   LazIDEIntf, PackageIntf, ProjectIntf, IDEExternToolIntf, IDEOptionsIntf,
   // IDE
   IDEProcs, DialogProcs, CompilerOptions,
-  ProjPackBase, Project, ProjectDefs, PackageDefs, PackageSystem, PackageEditor,
+  ProjPackCommon, Project, ProjectDefs, PackageDefs, PackageSystem, PackageEditor,
   BasePkgManager, LazarusIDEStrConsts,
   // Converter
   ConverterTypes, ConvertSettings, ConvCodeTool, MissingUnits, MissingPropertiesDlg,
diff --git a/ide/fpmake.pp b/ide/fpmake.pp
index 33e7e49595..2056f382e7 100644
--- a/ide/fpmake.pp
+++ b/ide/fpmake.pp
@@ -407,7 +407,7 @@ begin
     T:=P.Targets.AddUnit('../packager/missingpkgfilesdlg.pas');
     T:=P.Targets.AddUnit('../packager/openinstalledpkgdlg.pas');
     T:=P.Targets.AddUnit('../packager/packagedefs.pas');
-    T.Dependencies.AddUnit('projpackbase');
+    T.Dependencies.AddUnit('projpackcommon');
     T:=P.Targets.AddUnit('../packager/packageeditor.pas');
     T:=P.Targets.AddUnit('../packager/packagelinks.pas');
     T:=P.Targets.AddUnit('../packager/pkggraphexplorer.pas');
@@ -439,7 +439,7 @@ begin
     T:=P.Targets.AddUnit('lazarusidestrconsts.pas');
     T:=P.Targets.AddUnit('environmentopts.pp');
     T:=P.Targets.AddUnit('compileroptions.pp');
-    T:=P.Targets.AddUnit('../packager/projpackbase.pas');
+    T:=P.Targets.AddUnit('../packager/projpackcommon.pas');
     T.Dependencies.AddUnit('filereferencelist');
     T:=P.Targets.AddUnit('filereferencelist.pas');
 
diff --git a/ide/project.pp b/ide/project.pp
index 2a3547bf89..0a88457d61 100644
--- a/ide/project.pp
+++ b/ide/project.pp
@@ -63,7 +63,7 @@ uses
   CompOptsModes, ProjectResources, LazConf, W32Manifest, ProjectIcon,
   IDECmdLine, IDEProcs, CompilerOptions, RunParamsOpts, ModeMatrixOpts,
   TransferMacros, ProjectDefs, FileReferenceList, EditDefineTree,
-  LazarusIDEStrConsts, ProjPackBase, PackageDefs, PackageSystem;
+  LazarusIDEStrConsts, ProjPackCommon, PackageDefs, PackageSystem;
 
 type
   TUnitInfo = class;
diff --git a/packager/addpkgdependencydlg.pas b/packager/addpkgdependencydlg.pas
index 53366ec7c4..7991965ca9 100644
--- a/packager/addpkgdependencydlg.pas
+++ b/packager/addpkgdependencydlg.pas
@@ -13,7 +13,7 @@ uses
   // IDEIntf
   IDEWindowIntf, PackageIntf, IDEDialogs,
   // IDE
-  LazarusIDEStrConsts, PackageDefs, PackageSystem, ProjPackBase, ProjPackChecks;
+  LazarusIDEStrConsts, PackageDefs, PackageSystem, ProjPackCommon, ProjPackChecks;
 
 type
 
diff --git a/packager/packagedefs.pas b/packager/packagedefs.pas
index 26ce069012..dba14573e9 100644
--- a/packager/packagedefs.pas
+++ b/packager/packagedefs.pas
@@ -49,7 +49,7 @@ uses
   PropEdits, LazIDEIntf, MacroIntf, MacroDefIntf, PackageIntf, IDEOptionsIntf,
   ProjPackIntf, IDEDialogs, ComponentReg,
   // IDE
-  EditDefineTree, CompilerOptions, CompOptsModes, IDEOptionDefs, ProjPackBase,
+  EditDefineTree, CompilerOptions, CompOptsModes, IDEOptionDefs, ProjPackCommon,
   LazarusIDEStrConsts, IDEProcs, TransferMacros, FileReferenceList, PublishModule;
 
 type
diff --git a/packager/projpackchecks.pas b/packager/projpackchecks.pas
index 1a3b23f391..2bacff75d9 100644
--- a/packager/projpackchecks.pas
+++ b/packager/projpackchecks.pas
@@ -13,7 +13,7 @@ uses
   // IDEIntf
   ComponentReg, IDEDialogs,
   // IDE
-  LazarusIDEStrConsts, IDEDefs, Project, PackageSystem, PackageDefs, ProjPackBase;
+  LazarusIDEStrConsts, IDEDefs, Project, PackageSystem, PackageDefs, ProjPackCommon;
 
 // Packages:
 type
diff --git a/packager/projpackbase.pas b/packager/projpackcommon.pas
similarity index 99%
rename from packager/projpackbase.pas
rename to packager/projpackcommon.pas
index 0e4b9a7b3f..333b9b935e 100644
--- a/packager/projpackbase.pas
+++ b/packager/projpackcommon.pas
@@ -1,4 +1,4 @@
-unit ProjPackBase;
+unit ProjPackCommon;
 
 {$mode objfpc}{$H+}
 {.$INTERFACES CORBA}   // No reference counting for IProjPack. (does not work)