diff --git a/docs/xml/lcl/comctrls.xml b/docs/xml/lcl/comctrls.xml
index 25707b00fe..b8232b9a82 100644
--- a/docs/xml/lcl/comctrls.xml
+++ b/docs/xml/lcl/comctrls.xml
@@ -1323,24 +1323,24 @@
         <short/>
       </element>
       <!-- enumeration type Visibility: default -->
-      <element name="TNoteBookOption">
+      <element name="TCTabControlOption">
         <short>
-          <var>TNoteBookOption</var> - Show the close button on a tab, allow multi-line tabs</short>
+          <var>TCTabControlOption</var> - Show the close button on a tab, allow multi-line tabs</short>
         <descr/>
         <seealso/>
       </element>
       <!-- enumeration value Visibility: default -->
-      <element name="TNoteBookOption.nboShowCloseButtons">
+      <element name="TCTabControlOption.nboShowCloseButtons">
         <short/>
       </element>
       <!-- enumeration value Visibility: default -->
-      <element name="TNoteBookOption.nboMultiLine">
+      <element name="TCTabControlOption.nboMultiLine">
         <short/>
       </element>
       <!-- set type Visibility: default -->
-      <element name="TNoteBookOptions">
+      <element name="TCTabControlOptions">
         <short>
-          <var>TNoteBookOptions</var> - set of <var>TNoteBookOption</var>
+          <var>TCTabControlOptions</var> - set of <var>TCTabControlOption</var>
         </short>
         <descr/>
         <seealso/>
@@ -2149,14 +2149,14 @@
         <short>
           <var>GetCapabilities</var> - returns the set of capabilities</short>
       </element>
-      <element name="TNoteBookCapability">
+      <element name="TCTabControlCapability">
         <short>
-          <var>TNoteBookCapability</var> - enumerated type containing possible capabilities of a notebook</short>
-        <descr>nbcShowCloseButtons, nbcMultiLine, nbcPageListPopup</descr>
+          <var>TCTabControlCapability</var> - enumerated type containing possible capabilities of a notebook</short>
+        <descr>nbcShowCloseButtons, nbcMultiLine, nbcPageListPopup, nbcShowAddTabButton</descr>
       </element>
-      <element name="TNoteBookCapabilities">
+      <element name="TCTabControlCapabilities">
         <short>
-          <var>TNoteBookCapabilities</var> - set of <var>TNoteBookCapability</var>
+          <var>TCTabControlCapabilities</var> - set of <var>TCTabControlCapability</var>
         </short>
       </element>
       <!-- enumeration type Visibility: default -->
diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp
index eb046b4b81..a284333425 100644
--- a/ide/sourceeditor.pp
+++ b/ide/sourceeditor.pp
@@ -801,7 +801,7 @@ type
               deprecated {$IFDEF VER2_5}'use SourceEditorManager'{$ENDIF};       // deprecated in 0.9.29 March 2010
 
   public
-    function GetCapabilities: TNoteBookCapabilities;
+    function GetCapabilities: TCTabControlCapabilities;
     procedure IncUpdateLock;
     procedure DecUpdateLock;
 
@@ -5965,7 +5965,7 @@ begin
     Manager.OnCurrentCodeBufferChanged(Self);
 end;
 
-function TSourceNotebook.GetCapabilities: TNoteBookCapabilities;
+function TSourceNotebook.GetCapabilities: TCTabControlCapabilities;
 begin
   Result := FNotebook.GetCapabilities
 end;
diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp
index f632bc6c43..041445aa36 100644
--- a/lcl/comctrls.pp
+++ b/lcl/comctrls.pp
@@ -297,12 +297,20 @@ type
   TTabGetImageEvent = procedure(Sender: TObject; TabIndex: Integer;
     var ImageIndex: Integer) of object;
 
