diff --git a/components/lazcontrols/treefilteredit.pas b/components/lazcontrols/treefilteredit.pas
index ef372dbf06..d47b4b0415 100644
--- a/components/lazcontrols/treefilteredit.pas
+++ b/components/lazcontrols/treefilteredit.pas
@@ -53,7 +53,7 @@ type
     procedure DeleteData(ANode: TTreeNode);
     procedure FreeNodeData(ANode: TTreeNode);
     function GetData(AIndex: integer): TObject;
-    procedure Clear;
+    procedure ClearNodeData;
     procedure InvalidateBranch;
     procedure MoveFile(CurIndex, NewIndex: integer);
   end;
@@ -91,7 +91,7 @@ type
     procedure StoreSelection; override;
     procedure RestoreSelection; override;
     function GetExistingBranch(ARootNode: TTreeNode): TTreeFilterBranch;
-    function GetBranch(ARootNode: TTreeNode): TTreeFilterBranch;
+    function GetCleanBranch(ARootNode: TTreeNode): TTreeFilterBranch;
     function DeleteBranch(ARootNode: TTreeNode): Boolean;
   public
     property ImageIndexDirectory: integer read fImageIndexDirectory write fImageIndexDirectory;
@@ -148,7 +148,7 @@ end;
 
 destructor TTreeFilterBranch.Destroy;
 begin
-  Clear;
+  ClearNodeData;
   FreeAndNil(fNodeTextToFullFilenameMap);
   FreeAndNil(fNodeTextToDataMap);
   FreeAndNil(fSortedData);
@@ -211,7 +211,7 @@ var
   AObject: TObject;
 begin
   if Assigned(fRootNode) then Begin
-    Clear;
+    ClearNodeData;
     fRootNode.DeleteChildren;      // Delete old tree nodes.
   end
   else
@@ -381,7 +381,7 @@ Begin
   ProcessSubNodes(ARootNode);
 end;
 
-procedure TTreeFilterBranch.Clear;
+procedure TTreeFilterBranch.ClearNodeData;
 Begin
   RemoveChildrenData(fRootNode);
 end;
@@ -578,7 +578,7 @@ begin
     end;
 end;
 
-function TTreeFilterEdit.GetBranch(ARootNode: TTreeNode): TTreeFilterBranch;
+function TTreeFilterEdit.GetCleanBranch(ARootNode: TTreeNode): TTreeFilterBranch;
 // Get a new or existing branch with data cleared for a given tree-node.
 begin
   if not Assigned(fBranches) then
diff --git a/ide/projectinspector.pas b/ide/projectinspector.pas
index d4df399ef4..349187508a 100644
--- a/ide/projectinspector.pas
+++ b/ide/projectinspector.pas
@@ -978,8 +978,8 @@ begin
   if not CanUpdate(pifNeedUpdateFiles) then exit;
   ItemsTreeView.BeginUpdate;
   try
-    FilesBranch:=FilterEdit.GetBranch(FFilesNode);
-    FilesBranch.Clear;
+    FilesBranch:=FilterEdit.GetCleanBranch(FFilesNode);
+    FilesBranch.ClearNodeData;
     FreeNodeData(penFile);
     if LazProject<>nil then begin
       FilterEdit.SelectedPart:=FNextSelectedPart;
@@ -1014,8 +1014,8 @@ begin
   if not CanUpdate(pifNeedUpdateDependencies) then exit;
   ItemsTreeView.BeginUpdate;
   try
-    RequiredBranch:=FilterEdit.GetBranch(FDependenciesNode);
-    RequiredBranch.Clear;
+    RequiredBranch:=FilterEdit.GetCleanBranch(FDependenciesNode);
+    RequiredBranch.ClearNodeData;
     FreeNodeData(penDependency);
     Dependency:=Nil;
     if LazProject<>nil then begin
@@ -1047,7 +1047,7 @@ begin
           FRemovedDependenciesNode.ImageIndex:=ImageIndexRemovedRequired;
           FRemovedDependenciesNode.SelectedIndex:=FRemovedDependenciesNode.ImageIndex;
         end;
