diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 74b217c364..02efa674bd 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -462,7 +462,7 @@ resourcestring
   lisKMViewProjectSource = 'View Project Source';
   lisMenuAddToProject = 'Add Editor File to Project';
   lisMenuRemoveFromProject = 'Remove from Project ...';
-  lisMenuRenameLowerCase = 'Rename Units to LowerCase ...';
+  lisMenuRenameLowerCase = 'Rename Unit Files to LowerCase ...';
   lisMenuViewProjectSource = '&View Project Source';
   lisMenuProjectOptions = 'Project Options ...';
 
diff --git a/ide/mainbase.pas b/ide/mainbase.pas
index f922edadf3..c0961c0554 100644
--- a/ide/mainbase.pas
+++ b/ide/mainbase.pas
@@ -1270,7 +1270,7 @@ begin
     ParentMI:=itmProjectAddRemoveSection;
     CreateMenuItem(ParentMI,itmProjectAddTo,'itmProjectAddTo',lisMenuAddToProject, 'menu_project_add');
     CreateMenuItem(ParentMI,itmProjectRemoveFrom,'itmProjectRemoveFrom',lisMenuRemoveFromProject, 'menu_project_remove');
-    CreateMenuItem(ParentMI,itmProjectRenameLowerCase,'itmProjectRenameLowerCase',lisMenuRenameLowerCase, 'menu_search_replace');
+    CreateMenuItem(ParentMI,itmProjectRenameLowerCase,'itmProjectRenameLowerCase',lisMenuRenameLowerCase, 'menu_edit_lowercase');
     CreateMenuItem(ParentMI,itmProjectViewUnits,'itmProjectViewUnits',lisMenuViewUnits, 'menu_view_units');
     CreateMenuItem(ParentMI,itmProjectViewForms,'itmProjectViewForms',lisMenuViewForms, 'menu_view_forms');
     CreateMenuItem(ParentMI,itmProjectViewSource,'itmProjectViewSource',lisMenuViewProjectSource, 'item_project_source');
diff --git a/ide/sourcefilemanager.pas b/ide/sourcefilemanager.pas
index 849b7e478f..2f432740b2 100644
--- a/ide/sourcefilemanager.pas
+++ b/ide/sourcefilemanager.pas
@@ -1935,12 +1935,15 @@ begin
     AnUnitInfo:=TUnitInfo(fUnitInfos[i]);
     Assert(AnUnitInfo.IsPartOfProject, 'TRenameFilesSelector.ActionForFiles: '
          + AnUnitInfo.Unit_Name + ' is not part of project');
+    if AnUnitInfo.Source=nil then
+      AnUnitInfo.ReadUnitSource(false,false);
     // Marked here means to remove old files silently.
     AnUnitInfo.Marked:=True;
     Result:=RenameUnitLowerCase(AnUnitInfo, false);
     AnUnitInfo.Marked:=False;
     if Result<>mrOK then exit;
   end;
+  ShowMessage(Format('%d files were renamed to lowercase.', [fUnitInfos.Count]));
 end;
 
 // ---