diff --git a/packager/basepkgmanager.pas b/packager/basepkgmanager.pas
index ec13e58dcd..e2d49192a2 100644
--- a/packager/basepkgmanager.pas
+++ b/packager/basepkgmanager.pas
@@ -232,7 +232,7 @@ begin
     if DepOwner is TLazPackage then begin
       Directory:=TLazPackage(DepOwner).Directory;
     end else if DepOwner is TProject then begin
-      Directory:=TProject(DepOwner).ProjectDirectory;
+      Directory:=TProject(DepOwner).Directory;
     end else if DepOwner=PkgBoss then begin
       Directory:=EnvironmentOptions.GetParsedLazarusDirectory;
     end else begin
diff --git a/packager/pkgmanager.pas b/packager/pkgmanager.pas
index 656ca2054a..36b3c0077a 100644
--- a/packager/pkgmanager.pas
+++ b/packager/pkgmanager.pas
@@ -2575,7 +2575,7 @@ var
       NewHasRegisterProc:=OldPkgFile.HasRegisterProc;
       NewAddToUses:=OldPkgFile.AddToUsesPkgSection;
     end else begin
-      NewUnitName:=OldProjFile.SrcUnitName;
+      NewUnitName:=OldProjFile.Unit_Name;
       NewFileType:=FileNameToPkgFileType(OldFilename);
       NewCompPrio:=ComponentPriorityNormal;
       NewResourceBaseClass:=OldProjFile.ResourceBaseClass;
@@ -4151,7 +4151,7 @@ begin
   if not (pcfDoNotCompileDependencies in Flags) then begin
     Result:=CheckPackageGraphForCompilation(nil,
                                             AProject.FirstRequiredDependency,
-                                            AProject.ProjectDirectory,false);
+                                            AProject.Directory,false);
     if Result<>mrOk then exit;
   end;
   
@@ -4339,7 +4339,7 @@ var
       end else begin
         ClassUnitInfo:=Project1.UnitWithComponentClassName(ComponentClassnames[i]);
         if ClassUnitInfo<>nil then
-          NewUnitName:=ClassUnitInfo.SrcUnitName;
+          NewUnitName:=ClassUnitInfo.Unit_Name;
       end;
       if (NewUnitName<>'') and (UnitNames.IndexOf(NewUnitName)<0) then begin
         // new needed unit
diff --git a/packager/projpackchecks.pas b/packager/projpackchecks.pas
index cc2160eec6..1a3b23f391 100644
--- a/packager/projpackchecks.pas
+++ b/packager/projpackchecks.pas
@@ -293,7 +293,7 @@ begin
   Result:=mrCancel;
   // expand filename
   if not FilenameIsAbsolute(NewFilename) then
-    NewFilename:=TrimFilename(AProject.ProjectDirectory+PathDelim+NewFilename);
+    NewFilename:=TrimFilename(AProject.Directory+PathDelim+NewFilename);
   // check if file is already part of project
   NewFile:=AProject.UnitInfoWithFilename(NewFilename);
   if (NewFile<>nil) and NewFile.IsPartOfProject then begin