-        RemovedBranch:=FilterEdit.GetBranch(FRemovedDependenciesNode);
+        RemovedBranch:=FilterEdit.GetCleanBranch(FRemovedDependenciesNode);
         // Add all removed dependencies under the branch
         while Dependency<>nil do begin
           ANodeData := CreateNodeData(penDependency, Dependency.PackageName, True);
diff --git a/packager/installpkgsetdlg.pas b/packager/installpkgsetdlg.pas
index 7e3a2f08f6..9096e95964 100644
--- a/packager/installpkgsetdlg.pas
+++ b/packager/installpkgsetdlg.pas
@@ -555,7 +555,7 @@ begin
       LPKInfoCache.LeaveCritSection;
     end;
     // fill tree view through FilterEdit
-    FilteredBranch := AvailableFilterEdit.GetBranch(Nil); // All items are top level.
+    FilteredBranch := AvailableFilterEdit.GetCleanBranch(Nil); // All items are top level.
     for i:=0 to List.Count-1 do
       FilteredBranch.AddNodeData(List[i],nil);
   finally
@@ -583,7 +583,7 @@ begin
     end;
     List.Sort;
     // fill tree view through FilterEdit
-    FilteredBranch := InstalledFilterEdit.GetBranch(Nil); // All items are top level.
+    FilteredBranch := InstalledFilterEdit.GetCleanBranch(Nil); // All items are top level.
     for i:=0 to List.Count-1 do
       FilteredBranch.AddNodeData(List[i],nil);
   finally
diff --git a/packager/packageeditor.pas b/packager/packageeditor.pas
index b0a291b1e6..d623da7b9b 100644
--- a/packager/packageeditor.pas
+++ b/packager/packageeditor.pas
@@ -2328,9 +2328,9 @@ begin
   OldFilter := FilterEdit.ForceFilter('');
 
   // files belonging to package
-  FilesBranch:=FilterEdit.GetBranch(FFilesNode);
+  FilesBranch:=FilterEdit.GetCleanBranch(FFilesNode);
   FreeNodeData(penFile);
-  FilesBranch.Clear;
+  FilesBranch.ClearNodeData;
   FilterEdit.SelectedPart:=nil;
   FilterEdit.ShowDirHierarchy:=ShowDirectoryHierarchy;
   FilterEdit.SortData:=SortAlphabetically;
@@ -2374,8 +2374,8 @@ begin
       FRemovedFilesNode.ImageIndex:=ImageIndexRemovedFiles;
       FRemovedFilesNode.SelectedIndex:=FRemovedFilesNode.ImageIndex;
     end;
-    RemovedBranch:=FilterEdit.GetBranch(FRemovedFilesNode);
-    RemovedBranch.Clear;
+    RemovedBranch:=FilterEdit.GetCleanBranch(FRemovedFilesNode);
+    RemovedBranch.ClearNodeData;
     for i:=0 to LazPackage.RemovedFilesCount-1 do begin
       CurFile:=LazPackage.RemovedFiles[i];
       NodeData:=CreateNodeData(penFile,CurFile.Filename,true);
@@ -2408,9 +2408,9 @@ begin
   OldFilter := FilterEdit.ForceFilter('');
 
   // required packages
-  RequiredBranch:=FilterEdit.GetBranch(FRequiredPackagesNode);
+  RequiredBranch:=FilterEdit.GetCleanBranch(FRequiredPackagesNode);
   FreeNodeData(penDependency);
-  RequiredBranch.Clear;
+  RequiredBranch.ClearNodeData;
   CurDependency:=LazPackage.FirstRequiredDependency;
   FilterEdit.SelectedPart:=nil;
   while CurDependency<>nil do begin
@@ -2442,8 +2442,8 @@ begin
       FRemovedRequiredNode.ImageIndex:=ImageIndexRemovedRequired;
       FRemovedRequiredNode.SelectedIndex:=FRemovedRequiredNode.ImageIndex;
     end;
-    RemovedBranch:=FilterEdit.GetBranch(FRemovedRequiredNode);
-    RemovedBranch.Clear;
+    RemovedBranch:=FilterEdit.GetCleanBranch(FRemovedRequiredNode);
+    RemovedBranch.ClearNodeData;
     while CurDependency<>nil do begin
       NodeData:=CreateNodeData(penDependency,CurDependency.PackageName,true);
       RemovedBranch.AddNodeData(CurDependency.AsString, NodeData);