diff --git a/doc/src/classes.qdoc b/doc/src/classes.qdoc
index 91d5ad9..eb5ac31 100644
--- a/doc/src/classes.qdoc
+++ b/doc/src/classes.qdoc
@@ -32,8 +32,8 @@
                     <li><a href="qchart.html">QChart</a></li>
                     <li><a href="qchartview.html">QChartView</a></li>
                     <li><a href="qabstractaxis.html">QAbstractAxis</a></li>
-                    <li><a href="qvaluesaxis.html">QValuesAxis</a></li>
-                    <li><a href="qbarcategoriesaxis.html">QBarCategoriesAxis</a></li>                   
+                    <li><a href="qvalueaxis.html">QValueAxis</a></li>
+                    <li><a href="qbarcategoryaxis.html">QBarCategoryAxis</a></li>                   
                     <li><a href="qintervalsaxis.html">QIntervalsAxis</a></li>
                     <li><a href="qlegend.html">QLegend</a></li>
                     <li><a href="qabstractseries.html">QAbstractSeries</a></li>
diff --git a/src/axis/datetimeaxis/qdatetimeaxis.cpp b/src/axis/datetimeaxis/qdatetimeaxis.cpp
index f349369..c0e4009 100644
--- a/src/axis/datetimeaxis/qdatetimeaxis.cpp
+++ b/src/axis/datetimeaxis/qdatetimeaxis.cpp
@@ -92,12 +92,12 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 
 /*!
-  \property QDateTimeAxis::ticksCount
+  \property QDateTimeAxis::tickCount
   The number of tick marks for the axis.
 */
 
 /*!
-  \qmlproperty int ValuesAxis::ticksCount
+  \qmlproperty int ValuesAxis::tickCount
   The number of tick marks for the axis.
 */
 
@@ -186,7 +186,7 @@ void QDateTimeAxis::setRange(QDateTime min, QDateTime max)
 /*!
   Sets \a format string that is used when creating label for the axis out of the QDateTime object.
   Check QDateTime documentation for information on how the string should be defined.
-  \sa formatString()
+  \sa format()
 */
 void QDateTimeAxis::setFormat(QString format)
 {
@@ -197,7 +197,7 @@ void QDateTimeAxis::setFormat(QString format)
 /*!
   Returns the format string that is used when creating label for the axis out of the QDateTime object.
   Check QDateTime documentation for information on how the string should be defined.
-  \sa setFormatString()
+  \sa setFormat()
 */
 QString QDateTimeAxis::format() const
 {
@@ -218,7 +218,7 @@ void QDateTimeAxis::setTickCount(int count)
 }
 
 /*!
-  \fn int QDateTimeAxis::ticksCount() const
+  \fn int QDateTimeAxis::tickCount() const
   Return number of ticks on the axis
 */
 int QDateTimeAxis::tickCount() const
diff --git a/src/axis/valueaxis/qvalueaxis.cpp b/src/axis/valueaxis/qvalueaxis.cpp
index d62e721..4038ada 100644
--- a/src/axis/valueaxis/qvalueaxis.cpp
+++ b/src/axis/valueaxis/qvalueaxis.cpp
@@ -33,13 +33,13 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
     \brief The QValueAxis class is used for manipulating chart's axis.
     \mainclass
 
-    ValuesAxis can be setup to show axis line with tick marks, grid lines and shades.
+    ValueAxis can be setup to show axis line with tick marks, grid lines and shades.
     Values of axis are drawn to position of ticks
 */
 
 /*!
-    \qmlclass ValuesAxis QValueAxis
-    \brief The ValuesAxis element is used for manipulating chart's axes
+    \qmlclass ValueAxis QValueAxis
+    \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.
     Values of axis are drawn to position of ticks
@@ -47,7 +47,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
     To access Axes you can use ChartView API. For example:
     \code
         ChartView {
-            ValuesAxis {
+            ValueAxis {
                 id: xAxis
                 min: 0
                 max: 10
@@ -63,7 +63,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
   When setting this property the max is adjusted if necessary, to ensure that the range remains valid.
 */
 /*!
-  \qmlproperty real ValuesAxis::min
+  \qmlproperty real ValueAxis::min
   Defines the minimum value on the axis.
   When setting this property the max is adjusted if necessary, to ensure that the range remains valid.
 */
@@ -74,7 +74,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
   When setting this property the min is adjusted if necessary, to ensure that the range remains valid.
 */
 /*!
-  \qmlproperty real ValuesAxis::max
+  \qmlproperty real ValueAxis::max
   Defines the maximum value on the axis.
   When setting this property the min is adjusted if necessary, to ensure that the range remains valid.
 */
@@ -84,7 +84,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
   Axis emits signal when \a min of axis has changed.
 */
 /*!
-  \qmlsignal ValuesAxis::onMinChanged(real min)
+  \qmlsignal ValueAxis::onMinChanged(real min)
   Axis emits signal when \a min of axis has changed.
 */
 
@@ -93,7 +93,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
   Axis emits signal when \a max of axis has changed.
 */
 /*!
-  \qmlsignal ValuesAxis::onMaxChanged(real max)
+  \qmlsignal ValueAxis::onMaxChanged(real max)
   Axis emits signal when \a max of axis has changed.
 */
 
@@ -103,12 +103,12 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 
 /*!
-  \property QValueAxis::ticksCount
+  \property QValueAxis::tickCount
   The number of tick marks for the axis.
 */
 
 /*!
-  \qmlproperty int ValuesAxis::ticksCount
+  \qmlproperty int ValueAxis::tickCount
   The number of tick marks for the axis.
 */
 
@@ -118,7 +118,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 
 /*!
-  \qmlproperty bool ValuesAxis::niceNumbersEnabled
+  \qmlproperty bool ValueAxis::niceNumbersEnabled
   Whether the nice numbers algorithm is enabled or not for the axis.
 */
 
@@ -222,7 +222,7 @@ void QValueAxis::setTickCount(int count)
 }
 
 /*!
-  \fn int QValueAxis::ticksCount() const
+  \fn int QValueAxis::tickCount() const
   Return number of ticks on the axis
 */
 int QValueAxis::tickCount() const