diff --git a/ide/sourcefilemanager.pas b/ide/sourcefilemanager.pas
index 9345d7c9d7..346b63e07b 100644
--- a/ide/sourcefilemanager.pas
+++ b/ide/sourcefilemanager.pas
@@ -4359,8 +4359,7 @@ begin
     if NewUnitName='' then
       NewUnitName:=ExtractFileNameOnly(NewFilename);
     if EnvironmentOptions.CharcaseFileAction in [ccfaAsk, ccfaAutoRename] then
-      NewFilename:=ExtractFilePath(NewFilename)
-                   +lowercase(ExtractFileName(NewFilename));
+      NewFilename:=ExtractFilePath(NewFilename)+lowercase(ExtractFileName(NewFilename));
   end;
 
   NewCodeBuffer:=CodeToolBoss.CreateFile(NewFilename);
@@ -4682,7 +4681,8 @@ begin
   if FilenameIsPascalUnit(NewFilename) then begin
     AText:=ExtractFileName(NewFilename);
     // check if file should be auto renamed
-    if EnvironmentOptions.CharcaseFileAction = ccfaAsk then begin
+    case EnvironmentOptions.CharcaseFileAction of
+    ccfaAsk:
       if LowerCase(AText)<>AText then begin
         Result:=IDEQuestionDialogAb(lisRenameFile,
             Format(lisThisLooksLikeAPascalFileItIsRecommendedToUseLowerC,
@@ -4696,9 +4696,9 @@ begin
         end;
         Result:=mrOk;
       end;
-    end else begin
-      if EnvironmentOptions.CharcaseFileAction = ccfaAutoRename then
-        NewFileName:=ExtractFilePath(NewFilename)+LowerCase(AText);
+    ccfaAutoRename:
+      NewFileName:=ExtractFilePath(NewFilename)+LowerCase(AText);
+    ccfaIgnore: ;
     end;
   end;
 
diff --git a/packager/pkgmanager.pas b/packager/pkgmanager.pas
index 9b8d6bd578..05e0342775 100644
--- a/packager/pkgmanager.pas
+++ b/packager/pkgmanager.pas
@@ -1209,17 +1209,15 @@ begin
       if lowercase(NewPkgName) <> NewPkgName then
       begin
         LowerFilename:=ExtractFilePath(NewFilename)+lowercase(ExtractFileName(NewFilename));
-        if EnvironmentOptions.CharcaseFileAction = ccfaAsk then
-        begin
+        case EnvironmentOptions.CharcaseFileAction of
+        ccfaAsk:
           if IDEMessageDialog(lisPkgMangRenameFileLowercase,
             Format(lisPkgMangShouldTheFileRenamedLowercaseTo,[LineEnding, LowerFilename]),
             mtConfirmation,[mbYes,mbNo])=mrYes
           then
             NewFileName:=LowerFilename;
-        end
-        else
-        begin
-          if EnvironmentOptions.CharcaseFileAction = ccfaAutoRename then NewFileName:=LowerFilename;
+        ccfaAutoRename: NewFileName:=LowerFilename;
+        ccfaIgnore: ;
         end;
       end;