diff --git a/doc/src/qml.qdoc b/doc/src/qml.qdoc
index 4bf5eef..dc8cf39 100644
--- a/doc/src/qml.qdoc
+++ b/doc/src/qml.qdoc
@@ -19,8 +19,8 @@
                     <ul>
                     <li><a href="qml-chartview.html">ChartView</a></li>
                     <li><a href="qml-abstractaxis.html">AbstractAxis</a></li>
-                    <li><a href="qml-valuesaxis.html">ValuesAxis</a></li>
-                    <li><a href="qml-barcategoriesaxis.html">BarCategoriesAxis</a></li>
+                    <li><a href="qml-valueaxis.html">ValueAxis</a></li>
+                    <li><a href="qml-barcategoryaxis.html">BarCategoryAxis</a></li>
                     <li><a href="qml-legend.html">Legend</a></li>
                     <li><a href="qml-abstractseries.html">AbstractSeries</a></li>
                     </ul>
diff --git a/plugins/declarative/declarativechart.cpp b/plugins/declarative/declarativechart.cpp
index f748b01..351be3f 100644
--- a/plugins/declarative/declarativechart.cpp
+++ b/plugins/declarative/declarativechart.cpp
@@ -173,25 +173,25 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 /*!
   \qmlmethod ChartView::scrollLeft(real pixels)
   Scrolls to left by \a pixels. This is a convenience function that suits for example for key navigation.
-  \sa ValueAxis::min, ValueAxis::max, BarCategoriesAxis::min, BarCategoriesAxis::max
+  \sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max
 */
 
 /*!
   \qmlmethod ChartView::scrollRight(real pixels)
   Scrolls to right by \a pixels. This is a convenience function that suits for example for key navigation.
-  \sa ValueAxis::min, ValueAxis::max, BarCategoriesAxis::min, BarCategoriesAxis::max
+  \sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max
 */
 
 /*!
   \qmlmethod ChartView::scrollUp(real pixels)
   Scrolls up by \a pixels. This is a convenience function that suits for example for key navigation.
-  \sa ValueAxis::min, ValueAxis::max, BarCategoriesAxis::min, BarCategoriesAxis::max
+  \sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max
 */
 
 /*!
   \qmlmethod ChartView::scrollDown(real pixels)
   Scrolls down by \a pixels. This is a convenience function that suits for example for key navigation.
-  \sa ValueAxis::min, ValueAxis::max, BarCategoriesAxis::min, BarCategoriesAxis::max
+  \sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max
 */
 
 /*!
diff --git a/src/axis/barcategoryaxis/qbarcategoryaxis.cpp b/src/axis/barcategoryaxis/qbarcategoryaxis.cpp
index 686af93..931af50 100644
--- a/src/axis/barcategoryaxis/qbarcategoryaxis.cpp
+++ b/src/axis/barcategoryaxis/qbarcategoryaxis.cpp
@@ -32,22 +32,23 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
     \brief The QBarCategoryAxis class is used for manipulating chart's axis.
     \mainclass
 
-    BarCategoriesAxis can be setup to show axis line with tick marks, grid lines and shades.
+    BarCategoryAxis can be setup to show axis line with tick marks, grid lines and shades.
     Categories are drawn between ticks. Note that you can use this also with lineseries too.
     See the \l {Line and BarChart Example} {Line and BarChart Example} to learn how to do that.
 */
 
 /*!
-    \qmlclass BarCategoriesAxis QBarCategoryAxis
+    \qmlclass BarCategoryAxis QBarCategoryAxis
+    \inherits AbstractAxis
     \brief The Axis element is used for manipulating chart's axes.
 
     Axis can be setup to show axis line with tick marks, grid lines and shades.
     Categories are drawn between ticks. Note that you can use this also with lineseries too.
 
-    To access BarCategoriesAxis you can use ChartView API. For example:
+    To access BarCategoryAxis you can use ChartView API. For example:
     \code
         ChartView {
-            BarCategoriesAxis {
+            BarCategoryAxis {
                 id: categoryAxis
                 categories: ["Jan", "Feb", "Mar", "Apr", "May", "Jun" ]
             }
@@ -61,7 +62,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
   Defines the categories of axis
 */
 /*!
-  \qmlproperty QStringList BarCategoriesAxis::categories
+  \qmlproperty QStringList BarCategoryAxis::categories
   Defines the categories of axis
 */
 
@@ -70,7 +71,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
   Defines the minimum value on the axis.
 */
 /*!
-  \qmlproperty QString BarCategoriesAxis::min
+  \qmlproperty QString BarCategoryAxis::min
   Defines the minimum value on the axis.
 */
 
@@ -79,7 +80,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
   Defines the maximum value on the axis.
 */
 /*!
-  \qmlproperty QString BarCategoriesAxis::max
+  \qmlproperty QString BarCategoryAxis::max
   Defines the maximum value on the axis.
 */
 
@@ -93,7 +94,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
   Axis emits signal when \a min of axis has changed.
 */
 /*!
-  \qmlsignal BarCategoriesAxis::onMinChanged(const QString &min)
+  \qmlsignal BarCategoryAxis::onMinChanged(const QString &min)
   Axis emits signal when \a min of axis has changed.
 */
 
@@ -102,7 +103,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
   Axis emits signal when \a max of axis has changed.
 */
 /*!
-  \qmlsignal BarCategoriesAxis::onMaxChanged(const QString &max)
+  \qmlsignal BarCategoryAxis::onMaxChanged(const QString &max)
   Axis emits signal when \a max of axis has changed.
 */
 
diff --git a/src/axis/categoryaxis/qcategoryaxis.cpp b/src/axis/categoryaxis/qcategoryaxis.cpp
index 0712b4c..38776e1 100644
--- a/src/axis/categoryaxis/qcategoryaxis.cpp
+++ b/src/axis/categoryaxis/qcategoryaxis.cpp
@@ -37,6 +37,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 /*!
     \qmlclass CategoryAxis QCategoryAxis
+    \inherits AbstractAxis
     \brief The QCategoryAxis class allows putting a named ranges on the axis.
 */
 
diff --git a/src/axis/valueaxis/qvalueaxis.cpp b/src/axis/valueaxis/qvalueaxis.cpp
index b809058..869f644 100644
--- a/src/axis/valueaxis/qvalueaxis.cpp
+++ b/src/axis/valueaxis/qvalueaxis.cpp
@@ -39,6 +39,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 /*!
     \qmlclass ValueAxis QValueAxis
+    \inherits AbstractAxis
     \brief The ValueAxis element is used for manipulating chart's axes
 
     ValueAxis can be setup to show axis line with tick marks, grid lines and shades.