-  TNoteBookOption = (
+  // These are LCL additions
+  TCTabControlOption = (
     nboShowCloseButtons, nboMultiLine, nboHidePageListPopup,
-    nboKeyboardTabSwitch);
-  TNoteBookOptions = set of TNoteBookOption;
-  TNoteBookCapability = (nbcShowCloseButtons, nbcMultiLine, nbcPageListPopup);
-  TNoteBookCapabilities = set of TNoteBookCapability;
+    nboKeyboardTabSwitch, nboShowAddTabButton);
+  TCTabControlOptions = set of TCTabControlOption;
+  TCTabControlCapability = (nbcShowCloseButtons, nbcMultiLine, nbcPageListPopup, nbcShowAddTabButton);
+  TCTabControlCapabilities = set of TCTabControlCapability;
+  // Don't use anymore the old names of these types
+  // TNotebook is unrelated to CustomTabControl, so the types were renamed to
+  // better names
+  TNoteBookOption = TCTabControlOption deprecated;
+  TNoteBookOptions = TCTabControlOptions deprecated;
+  TNoteBookCapability = TCTabControlCapability deprecated;
+  TNoteBookCapabilities = TCTabControlCapabilities deprecated;
 
   TDrawTabEvent = procedure(Control: TCustomTabControl; TabIndex: Integer;
     const Rect: TRect; Active: Boolean) of object;
@@ -321,7 +329,7 @@ type
     FOnDrawTab: TDrawTabEvent;
     FOnGetImageIndex: TTabGetImageEvent;
     FOnPageChanged: TNotifyEvent;
-    FOptions: TNoteBookOptions;
+    FOptions: TCTabControlOptions;
     FOwnerDraw: Boolean;
     FPageIndex: Integer;
     FPageIndexOnLastChange: integer;// needed for unique OnChange events
@@ -352,7 +360,7 @@ type
     procedure SetActivePage(const Value: String);
     procedure SetActivePageComponent(const AValue: TCustomPage);
     procedure SetImages(const AValue: TImageList);
-    procedure SetOptions(const AValue: TNoteBookOptions);
+    procedure SetOptions(const AValue: TCTabControlOptions);
     procedure SetPageIndex(AValue: Integer);
     procedure SetPages(AValue: TStrings);
     procedure SetShowTabs(AValue: Boolean);
@@ -423,7 +431,7 @@ type
                                              write FOnCloseTabClicked;
     property OnGetImageIndex: TTabGetImageEvent read FOnGetImageIndex
                                                 write FOnGetImageIndex;
-    property Options: TNoteBookOptions read FOptions write SetOptions default [];
+    property Options: TCTabControlOptions read FOptions write SetOptions default [];
     property Page[Index: Integer]: TCustomPage read GetPage;
     property PageCount: integer read GetPageCount;
     property PageIndex: Integer read FPageIndex write SetPageIndex default -1;
diff --git a/lcl/include/customnotebook.inc b/lcl/include/customnotebook.inc
index c559018f08..a2bebb165b 100644
--- a/lcl/include/customnotebook.inc
+++ b/lcl/include/customnotebook.inc
@@ -501,9 +501,9 @@ begin
   UpdateTabProperties;
 end;
 
-procedure TCustomTabControl.SetOptions(const AValue: TNoteBookOptions);
+procedure TCustomTabControl.SetOptions(const AValue: TCTabControlOptions);
 var
-  ChangedOptions: TNoteBookOptions;
+  ChangedOptions: TCTabControlOptions;
 begin
   if FOptions = AValue then Exit;
   ChangedOptions := (FOptions - AValue) + (AValue - FOptions);
diff --git a/lcl/interfaces/gtk2/gtk2pagecontrol.inc b/lcl/interfaces/gtk2/gtk2pagecontrol.inc
index 4e2f915400..530f091eee 100644
--- a/lcl/interfaces/gtk2/gtk2pagecontrol.inc
+++ b/lcl/interfaces/gtk2/gtk2pagecontrol.inc
@@ -349,7 +349,7 @@ begin
   UpdateNoteBookClientWidget(ATabControl);
 end;
 
