diff --git a/ide/main.pp b/ide/main.pp
index 06b5c33674..c1b4570807 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -6636,12 +6636,14 @@ begin
         NewFileName:=ExtractFilePath(NewFilename)
                     +lowercase(ExtractFileName(NewFilename));
 
-      if Project1.MainUnitID>=0 then begin
+      if Project1.MainUnitID >= 0 then
+      begin
         // check mainunit filename
         Ext:=ExtractFileExt(Project1.MainUnitInfo.Filename);
         if Ext='' then Ext:='.pas';
         NewProgramFilename:=ChangeFileExt(NewFilename,Ext);
-        if CompareFilenames(NewFilename,NewProgramFilename)=0 then begin
+        if CompareFilenames(NewFilename,NewProgramFilename)=0 then
+        begin
           ACaption:=lisChooseADifferentName;
           AText:=Format(lisTheProjectInfoFileIsEqualToTheProjectMainSource, [
             '"', NewFilename, '"', #13]);
@@ -6673,14 +6675,17 @@ begin
   end;
 
   // check if info file or source file already exists
-  if FileExistsUTF8(NewFilename) then begin
+  if FileExistsUTF8(NewFilename) then
+  begin
     ACaption:=lisOverwriteFile;
     AText:=Format(lisAFileAlreadyExistsReplaceIt, ['"', NewFilename, '"', #13]);
     Result:=MessageDlg(ACaption, AText, mtConfirmation, [mbOk, mbCancel], 0);
     if Result=mrCancel then exit;
   end
-  else begin
-    if FileExistsUTF8(NewProgramFilename) then begin
+  else
+  begin
+    if FileExistsUTF8(NewProgramFilename) then
+    begin
       ACaption:=lisOverwriteFile;
       AText:=Format(lisAFileAlreadyExistsReplaceIt, ['"', NewProgramFilename,
         '"', #13]);
@@ -6689,7 +6694,7 @@ begin
     end;
   end;
   
-  TitleWasDefault:=Project1.TitleIsDefault(true);
+  TitleWasDefault := Project1.TitleIsDefault(true);
 
   // set new project filename
   Project1.ProjectInfoFile:=NewFilename;
@@ -6697,15 +6702,16 @@ begin
   SetRecentProjectFilesMenu;
 
   // change main source
-  if (Project1.MainUnitID>=0) then begin
-    GetMainUnit(MainUnitInfo,MainUnitSrcEdit,true);
+  if (Project1.MainUnitID >= 0) then
+  begin
+    GetMainUnit(MainUnitInfo, MainUnitSrcEdit, true);
     
     // Save old source code, to prevent overwriting it,
     // if the file name didn't actually change.
-    OldSource:=MainUnitInfo.Source.Source;
+    OldSource := MainUnitInfo.Source.Source;
     
     // switch MainUnitInfo.Source to new code
-    NewBuf:=CodeToolBoss.CreateFile(NewProgramFilename);
+    NewBuf := CodeToolBoss.CreateFile(NewProgramFilename);
     if NewBuf=nil then begin
       Result:=MessageDlg(lisErrorCreatingFile, Format(lisUnableToCreateFile3, [
         #13, '"', NewProgramFilename, '"']), mtError, [mbCancel], 0);
diff --git a/ide/project.pp b/ide/project.pp
index 90ec84b368..c8d79be327 100644
--- a/ide/project.pp
+++ b/ide/project.pp
@@ -1299,23 +1299,26 @@ begin
 end;
 
 procedure TUnitInfo.SetUnitName(const NewUnitName:string);
-var Allowed:boolean;
+var
+  Allowed: boolean;
   OldUnitName: String;
 begin
-  if (fUnitName<>NewUnitName) and (NewUnitName<>'') then begin
-    Allowed:=true;
-    OldUnitName:=fUnitName;
-    if OldUnitName='' then
-      OldUnitName:=ExtractFileNameOnly(Filename);
+  if (fUnitName <> NewUnitName) and (NewUnitName <> '') then
+  begin
+    Allowed := true;
+    OldUnitName := fUnitName;
+    if OldUnitName = '' then
+      OldUnitName := ExtractFileNameOnly(Filename);
     if Assigned(FOnUnitNameChange) then
-      FOnUnitNameChange(Self,OldUnitName,NewUnitName,false,Allowed);
+      FOnUnitNameChange(Self, OldUnitName, NewUnitName, false, Allowed);
     // (ignore Allowed)
-    if (fSource<>nil) then begin
+    if (fSource <> nil) then
+    begin
       CodeToolBoss.RenameSource(fSource,NewUnitName);
     end;
-    fUnitName:=NewUnitName;
-    Modified:=true;
-    if (Project<>nil) then Project.UnitModified(Self);
+    fUnitName := NewUnitName;
+    Modified := true;
+    if (Project <> nil) then Project.UnitModified(Self);
   end;
 end;