diff --git a/demos/qmlcustommodel/qml/qmlcustommodel/main.qml b/demos/qmlcustommodel/qml/qmlcustommodel/main.qml
index f1069eb..9047369 100644
--- a/demos/qmlcustommodel/qml/qmlcustommodel/main.qml
+++ b/demos/qmlcustommodel/qml/qmlcustommodel/main.qml
@@ -39,8 +39,8 @@ Rectangle {
             max: "2014"
         }
 
-        ValuesAxis {
-            id: valuesAxis
+        ValueAxis {
+            id: valueAxis
             min: 0
             max: 60
         }
@@ -66,7 +66,7 @@ Rectangle {
             id: myBarSeries
             name: "Others"
             axisX: categoriesAxis
-            axisY: valuesAxis
+            axisY: valueAxis
             barWidth: 0.9
             visible: false
             HBarModelMapper {
@@ -83,7 +83,7 @@ Rectangle {
             id: lineSeries1
             name: "Volkswagen"
             axisX: categoriesAxis
-            axisY: valuesAxis
+            axisY: valueAxis
             visible: false
             HXYModelMapper {
                 model: customModel
@@ -98,7 +98,7 @@ Rectangle {
             id: lineSeries2
             name: "Toyota"
             axisX: categoriesAxis
-            axisY: valuesAxis
+            axisY: valueAxis
             visible: false
             HXYModelMapper {
                 model: customModel
@@ -112,7 +112,7 @@ Rectangle {
             id: lineSeries3
             name: "Ford"
             axisX: categoriesAxis
-            axisY: valuesAxis
+            axisY: valueAxis
             visible: false
             HXYModelMapper {
                 model: customModel
@@ -126,7 +126,7 @@ Rectangle {
             id: lineSeries4
             name: "Skoda"
             axisX: categoriesAxis
-            axisY: valuesAxis
+            axisY: valueAxis
             visible: false
             HXYModelMapper {
                 model: customModel
@@ -140,7 +140,7 @@ Rectangle {
             id: lineSeries5
             name: "Volvo"
             axisX: categoriesAxis
-            axisY: valuesAxis
+            axisY: valueAxis
             visible: false
             HXYModelMapper {
                 model: customModel
diff --git a/demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml b/demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml
index cc7b3c6..4fe942c 100644
--- a/demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml
+++ b/demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml
@@ -25,13 +25,13 @@ ChartView {
     id: chartView
     animationOptions: ChartView.NoAnimation
 
-    ValuesAxis {
+    ValueAxis {
         id: axisY
         min: -1
         max: 3
     }
 
-    ValuesAxis {
+    ValueAxis {
         id: axisX
         min: 0
         max: 1000
@@ -76,8 +76,6 @@ ChartView {
                 series.markerSize = 3;
                 series.borderColor = "transparent";
             }
-//            chartView.setAxisX(axisX, series);
-//            chartView.setAxisY(axisY, series);
         }
     }
 
diff --git a/demos/qmlweather/qml/qmlweather/main.qml b/demos/qmlweather/qml/qmlweather/main.qml
index 93ab3e1..472a284 100644
--- a/demos/qmlweather/qml/qmlweather/main.qml
+++ b/demos/qmlweather/qml/qmlweather/main.qml
@@ -44,36 +44,36 @@ Rectangle {
         BarSeries {
             id: myBarSeries
             axisX: barCategoriesAxis
-            axisY: valuesAxisY
+            axisY: valueAxisY
             BarSet {
                 id: rainfallSet
                 label: "Rainfall"
             }
         }
      
-        ValuesAxis {
-            id: valuesAxisX
+        ValueAxis {
+            id: valueAxisX
             min: 0
             max: 5
         }
 
-        ValuesAxis{
-            id: valuesAxisY
+        ValueAxis{
+            id: valueAxisY
             min: 0
             max: 10
         }
 
         LineSeries {
             id: maxTempSeries
-            axisX: valuesAxisX
-            axisY: valuesAxisY
+            axisX: valueAxisX
+            axisY: valueAxisY
             name: "Max. temperature"
         }
 
         LineSeries {
             id: minTempSeries
-            axisX: valuesAxisX
-            axisY: valuesAxisY
+            axisX: valueAxisX
+            axisY: valueAxisY
             name: "Min. temperature"
         }
     //![2]
@@ -165,9 +165,9 @@ Rectangle {
             //![5]
 
             // Update scale of the chart
-            valuesAxisY.max = Math.max(chartView.axisY().max,weatherObj.tempMaxC);
-            valuesAxisX.min = 0;
-            valuesAxisX.max = Number(i) + 1;
+            valueAxisY.max = Math.max(chartView.axisY().max,weatherObj.tempMaxC);
+            valueAxisX.min = 0;
+            valueAxisX.max = Number(i) + 1;
 
             // Set the x-axis labels to the dates of the forecast
             var xLabels = barCategoriesAxis.categories;
diff --git a/plugins/declarative/plugin.cpp b/plugins/declarative/plugin.cpp
index 20ef0f7..024d84a 100644
--- a/plugins/declarative/plugin.cpp
+++ b/plugins/declarative/plugin.cpp
@@ -71,7 +71,7 @@ public:
         qmlRegisterType<QVPieModelMapper>(uri, 1, 0, "VPieModelMapper");
         qmlRegisterType<QHBarModelMapper>(uri, 1, 0, "HBarModelMapper");
         qmlRegisterType<QVBarModelMapper>(uri, 1, 0, "VBarModelMapper");
-        qmlRegisterType<QValueAxis>(uri, 1, 0, "ValuesAxis");
+        qmlRegisterType<QValueAxis>(uri, 1, 0, "ValueAxis");
         qmlRegisterType<QBarCategoryAxis>(uri, 1, 0, "BarCategoriesAxis");
 
         qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend",
diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/Chart.qml b/tests/qmlchartaxis/qml/qmlchartaxis/Chart.qml
index 82109ed..820e05c 100644
--- a/tests/qmlchartaxis/qml/qmlchartaxis/Chart.qml
+++ b/tests/qmlchartaxis/qml/qmlchartaxis/Chart.qml
@@ -66,7 +66,7 @@ ChartView {
     legend.onLabelColorChanged:        console.log("legend.onLabelColorChanged: " + color);
 
 
-    ValuesAxis{
+    ValueAxis{
     onColorChanged:               console.log("axisX.onColorChanged: " + color);
     onLabelsVisibleChanged:       console.log("axisX.onLabelsVisibleChanged: " + visible);
     onLabelsColorChanged:         console.log("axisX.onLabelsColorChanged: " + color);
@@ -79,7 +79,7 @@ ChartView {
     onMaxChanged:                 console.log("axisX.onMaxChanged: " + max);
     }
     
-    ValuesAxis{
+    ValueAxis{
     onColorChanged:               console.log("axisY.onColorChanged: " + color);
     onLabelsVisibleChanged:       console.log("axisY.onLabelsVisibleChanged: " + visible);
     onLabelsColorChanged:         console.log("axisY.onLabelsColorChanged: " + color);
diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/Chart1.qml b/tests/qmlchartaxis/qml/qmlchartaxis/Chart1.qml
index 03266a2..8f1817a 100644
--- a/tests/qmlchartaxis/qml/qmlchartaxis/Chart1.qml
+++ b/tests/qmlchartaxis/qml/qmlchartaxis/Chart1.qml
@@ -24,13 +24,13 @@ import QtCommercial.Chart 1.0
 ChartView {
     title: "user defined axes"
 
-    ValuesAxis {
+    ValueAxis {
         id: axisX
         min: 0
         max: 10
     }
 
-    ValuesAxis {
+    ValueAxis {
         id: axisY
         min: 0
         max: 6
diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/Chart2.qml b/tests/qmlchartaxis/qml/qmlchartaxis/Chart2.qml
index 4fa43e6..02c67e2 100644
--- a/tests/qmlchartaxis/qml/qmlchartaxis/Chart2.qml
+++ b/tests/qmlchartaxis/qml/qmlchartaxis/Chart2.qml
@@ -25,7 +25,7 @@ ChartView {
     id: chartView
     title: "user defined axes"
 
-    ValuesAxis {
+    ValueAxis {
         id: axisX
         min: 0
         max: 10
@@ -33,7 +33,7 @@ ChartView {
         // that don't have user defined X axis
     }
 
-    ValuesAxis {
+    ValueAxis {
         id: axisY
         min: 0
         max: 5
diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/Chart4.qml b/tests/qmlchartaxis/qml/qmlchartaxis/Chart4.qml
index bff025c..fcfed77 100644
--- a/tests/qmlchartaxis/qml/qmlchartaxis/Chart4.qml
+++ b/tests/qmlchartaxis/qml/qmlchartaxis/Chart4.qml
@@ -55,8 +55,8 @@ ChartView {
     LineSeries {
         id: lineSeries
         name: "line series"
-        axisX: ValuesAxis { id: lineAxisX }
-        axisY: ValuesAxis { id: lineAxisY }
+        axisX: ValueAxis { id: lineAxisX }
+        axisY: ValueAxis { id: lineAxisY }
 
         XYPoint { x: 0; y: 0 }
         XYPoint { x: 1.1; y: 2.1 }
@@ -70,8 +70,8 @@ ChartView {
     ScatterSeries {
         id: scatterSeries
         name: "scatter series"
-        axisX: ValuesAxis { id: scatterAxisX }
-        axisY: ValuesAxis { id: scatterAxisY }
+        axisX: ValueAxis { id: scatterAxisX }
+        axisY: ValueAxis { id: scatterAxisY }
 
         XYPoint { x: 0; y: 0 }
         XYPoint { x: 1.1; y: 2.1 }
diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/Chart6.qml b/tests/qmlchartaxis/qml/qmlchartaxis/Chart6.qml
index c4eed18..47090d4 100644
--- a/tests/qmlchartaxis/qml/qmlchartaxis/Chart6.qml
+++ b/tests/qmlchartaxis/qml/qmlchartaxis/Chart6.qml
@@ -30,21 +30,21 @@ ChartView {
         repeat: true
         running: true
         onTriggered: {
-            if (lineSeries.axisX == valuesAxis1)
-                lineSeries.axisX = valuesAxis2;
+            if (lineSeries.axisX == valueAxis1)
+                lineSeries.axisX = valueAxis2;
             else
-                lineSeries.axisX = valuesAxis1;
+                lineSeries.axisX = valueAxis1;
         }
     }
 
-    ValuesAxis {
-        id: valuesAxis1
+    ValueAxis {
+        id: valueAxis1
         min: 0
         max: 5
     }
 
-    ValuesAxis {
-        id: valuesAxis2
+    ValueAxis {
+        id: valueAxis2
         min: 1
         max: 6
     }
@@ -52,7 +52,7 @@ ChartView {
     LineSeries {
         id: lineSeries
         name: "line series"
-        axisX: valuesAxis1
+        axisX: valueAxis1
         XYPoint { x: 0; y: 0 }
         XYPoint { x: 1.1; y: 2.1 }
         XYPoint { x: 1.9; y: 3.3 }
diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml
index 82109ed..820e05c 100644
--- a/tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml
+++ b/tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml
@@ -66,7 +66,7 @@ ChartView {
     legend.onLabelColorChanged:        console.log("legend.onLabelColorChanged: " + color);
 
 
-    ValuesAxis{
+    ValueAxis{
     onColorChanged:               console.log("axisX.onColorChanged: " + color);
     onLabelsVisibleChanged:       console.log("axisX.onLabelsVisibleChanged: " + visible);
     onLabelsColorChanged:         console.log("axisX.onLabelsColorChanged: " + color);
@@ -79,7 +79,7 @@ ChartView {
     onMaxChanged:                 console.log("axisX.onMaxChanged: " + max);
     }
     
-    ValuesAxis{
+    ValueAxis{
     onColorChanged:               console.log("axisY.onColorChanged: " + color);
     onLabelsVisibleChanged:       console.log("axisY.onLabelsVisibleChanged: " + visible);
     onLabelsColorChanged:         console.log("axisY.onLabelsColorChanged: " + color);