diff --git a/source/childwin.pas b/source/childwin.pas
index 6766bcb2..be68916c 100644
--- a/source/childwin.pas
+++ b/source/childwin.pas
@@ -980,7 +980,7 @@ begin
   pnlQueryMemo.Height := Mainform.GetRegValue(REGNAME_QUERYMEMOHEIGHT, pnlQueryMemo.Height);
   pnlQueryHelpers.Width := Mainform.GetRegValue(REGNAME_QUERYHELPERSWIDTH, pnlQueryHelpers.Width);
   DBtree.Width := Mainform.GetRegValue(REGNAME_DBTREEWIDTH, DBtree.Width);
-  PageControlBottom.Height := Mainform.GetRegValue(REGNAME_SQLOUTHEIGHT, PageControlBottom.Height);
+  pageCtlBottom.Height := Mainform.GetRegValue(REGNAME_SQLOUTHEIGHT, pageCtlBottom.Height);
   prefDefaultColWidth := Mainform.GetRegValue(REGNAME_DEFAULTCOLWIDTH, DEFAULT_DEFAULTCOLWIDTH);
   // Fix registry entry from older versions which can have 0 here which makes no sense
   // since the autosetting was removed
@@ -1131,7 +1131,7 @@ begin
     reg.WriteInteger( REGNAME_QUERYMEMOHEIGHT, pnlQueryMemo.Height );
     reg.WriteInteger( REGNAME_QUERYHELPERSWIDTH, pnlQueryHelpers.Width );
     reg.WriteInteger( REGNAME_DBTREEWIDTH, DBtree.width );
-    reg.WriteInteger( REGNAME_SQLOUTHEIGHT, PageControlBottom.Height );
+    reg.WriteInteger( REGNAME_SQLOUTHEIGHT, pageCtlBottom.Height );
 
     // Save width of probably resized columns of all VirtualTrees
     SaveListSetup(ListVariables);
@@ -1365,7 +1365,7 @@ begin
         // Ensure the user can see its previous specified filter
         // in case of an SQL-error, it's important that he can delete it
         tabFilter.tabVisible := true;
-        PageControlBottom.ActivePage := tabFilter;
+        pageCtlBottom.ActivePage := tabFilter;
       end;
     end;
 
@@ -2238,7 +2238,7 @@ begin
     begin
       MainForm.showstatus('', 1); // empty connected_time
     end;
-    tabBlobEditor.tabVisible := inDataOrQueryTab;
+    tabEditors.tabVisible := inDataOrQueryTab;
   end;
 end;
 
@@ -3306,7 +3306,7 @@ end;
 procedure TMDIChild.Filter1Click(Sender: TObject);
 begin
   // Set WHERE-Filter
-  PageControlBottom.ActivePage := tabFilter;
+  pageCtlBottom.ActivePage := tabFilter;
   SynMemoFilter.SetFocus;
 end;
 
@@ -3481,7 +3481,7 @@ begin
   end;
 
   SynMemoFilter.Text := filter;
-  PageControlBottom.ActivePage := tabFilter;
+  pageCtlBottom.ActivePage := tabFilter;
   SynMemoFilter.SetFocus;
   SetFilter(self);
 end;
@@ -3503,12 +3503,12 @@ begin
   btnBlobCopy.Enabled := true;
   btnBlobLoad.Enabled := not DBMemo1.ReadOnly;
   btnBlobSave.Enabled := true;
-  if PageControlBlobEditors.ActivePage = tabBlobEditorText then
+  if pageCtlEditors.ActivePage = tabEditorText then
   begin
     // MEMO tab activated.
     btnBlobWordWrap.Enabled := true;
   end;
-  if PageControlBlobEditors.ActivePage = tabBlobEditorImage then
+  if pageCtlEditors.ActivePage = tabEditorImage then
   begin
     // Image tab activated.
     btnBlobWordWrap.Enabled := false;
@@ -3543,7 +3543,7 @@ begin
   grid := ActiveGrid;
 
   with TSaveDialog.Create(self) do begin