-class function TGtk2WSCustomTabControl.GetCapabilities: TNoteBookCapabilities;
+class function TGtk2WSCustomTabControl.GetCapabilities: TCTabControlCapabilities;
 begin
   Result:=[nbcPageListPopup, nbcShowCloseButtons];
 end;
diff --git a/lcl/interfaces/gtk2/gtk2wscomctrls.pp b/lcl/interfaces/gtk2/gtk2wscomctrls.pp
index fdbcf1c18e..2547baf10d 100644
--- a/lcl/interfaces/gtk2/gtk2wscomctrls.pp
+++ b/lcl/interfaces/gtk2/gtk2wscomctrls.pp
@@ -89,7 +89,7 @@ type
     class procedure MovePage(const ATabControl: TCustomTabControl;
       const AChild: TCustomPage; const NewIndex: integer); override;
 
-    class function GetCapabilities: TNoteBookCapabilities; override;
+    class function GetCapabilities: TCTabControlCapabilities; override;
     class function GetNotebookMinTabHeight(const AWinControl: TWinControl): integer; override;
     class function GetNotebookMinTabWidth(const AWinControl: TWinControl): integer; override;
     class function GetTabIndexAtPos(const ATabControl: TCustomTabControl; const AClientPos: TPoint): integer; override;
diff --git a/lcl/interfaces/qt/qtpagecontrol.inc b/lcl/interfaces/qt/qtpagecontrol.inc
index 7afbef962f..46c5e6d16c 100644
--- a/lcl/interfaces/qt/qtpagecontrol.inc
+++ b/lcl/interfaces/qt/qtpagecontrol.inc
@@ -164,7 +164,7 @@ begin
   end;
 end;
 
-class function TQtWSCustomTabControl.GetCapabilities: TNoteBookCapabilities;
+class function TQtWSCustomTabControl.GetCapabilities: TCTabControlCapabilities;
 begin
   Result := [nbcShowCloseButtons];
 end;
diff --git a/lcl/interfaces/qt/qtwscomctrls.pp b/lcl/interfaces/qt/qtwscomctrls.pp
index e30ba87333..89554237e1 100644
--- a/lcl/interfaces/qt/qtwscomctrls.pp
+++ b/lcl/interfaces/qt/qtwscomctrls.pp
@@ -62,7 +62,7 @@ type
     class procedure RemovePage(const ATabControl: TCustomTabControl;
       const AIndex: integer); override;
 
-    class function GetCapabilities: TNotebookCapabilities; override;
+    class function GetCapabilities: TCTabControlCapabilities; override;
     class function GetDesignInteractive(const AWinControl: TWinControl; AClientPos: TPoint): Boolean; override;
     class function GetTabIndexAtPos(const ATabControl: TCustomTabControl; const AClientPos: TPoint): integer; override;
     class function GetTabRect(const ATabControl: TCustomTabControl; const AIndex: Integer): TRect; override;
diff --git a/lcl/interfaces/win32/win32pagecontrol.inc b/lcl/interfaces/win32/win32pagecontrol.inc
index 6f3f9f79f7..8795b6b927 100644
--- a/lcl/interfaces/win32/win32pagecontrol.inc
+++ b/lcl/interfaces/win32/win32pagecontrol.inc
@@ -508,7 +508,7 @@ begin
     Result := inherited GetTabRect(ATabControl, AIndex);
 end;
 
-class function TWin32WSCustomNotebook.GetCapabilities: TNoteBookCapabilities;
+class function TWin32WSCustomNotebook.GetCapabilities: TCTabControlCapabilities;
 begin
   Result:=[nbcMultiLine];
 end;
diff --git a/lcl/interfaces/win32/win32wscomctrls.pp b/lcl/interfaces/win32/win32wscomctrls.pp
index a5606f4b23..586c9a2260 100644
--- a/lcl/interfaces/win32/win32wscomctrls.pp
+++ b/lcl/interfaces/win32/win32wscomctrls.pp
@@ -72,7 +72,7 @@ type
 
     class function GetTabIndexAtPos(const ATabControl: TCustomTabControl; const AClientPos: TPoint): integer; override;
     class function GetTabRect(const ATabControl: TCustomTabControl; const AIndex: Integer): TRect; override;
