diff --git a/.gitattributes b/.gitattributes
index 5866aeaba0..021397153d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2131,6 +2131,9 @@ ide/showcompileropts.lfm svneol=native#text/plain
 ide/showcompileropts.lrs svneol=native#text/pascal
 ide/showcompileropts.pas svneol=native#text/pascal
 ide/sortselectiondlg.pas svneol=native#text/pascal
+ide/sourceeditor.lfm svneol=native#text/plain
+ide/sourceeditor.lrs svneol=native#text/plain
+ide/sourceeditor.pp svneol=native#text/pascal
 ide/sourceeditprocs.pas svneol=native#text/pascal
 ide/sourcemarks.pas svneol=native#text/pascal
 ide/splash.lfm svneol=native#text/plain
@@ -2153,9 +2156,6 @@ ide/transfermacros.pp svneol=native#text/pascal
 ide/unitdependencies.lfm svneol=native#text/plain
 ide/unitdependencies.lrs svneol=native#text/pascal
 ide/unitdependencies.pas svneol=native#text/pascal
-ide/uniteditor.lfm svneol=native#text/plain
-ide/uniteditor.lrs svneol=native#text/plain
-ide/uniteditor.pp svneol=native#text/pascal
 ide/unitinfodlg.lfm svneol=native#text/plain
 ide/unitinfodlg.lrs svneol=native#text/plain
 ide/unitinfodlg.pp svneol=native#text/pascal
diff --git a/ide/codeexplopts.pas b/ide/codeexplopts.pas
index 208599c0d7..368a681627 100644
--- a/ide/codeexplopts.pas
+++ b/ide/codeexplopts.pas
@@ -1,6 +1,6 @@
 {
 /***************************************************************************
-                               UnitEditor.pp
+                              CodeExplOpts.pas
                              -------------------
 
  ***************************************************************************/
diff --git a/ide/debugmanager.pas b/ide/debugmanager.pas
index 8df9202f3b..8ab21eb2d5 100644
--- a/ide/debugmanager.pas
+++ b/ide/debugmanager.pas
@@ -46,7 +46,7 @@ uses
   SynEdit, CodeCache, CodeToolManager,
   MenuIntf, IDECommands, LazIDEIntf, ProjectIntf,
   LazConf, DebugOptionsFrm,
-  CompilerOptions, EditorOptions, EnvironmentOpts, ProjectOpts, KeyMapping, UnitEditor,
+  CompilerOptions, EditorOptions, EnvironmentOpts, ProjectOpts, KeyMapping, SourceEditor,
   ProjectDefs, Project, IDEProcs, InputHistory, Debugger,
   IDEOptionDefs, LazarusIDEStrConsts,
   MainBar, MainIntf, MainBase, BaseBuildManager,
diff --git a/ide/main.pp b/ide/main.pp
index b7f41aa86b..1fe32b2eb0 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -113,7 +113,7 @@ uses
   // packager
   PackageSystem, PkgManager, BasePkgManager,
   // source editing
-  UnitEditor, CodeToolsOptions, IDEOptionDefs, CheckLFMDlg,
+  SourceEditor, CodeToolsOptions, IDEOptionDefs, CheckLFMDlg,
   CodeToolsDefines, DiffDialog, DiskDiffsDialog, UnitInfoDlg, EditorOptions,
   SourceEditProcs, MsgQuickFixes, ViewUnit_dlg,
   // converter
diff --git a/ide/mainbase.pas b/ide/mainbase.pas
index 4a65f81fe8..242526e9d6 100644
--- a/ide/mainbase.pas
+++ b/ide/mainbase.pas
@@ -67,7 +67,7 @@ uses
   TransferMacros, ObjectInspector, PropEdits, IDEDefs, MsgView,
   EnvironmentOpts, EditorOptions, CompilerOptions, KeyMapping, IDEProcs,
   Debugger, IDEOptionDefs, CodeToolsDefines, Splash, Designer,
-  UnitEditor, BuildManager,
+  SourceEditor, BuildManager,
   MainBar, MainIntf;
 
 type
diff --git a/ide/uniteditor.lfm b/ide/sourceeditor.lfm
similarity index 100%
rename from ide/uniteditor.lfm
rename to ide/sourceeditor.lfm
diff --git a/ide/uniteditor.lrs b/ide/sourceeditor.lrs
similarity index 100%
rename from ide/uniteditor.lrs
rename to ide/sourceeditor.lrs
diff --git a/ide/uniteditor.pp b/ide/sourceeditor.pp
similarity index 99%
rename from ide/uniteditor.pp
rename to ide/sourceeditor.pp
index c94124bf14..b0a5178802 100644
--- a/ide/uniteditor.pp
+++ b/ide/sourceeditor.pp
@@ -1,6 +1,6 @@
 {
 /***************************************************************************
-                               UnitEditor.pp
+                               SourceEditor.pp
                              -------------------
 
  ***************************************************************************/
@@ -28,7 +28,7 @@
   It also has a class that controls the editors (TSourceEditor)
 }
 
-unit UnitEditor;
+unit SourceEditor;
 
 {$mode objfpc}
 {$H+}
@@ -6451,7 +6451,7 @@ end;
 
 initialization
   InternalInit;
-  {$I uniteditor.lrs}
+  {$I sourceeditor.lrs}
 {$I ../images/bookmark.lrs}
 
 finalization
diff --git a/packager/pkgmanager.pas b/packager/pkgmanager.pas
index e358a866b8..b918f9659a 100644
--- a/packager/pkgmanager.pas
+++ b/packager/pkgmanager.pas
@@ -60,7 +60,7 @@ uses
   PackageLinks, PackageSystem, OpenInstalledPkgDlg, PkgGraphExplorer,
   BrokenDependenciesDlg, CompilerOptions, ExtToolEditDlg, IDETranslations,
   TransferMacros, MsgView, BuildLazDialog, NewDialog, IDEDialogs, TodoList,
-  ProjectInspector, ComponentPalette, UnitEditor, AddFileToAPackageDlg,
+  ProjectInspector, ComponentPalette, SourceEditor, AddFileToAPackageDlg,
   LazarusPackageIntf, PublishProjectDlg, PkgLinksDlg, InstallPkgSetDlg,
   // bosses
   BaseBuildManager, BasePkgManager,