diff --git a/GxColumns.bbj b/GxColumns.bbj
index 88400b11..225e6bce 100644
--- a/GxColumns.bbj
+++ b/GxColumns.bbj
@@ -119,6 +119,13 @@ class public GxColumnDefinition
     rem  */
     field public ArrayList ToolPanelClass! = new ArrayList()
     rem /**
+    rem  * Tooltip for the column header
+    rem  *
+    rem  * <br><b><small>#Configuration</small></b>
+    rem  * <br><b><small>#ColumnsRenderer</small></b>
+    rem  */
+    field public BBjString HeaderTooltip! = null()    
+    rem /**
     rem  * Set to true if you do not want this column or group to appear in the tool panel&#183;
     rem  *
     rem  * <br><b><small>#Configuration</small></b>
@@ -153,6 +160,7 @@ class public GxColumnDefinition
         json!.addProperty("headerClass" , iff(#getHeaderClass().size() <> 0 ,new Gson().toJson(#getHeaderClass()), listIsEmpty!) ,err=*next)
         json!.addProperty("toolPanelClass" , iff(#getToolPanelClass().size() <> 0 ,new Gson().toJson(#getToolPanelClass()) ,listIsEmpty!) ,err=*next)
         json!.addProperty("suppressToolPanel" , #getSuppressToolPanel().booleanValue() ,err=*next)
+        json!.addProperty("headerTooltip",#getHeaderTooltip(),err=*next)
         methodret json!
     methodend
 
@@ -278,13 +286,6 @@ class public GxDefaultColumnDefinition extends GxColumnDefinition
     rem  */
     field public BBjNumber Resizable! = 1
     rem /**
-    rem  * Tooltip for the column header
-    rem  *
-    rem  * <br><b><small>#Configuration</small></b>
-    rem  * <br><b><small>#ColumnsRenderer</small></b>
-    rem  */
-    field public BBjString HeaderTooltip! = null()
-    rem /**
     rem  * Set to true to render a selection checkbox in the column&#183;
     rem  *
     rem  * <br><b><small>#Configuration</small></b>
@@ -994,7 +995,6 @@ class public GxDefaultColumnDefinition extends GxColumnDefinition
         column!.addProperty("sortable",#getSortable().booleanValue(),err=*next)
         column!.addProperty("sort",#getSort(),err=*next)
         column!.addProperty("resizable",#getResizable().booleanValue(),err=*next)
-        column!.addProperty("headerTooltip",#getHeaderTooltip(),err=*next)
         column!.addProperty("checkboxSelection",#getCheckboxSelection().booleanValue(),err=*next)
         column!.addProperty("headerCheckboxSelection",#getHeaderCheckboxSelection().booleanValue(),err=*next)
         column!.addProperty("cellClass" , iff(#getCellClass().size() <> 0 ,new Gson().toJson(#getCellClass()), listIsEmpty!) ,err=*next)
@@ -1673,6 +1673,7 @@ class public GxDefaultColumnGroup extends GxColumnDefinition
     field public BBjNumber OpenByDefault! = 1
     rem /**
     rem  * Tooltip for the column group header
+    rem  * @deprecated use HeaderToolTip instead
     rem  */
     field public BBjString HeaderGroupTooltip! = null()
     rem /**
@@ -1686,7 +1687,7 @@ class public GxDefaultColumnGroup extends GxColumnDefinition
         group! = #super!.getAsJsonObject()
         group!.addProperty("marryChildren",#getMarryChildren().booleanValue(),err=*next)
         group!.addProperty("openByDefault",#getOpenByDefault().booleanValue(),err=*next)
-        group!.addProperty("headerGroupTooltip",#getHeaderGroupTooltip(),err=*next)
+        group!.addProperty("headerTooltip",#getHeaderGroupTooltip(),err=*next)
         methodret group!
     methodend