-    case PageControlBlobEditors.ActivePageIndex of
+    case pageCtlEditors.ActivePageIndex of
       0 : begin
             Filter := 'Text files (*.txt)|*.txt|All files (*.*)|*.*';
             DefaultExt := 'txt';
@@ -3557,7 +3557,7 @@ begin
     Options := [ofOverwritePrompt,ofEnableSizing];
     if execute then try
       Screen.Cursor := crHourGlass;
-      case PageControlBlobEditors.ActivePageIndex of
+      case pageCtlEditors.ActivePageIndex of
         0 : begin
             AssignFile(bf, filename);
             Rewrite(bf);
@@ -3585,13 +3585,13 @@ begin
   end;
 
   with OpenDialog2 do begin
-    case PageControlBlobEditors.ActivePageIndex of
+    case pageCtlEditors.ActivePageIndex of
       0 : Filter := 'Textfiles (*.txt)|*.txt|All files (*.*)|*.*';
       1 : Filter := 'All Images (*.jpg, *.jpeg, *.bmp)|*.jpg;*.jpeg;*.bmp|JPEG (*.jpg, *.jpeg)|*.jpg;*.jpeg|Bitmap (*.bmp)|*.bmp|All files (*.*)|*.*';
     end;
 
     if execute then
-    case PageControlBlobEditors.ActivePageIndex of
+    case pageCtlEditors.ActivePageIndex of
       0 : DBMemo1.Lines.LoadFromFile(filename);
       1 : EDBImage1.Picture.LoadFromFile(filename);
     end;
@@ -4430,8 +4430,8 @@ begin
   // If grid is not empty...
   if (Sender as TTntDBGrid).SelectedField <> nil then begin
     // Set focus on DBMemo when user doubleclicks a (MEMO)-cell
-    if (sender as TTntDBGrid).SelectedField.IsBlob and (PageControlBlobEditors.ActivePage = tabBlobEditorText) then begin
-      PageControlBottom.ActivePage := tabBlobEditor;
+    if (sender as TTntDBGrid).SelectedField.IsBlob and (pageCtlEditors.ActivePage = tabEditorText) then begin
+      pageCtlBottom.ActivePage := tabEditors;
       DBMemo1.SetFocus;
     end;
   end;
@@ -4571,7 +4571,7 @@ procedure TMDIChild.btnBlobCopyClick(Sender: TObject);
 begin
   if dbmemo1.DataField = '' then exit;
   SaveBlob;
-  case PageControlBlobEditors.ActivePageIndex of
+  case pageCtlEditors.ActivePageIndex of
     0 : clipboard.astext := GetVisualDataset().FieldByName(DBMemo1.DataField).AsString;
     1 : EDBImage1.CopyToClipboard;
   end;
@@ -4986,19 +4986,16 @@ begin
       btnUnsafeEdit.Hint := s;
     end;
 
-    // Ensure visibility of the Blob-Editor
-    PageControlBottom.ActivePage := tabBlobEditor;
+    // Ensure visibility of the editors
+    pageCtlBottom.ActivePage := tabEditors;
 
     // Detect if we have picture-data in this BLOB and
     // if yes, bring the viewer in the BLOB-editor to the front
     if grid.Focused then begin
-      if EDBImage1.Picture.Height > 0 then
-      begin
-        PageControlBlobEditors.ActivePage := tabBlobEditorImage;
-      end
-      else
-      begin
-        PageControlBlobEditors.ActivePage := tabBlobEditorText;
+      if EDBImage1.Picture.Height > 0 then begin
+        pageCtlEditors.ActivePage := tabEditorImage
+      end else begin
+        pageCtlEditors.ActivePage := tabEditorText;
       end;
     end;
     ResizeImageToFit;
@@ -5023,7 +5020,7 @@ begin
     DBMemo1.Color := clWindow;
   end;
 
-  PageControlBlobEditorsChange(self);
+  PageCtlEditorsChange(self);
 end;
 
 
@@ -7021,4 +7018,4 @@ begin
 end;
 
 
-end.
+end.
\ No newline at end of file