diff --git a/.gitattributes b/.gitattributes
index 8e7e47b53e..3a29eada7f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -468,7 +468,7 @@ designer/jitform/jitform.pas svneol=native#text/pascal
 designer/jitforms.pp svneol=native#text/pascal
 designer/menueditorform.pas svneol=native#text/pascal
 designer/menupropedit.pp svneol=native#text/pascal
-designer/noncontrolforms.pas svneol=native#text/pascal
+designer/noncontroldesigner.pas svneol=native#text/pascal
 designer/objinspext.pas svneol=native#text/pascal
 designer/scalecompsdlg.pp svneol=native#text/pascal
 designer/sizecompsdlg.pp svneol=native#text/pascal
diff --git a/designer/designer.pp b/designer/designer.pp
index da29bcfa88..8169a8fbe9 100644
--- a/designer/designer.pp
+++ b/designer/designer.pp
@@ -39,7 +39,7 @@ uses
   Classes, SysUtils, Math, LCLProc, LCLType, LResources, LCLIntf, LMessages,
   Forms, Controls, GraphType, Graphics, Dialogs, ExtCtrls, Menus, ClipBrd,
   LazarusIDEStrConsts, EnvironmentOpts, KeyMapping, ComponentReg,
-  NonControlForms, AlignCompsDlg, SizeCompsDlg, ScaleCompsDlg, TabOrderDlg,
+  NonControlDesigner, AlignCompsDlg, SizeCompsDlg, ScaleCompsDlg, TabOrderDlg,
   DesignerProcs, PropEdits, ComponentEditors, CustomFormEditor,
   ControlSelection, ChangeClassDialog, EditorOptions;
 
diff --git a/designer/noncontrolforms.pas b/designer/noncontroldesigner.pas
similarity index 94%
rename from designer/noncontrolforms.pas
rename to designer/noncontroldesigner.pas
index 7d06bbdbac..04808e7086 100644
--- a/designer/noncontrolforms.pas
+++ b/designer/noncontroldesigner.pas
@@ -25,7 +25,7 @@
     TNonControlForm is a designer form to design non TControl components like
     TDataModule.
 }
-unit NonControlForms;
+unit NonControlDesigner;
 
 {$mode objfpc}{$H+}
 
@@ -62,13 +62,13 @@ type
   end;
   
   
-function CompareNonControlForms(Data1, Data2: Pointer): integer;
-function CompareLookupRootAndNonControlForm(Key, Data: Pointer): integer;
+function CompareNonControlDesignerForms(Data1, Data2: Pointer): integer;
+function CompareLookupRootAndNonControlDesignerForm(Key, Data: Pointer): integer;
 
 implementation
 
 
-function CompareNonControlForms(Data1, Data2: Pointer): integer;
+function CompareNonControlDesignerForms(Data1, Data2: Pointer): integer;
 var
   Form1: TNonControlDesignerForm;
   Form2: TNonControlDesignerForm;
@@ -78,7 +78,7 @@ begin
   Result:=PtrInt(Form1.LookupRoot)-PtrInt(Form2.LookupRoot);
 end;
 
-function CompareLookupRootAndNonControlForm(Key, Data: Pointer): integer;
+function CompareLookupRootAndNonControlDesignerForm(Key, Data: Pointer): integer;
 var
   LookupRoot: TComponent;
   Form: TNonControlDesignerForm;
diff --git a/ide/customformeditor.pp b/ide/customformeditor.pp
index 15c92bcd23..bf868f9fdb 100644
--- a/ide/customformeditor.pp
+++ b/ide/customformeditor.pp
@@ -45,8 +45,9 @@ uses
   // components
   PropEdits, ObjectInspector, IDECommands,
   // IDE
-  LazarusIDEStrConsts, JITForms, NonControlForms, FormEditingIntf, ComponentReg,
-  IDEProcs, ComponentEditors, KeyMapping, EditorOptions, DesignerProcs;
+  LazarusIDEStrConsts, JITForms, NonControlDesigner, FormEditingIntf,
+  ComponentReg, IDEProcs, ComponentEditors, KeyMapping, EditorOptions,
+  DesignerProcs;
 
 Const OrdinalTypes = [tkInteger,tkChar,tkENumeration,tkbool];
 
@@ -752,7 +753,7 @@ constructor TCustomFormEditor.Create;
 begin
   inherited Create;
   FComponentInterfaces := TAVLTree.Create(@CompareComponentInterfaces);
-  FNonControlForms:=TAVLTree.Create(@CompareNonControlForms);
+  FNonControlForms:=TAVLTree.Create(@CompareNonControlDesignerForms);
   FSelection := TPersistentSelectionList.Create;
   
   JITFormList := TJITForms.Create;
@@ -1702,7 +1703,7 @@ function TCustomFormEditor.FindNonControlFormNode(LookupRoot: TComponent
   ): TAVLTreeNode;
 begin
   Result:=FNonControlForms.FindKey(Pointer(LookupRoot),
-                                   @CompareLookupRootAndNonControlForm);
+                                   @CompareLookupRootAndNonControlDesignerForm);
 end;
 
 procedure TCustomFormEditor.JITListPropertyNotFound(Sender: TObject;