-    class function GetCapabilities: TNoteBookCapabilities;override;
+    class function GetCapabilities: TCTabControlCapabilities;override;
     class function GetDesignInteractive(const AWinControl: TWinControl; AClientPos: TPoint): Boolean; override;
     class procedure SetImageList(const ATabControl: TCustomTabControl; const AImageList: TCustomImageList); override;
     class procedure SetPageIndex(const ATabControl: TCustomTabControl; const AIndex: integer); override;
diff --git a/lcl/interfaces/wince/wincepagecontrol.inc b/lcl/interfaces/wince/wincepagecontrol.inc
index ddf3cc693b..4e0ed54678 100644
--- a/lcl/interfaces/wince/wincepagecontrol.inc
+++ b/lcl/interfaces/wince/wincepagecontrol.inc
@@ -426,7 +426,7 @@ begin
     Result := inherited GetTabRect(ATabControl, AIndex);
 end;
 
-class function TWinCEWSCustomNotebook.GetCapabilities: TNoteBookCapabilities;
+class function TWinCEWSCustomNotebook.GetCapabilities: TCTabControlCapabilities;
 begin
   Result:=[];
 end;
diff --git a/lcl/interfaces/wince/wincewscomctrls.pp b/lcl/interfaces/wince/wincewscomctrls.pp
index d34947046b..0db59f9fdf 100644
--- a/lcl/interfaces/wince/wincewscomctrls.pp
+++ b/lcl/interfaces/wince/wincewscomctrls.pp
@@ -68,7 +68,7 @@ type
 
     class function GetTabIndexAtPos(const ATabControl: TCustomTabControl; const AClientPos: TPoint): integer; override;
     class function GetTabRect(const ATabControl: TCustomTabControl; const AIndex: Integer): TRect; override;
-    class function GetCapabilities: TNoteBookCapabilities;override;
+    class function GetCapabilities: TCTabControlCapabilities;override;
     class function GetDesignInteractive(const AWinControl: TWinControl; AClientPos: TPoint): Boolean; override;
     class procedure SetImageList(const ATabControl: TCustomTabControl; const AImageList: TCustomImageList); override;
     class procedure SetPageIndex(const ATabControl: TCustomTabControl; const AIndex: integer); override;
diff --git a/lcl/widgetset/wscomctrls.pp b/lcl/widgetset/wscomctrls.pp
index e075cfbab6..162a08d33a 100644
--- a/lcl/widgetset/wscomctrls.pp
+++ b/lcl/widgetset/wscomctrls.pp
@@ -70,7 +70,7 @@ type
     class function GetNotebookMinTabWidth(const AWinControl: TWinControl): integer; virtual;
     class function GetTabIndexAtPos(const ATabControl: TCustomTabControl; const AClientPos: TPoint): integer; virtual;
     class function GetTabRect(const ATabControl: TCustomTabControl; const AIndex: Integer): TRect; virtual;
-    class function GetCapabilities: TNoteBookCapabilities; virtual;
+    class function GetCapabilities: TCTabControlCapabilities; virtual;
     class procedure SetImageList(const ATabControl: TCustomTabControl; const AImageList: TCustomImageList); virtual;
     class procedure SetPageIndex(const ATabControl: TCustomTabControl; const AIndex: integer); virtual;
     class procedure SetTabCaption(const ATabControl: TCustomTabControl; const AChild: TCustomPage; const AText: string); virtual;
@@ -350,7 +350,7 @@ begin
   Result := Rect(-1,-1,-1,-1);
 end;
 
-class function TWSCustomTabControl.GetCapabilities: TNoteBookCapabilities;
+class function TWSCustomTabControl.GetCapabilities: TCTabControlCapabilities;
 begin
   Result:=[];
 end;