diff --git a/plugins/declarative/plugin.cpp b/plugins/declarative/plugin.cpp
index c80000e..fa60094 100644
--- a/plugins/declarative/plugin.cpp
+++ b/plugins/declarative/plugin.cpp
@@ -22,7 +22,7 @@
 #include <QtDeclarative/qdeclarative.h>
 #include "qchart.h"
 #include "qabstractaxis.h"
-#include "qvaluesaxis.h"
+#include "qvalueaxis.h"
 #include "qbarcategoriesaxis.h"
 #include "declarativechart.h"
 #include "declarativexypoint.h"
diff --git a/src/areachart/qareaseries.cpp b/src/areachart/qareaseries.cpp
index f07d6d5..a1b7319 100644
--- a/src/areachart/qareaseries.cpp
+++ b/src/areachart/qareaseries.cpp
@@ -26,7 +26,7 @@
 #include "domain_p.h"
 #include "chartdataset_p.h"
 #include "charttheme_p.h"
-#include "qvaluesaxis.h"
+#include "qvalueaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/src/axis/axis.pri b/src/axis/axis.pri
index ce49d17..f4c8a42 100644
--- a/src/axis/axis.pri
+++ b/src/axis/axis.pri
@@ -1,13 +1,13 @@
 #Subdirectiores are defined here, because qt creator doesn't handle nested include(foo.pri) chains very well.
 
 INCLUDEPATH += $$PWD \
-    $$PWD/valuesaxis \
+    $$PWD/valueaxis \
     $$PWD/categoriesaxis \
     $$PWD/intervalsaxis \
     $$PWD/datetimeaxis
 
 DEPENDPATH += $$PWD \
-    $$PWD/valuesaxis \
+    $$PWD/valueaxis \
     $$PWD/categoriesaxis \
     $$PWD/intervalsaxis \
     $$PWD/datetimeaxis
@@ -15,9 +15,9 @@ DEPENDPATH += $$PWD \
 SOURCES += \
     $$PWD/chartaxis.cpp \
     $$PWD/qabstractaxis.cpp \
-    $$PWD/valuesaxis/chartvaluesaxisx.cpp \
-    $$PWD/valuesaxis/chartvaluesaxisy.cpp \
-    $$PWD/valuesaxis/qvaluesaxis.cpp \
+    $$PWD/valueaxis/chartvalueaxisx.cpp \
+    $$PWD/valueaxis/chartvalueaxisy.cpp \
+    $$PWD/valueaxis/qvalueaxis.cpp \
     $$PWD/categoriesaxis/chartcategoriesaxisx.cpp \
     $$PWD/categoriesaxis/chartcategoriesaxisy.cpp \
     $$PWD/categoriesaxis/qbarcategoriesaxis.cpp \
@@ -31,9 +31,9 @@ SOURCES += \
 PRIVATE_HEADERS += \
     $$PWD/chartaxis_p.h \
     $$PWD/qabstractaxis_p.h \
-    $$PWD/valuesaxis/chartvaluesaxisx_p.h \
-    $$PWD/valuesaxis/chartvaluesaxisy_p.h \
-    $$PWD/valuesaxis/qvaluesaxis_p.h \
+    $$PWD/valueaxis/chartvalueaxisx_p.h \
+    $$PWD/valueaxis/chartvalueaxisy_p.h \
+    $$PWD/valueaxis/qvalueaxis_p.h \
     $$PWD/categoriesaxis/chartcategoriesaxisx_p.h \
     $$PWD/categoriesaxis/chartcategoriesaxisy_p.h \
     $$PWD/categoriesaxis/qbarcategoriesaxis_p.h \
@@ -46,7 +46,7 @@ PRIVATE_HEADERS += \
 
 PUBLIC_HEADERS += \
     $$PWD/qabstractaxis.h \
-    $$PWD/valuesaxis/qvaluesaxis.h \
+    $$PWD/valueaxis/qvalueaxis.h \
     $$PWD/categoriesaxis/qbarcategoriesaxis.h \
     $$PWD/intervalsaxis/qintervalsaxis.h \
     $$PWD/datetimeaxis/qdatetimeaxis.h
diff --git a/src/axis/intervalsaxis/qintervalsaxis.h b/src/axis/intervalsaxis/qintervalsaxis.h
index 234ee1e..982276a 100644
--- a/src/axis/intervalsaxis/qintervalsaxis.h
+++ b/src/axis/intervalsaxis/qintervalsaxis.h
@@ -22,7 +22,7 @@
 #define QCATEGORIESAXIS_H
 
 #include "qabstractaxis.h"
-#include "qvaluesaxis.h"
+#include "qvalueaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/src/axis/intervalsaxis/qintervalsaxis_p.h b/src/axis/intervalsaxis/qintervalsaxis_p.h
index a4349eb..cf858d4 100644
--- a/src/axis/intervalsaxis/qintervalsaxis_p.h
+++ b/src/axis/intervalsaxis/qintervalsaxis_p.h
@@ -31,7 +31,7 @@
 #define QIntervalsAxis_P_H
 
 #include "qintervalsaxis.h"
-#include "qvaluesaxis_p.h"
+#include "qvalueaxis_p.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/src/axis/valuesaxis/chartvaluesaxisx.cpp b/src/axis/valueaxis/chartvalueaxisx.cpp
similarity index 92%
rename from src/axis/valuesaxis/chartvaluesaxisx.cpp
rename to src/axis/valueaxis/chartvalueaxisx.cpp
index f5c1e73..693270a 100644
--- a/src/axis/valuesaxis/chartvaluesaxisx.cpp
+++ b/src/axis/valueaxis/chartvalueaxisx.cpp
@@ -18,10 +18,10 @@
 **
 ****************************************************************************/
 
-#include "chartvaluesaxisx_p.h"
+#include "chartvalueaxisx_p.h"
 #include "qabstractaxis.h"
 #include "chartpresenter_p.h"
-#include "qvaluesaxis.h"
+#include "qvalueaxis.h"
 #include <QGraphicsLayout>
 #include <QFontMetrics>
 #include <qmath.h>
@@ -30,16 +30,16 @@ static int label_padding = 5;
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-ChartValuesAxisX::ChartValuesAxisX(QAbstractAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter),
+ChartValueAxisX::ChartValueAxisX(QAbstractAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter),
 m_tickCount(0)
 {
 }
 
-ChartValuesAxisX::~ChartValuesAxisX()
+ChartValueAxisX::~ChartValueAxisX()
 {
 }
 
-QVector<qreal> ChartValuesAxisX::calculateLayout() const
+QVector<qreal> ChartValueAxisX::calculateLayout() const
 {
     Q_ASSERT(m_tickCount>=2);
 
@@ -54,7 +54,7 @@ QVector<qreal> ChartValuesAxisX::calculateLayout() const
     return points;
 }
 
-void ChartValuesAxisX::updateGeometry()
+void ChartValueAxisX::updateGeometry()
 {
     const QVector<qreal>& layout = ChartAxis::layout();
 
@@ -109,7 +109,7 @@ void ChartValuesAxisX::updateGeometry()
     }
 }
 
-void ChartValuesAxisX::handleAxisUpdated()
+void ChartValueAxisX::handleAxisUpdated()
 {
     //TODO:: fix this
     QValueAxis* axis = qobject_cast<QValueAxis*>(m_chartAxis);
diff --git a/src/axis/valuesaxis/chartvaluesaxisx_p.h b/src/axis/valueaxis/chartvalueaxisx_p.h
similarity index 93%
rename from src/axis/valuesaxis/chartvaluesaxisx_p.h
rename to src/axis/valueaxis/chartvalueaxisx_p.h
index 14791f5..3a3d5c8 100644
--- a/src/axis/valuesaxis/chartvaluesaxisx_p.h
+++ b/src/axis/valueaxis/chartvalueaxisx_p.h
@@ -37,11 +37,11 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 class QAbstractAxis;
 class ChartPresenter;
 
-class ChartValuesAxisX : public ChartAxis
+class ChartValueAxisX : public ChartAxis
 {
 public:
-    ChartValuesAxisX(QAbstractAxis *axis, ChartPresenter *presenter);
-    ~ChartValuesAxisX();
+    ChartValueAxisX(QAbstractAxis *axis, ChartPresenter *presenter);
+    ~ChartValueAxisX();
 
     AxisType axisType() const { return X_AXIS;}
 
diff --git a/src/axis/valuesaxis/chartvaluesaxisy.cpp b/src/axis/valueaxis/chartvalueaxisy.cpp
similarity index 92%
rename from src/axis/valuesaxis/chartvaluesaxisy.cpp
rename to src/axis/valueaxis/chartvalueaxisy.cpp
index ec4d784..260ab52 100644
--- a/src/axis/valuesaxis/chartvaluesaxisy.cpp
+++ b/src/axis/valueaxis/chartvalueaxisy.cpp
@@ -18,10 +18,10 @@
 **
 ****************************************************************************/
 
-#include "chartvaluesaxisy_p.h"
+#include "chartvalueaxisy_p.h"
 #include "qabstractaxis.h"
 #include "chartpresenter_p.h"
-#include "qvaluesaxis.h"
+#include "qvalueaxis.h"
 #include <QGraphicsLayout>
 #include <QFontMetrics>
 #include <qmath.h>
@@ -30,16 +30,16 @@ static int label_padding = 5;
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-ChartValuesAxisY::ChartValuesAxisY(QAbstractAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter),
+ChartValueAxisY::ChartValueAxisY(QAbstractAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter),
 m_tickCount(0)
 {
 }
 
-ChartValuesAxisY::~ChartValuesAxisY()
+ChartValueAxisY::~ChartValueAxisY()
 {
 }
 
-QVector<qreal> ChartValuesAxisY::calculateLayout() const
+QVector<qreal> ChartValueAxisY::calculateLayout() const
 {
     Q_ASSERT(m_tickCount>=2);
 
@@ -55,7 +55,7 @@ QVector<qreal> ChartValuesAxisY::calculateLayout() const
     return points;
 }
 
-void ChartValuesAxisY::updateGeometry()
+void ChartValueAxisY::updateGeometry()
 {
     const QVector<qreal> &layout = ChartAxis::layout();
     m_minWidth = 0;
@@ -114,7 +114,7 @@ void ChartValuesAxisY::updateGeometry()
     }
 }
 
-void ChartValuesAxisY::handleAxisUpdated()
+void ChartValueAxisY::handleAxisUpdated()
 {
     //TODO:: fix this
     QValueAxis* axis = qobject_cast<QValueAxis*>(m_chartAxis);
diff --git a/src/axis/valuesaxis/chartvaluesaxisy_p.h b/src/axis/valueaxis/chartvalueaxisy_p.h
similarity index 93%
rename from src/axis/valuesaxis/chartvaluesaxisy_p.h
rename to src/axis/valueaxis/chartvalueaxisy_p.h
index 809e0a9..37defc5 100644
--- a/src/axis/valuesaxis/chartvaluesaxisy_p.h
+++ b/src/axis/valueaxis/chartvalueaxisy_p.h
@@ -37,11 +37,11 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 class QAbstractAxis;
 class ChartPresenter;
 
-class ChartValuesAxisY : public ChartAxis
+class ChartValueAxisY : public ChartAxis
 {
 public:
-    ChartValuesAxisY(QAbstractAxis *axis, ChartPresenter *presenter);
-    ~ChartValuesAxisY();
+    ChartValueAxisY(QAbstractAxis *axis, ChartPresenter *presenter);
+    ~ChartValueAxisY();
 
     AxisType axisType() const { return Y_AXIS;}
 
diff --git a/src/axis/valuesaxis/qvaluesaxis.cpp b/src/axis/valueaxis/qvalueaxis.cpp
similarity index 96%
rename from src/axis/valuesaxis/qvaluesaxis.cpp
rename to src/axis/valueaxis/qvalueaxis.cpp
index 95f870e..5ef5684 100644
--- a/src/axis/valuesaxis/qvaluesaxis.cpp
+++ b/src/axis/valueaxis/qvalueaxis.cpp
@@ -18,10 +18,10 @@
 **
 ****************************************************************************/
 
-#include "qvaluesaxis.h"
-#include "qvaluesaxis_p.h"
-#include "chartvaluesaxisx_p.h"
-#include "chartvaluesaxisy_p.h"
+#include "qvalueaxis.h"
+#include "qvalueaxis_p.h"
+#include "chartvalueaxisx_p.h"
+#include "chartvalueaxisy_p.h"
 #include "domain_p.h"
 #include "chartdataset_p.h"
 #include <qmath.h>
@@ -318,9 +318,9 @@ ChartAxis* QValueAxisPrivate::createGraphics(ChartPresenter* presenter)
 {
     Q_Q(QValueAxis);
     if(m_orientation == Qt::Vertical){
-        return new ChartValuesAxisY(q,presenter);
+        return new ChartValueAxisY(q,presenter);
     }else{
-        return new ChartValuesAxisX(q,presenter);
+        return new ChartValueAxisX(q,presenter);
     }
 
 }
@@ -378,7 +378,7 @@ qreal QValueAxisPrivate::niceNumber(qreal x,bool ceiling) const
     return q*z;
 }
 
-#include "moc_qvaluesaxis.cpp"
-#include "moc_qvaluesaxis_p.cpp"
+#include "moc_qvalueaxis.cpp"
+#include "moc_qvalueaxis_p.cpp"
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/axis/valuesaxis/qvaluesaxis.h b/src/axis/valueaxis/qvalueaxis.h
similarity index 100%
rename from src/axis/valuesaxis/qvaluesaxis.h
rename to src/axis/valueaxis/qvalueaxis.h
diff --git a/src/axis/valuesaxis/qvaluesaxis_p.h b/src/axis/valueaxis/qvalueaxis_p.h
similarity index 98%
rename from src/axis/valuesaxis/qvaluesaxis_p.h
rename to src/axis/valueaxis/qvalueaxis_p.h
index 891bc18..65e81b4 100644
--- a/src/axis/valuesaxis/qvaluesaxis_p.h
+++ b/src/axis/valueaxis/qvalueaxis_p.h
@@ -30,7 +30,7 @@
 #ifndef QVALUESAXIS_P_H
 #define QVALUESAXIS_P_H
 
-#include "qvaluesaxis.h"
+#include "qvalueaxis.h"
 #include "qabstractaxis_p.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
diff --git a/src/barchart/qabstractbarseries.cpp b/src/barchart/qabstractbarseries.cpp
index 58c2cff..76ded6c 100644
--- a/src/barchart/qabstractbarseries.cpp
+++ b/src/barchart/qabstractbarseries.cpp
@@ -26,7 +26,7 @@
 #include "legendmarker_p.h"
 #include "chartdataset_p.h"
 #include "charttheme_p.h"
-#include "qvaluesaxis.h"
+#include "qvalueaxis.h"
 #include "qbarcategoriesaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
diff --git a/src/barchart/vertical/bar/qbarseries.cpp b/src/barchart/vertical/bar/qbarseries.cpp
index d33b816..df6b878 100644
--- a/src/barchart/vertical/bar/qbarseries.cpp
+++ b/src/barchart/vertical/bar/qbarseries.cpp
@@ -24,7 +24,7 @@
 #include "chartdataset_p.h"
 #include "charttheme_p.h"
 #include "baranimation_p.h"
-#include "qvaluesaxis.h"
+#include "qvalueaxis.h"
 #include "qbarcategoriesaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
diff --git a/src/barchart/vertical/percent/qpercentbarseries.cpp b/src/barchart/vertical/percent/qpercentbarseries.cpp
index a95d1b3..acf9d91 100644
--- a/src/barchart/vertical/percent/qpercentbarseries.cpp
+++ b/src/barchart/vertical/percent/qpercentbarseries.cpp
@@ -23,7 +23,7 @@
 #include "percentbarchartitem_p.h"
 #include "chartdataset_p.h"
 #include "charttheme_p.h"
-#include "qvaluesaxis.h"
+#include "qvalueaxis.h"
 #include "percentbaranimation_p.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
diff --git a/src/barchart/vertical/stacked/qstackedbarseries.cpp b/src/barchart/vertical/stacked/qstackedbarseries.cpp
index 9f5d362..3f39acb 100644
--- a/src/barchart/vertical/stacked/qstackedbarseries.cpp
+++ b/src/barchart/vertical/stacked/qstackedbarseries.cpp
@@ -23,7 +23,7 @@
 #include "stackedbarchartitem_p.h"
 #include "chartdataset_p.h"
 #include "charttheme_p.h"
-#include "qvaluesaxis.h"
+#include "qvalueaxis.h"
 #include "stackedbaranimation_p.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
diff --git a/src/chartdataset.cpp b/src/chartdataset.cpp
index 227c00c..e799002 100644
--- a/src/chartdataset.cpp
+++ b/src/chartdataset.cpp
@@ -20,9 +20,9 @@
 
 #include "chartdataset_p.h"
 #include "qchart.h"
-#include "qvaluesaxis.h"
+#include "qvalueaxis.h"
 #include "qbarcategoriesaxis.h"
-#include "qvaluesaxis_p.h"
+#include "qvalueaxis_p.h"
 #include "qintervalsaxis.h"
 #include "qdatetimeaxis.h"
 #include "qabstractseries_p.h"
diff --git a/src/xychart/qxyseries.cpp b/src/xychart/qxyseries.cpp
index 2ebcb4c..9782fce 100644
--- a/src/xychart/qxyseries.cpp
+++ b/src/xychart/qxyseries.cpp
@@ -22,7 +22,7 @@
 #include "qxyseries_p.h"
 #include "domain_p.h"
 #include "legendmarker_p.h"
-#include "qvaluesaxis.h"
+#include "qvalueaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/src/xychart/xychart_p.h b/src/xychart/xychart_p.h
index f0aba48..a072fe3 100644
--- a/src/xychart/xychart_p.h
+++ b/src/xychart/xychart_p.h
@@ -33,7 +33,7 @@
 #include "qchartglobal.h"
 #include "chartitem_p.h"
 #include "xyanimation_p.h"
-#include "qvaluesaxis.h"
+#include "qvalueaxis.h"
 #include <QPen>
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 3528af2..a24ce13 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -20,7 +20,7 @@ SUBDIRS += \
            qhorizontalbarseries \
            qhorizontalstackedbarseries \
            qhorizontalpercentbarseries \
-           qvaluesaxis \
+           qvalueaxis \
            qintervalsaxis \
            qdatetimeaxis \
            qbarcategoriesaxis
diff --git a/tests/auto/chartdataset/tst_chartdataset.cpp b/tests/auto/chartdataset/tst_chartdataset.cpp
index 40bd454..1aca523 100644
--- a/tests/auto/chartdataset/tst_chartdataset.cpp
+++ b/tests/auto/chartdataset/tst_chartdataset.cpp
@@ -20,7 +20,7 @@
 
 #include <QtTest/QtTest>
 #include <qabstractaxis.h>
-#include <qvaluesaxis.h>
+#include <qvalueaxis.h>
 #include <qbarcategoriesaxis.h>
 #include <qlineseries.h>
 #include <qareaseries.h>
diff --git a/tests/auto/qchart/tst_qchart.cpp b/tests/auto/qchart/tst_qchart.cpp
index fa5c872..2b813cb 100644
--- a/tests/auto/qchart/tst_qchart.cpp
+++ b/tests/auto/qchart/tst_qchart.cpp
@@ -29,7 +29,7 @@
 #include <qbarseries.h>
 #include <qpercentbarseries.h>
 #include <qstackedbarseries.h>
-#include <qvaluesaxis.h>
+#include <qvalueaxis.h>
 #include <qbarcategoriesaxis.h>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
diff --git a/tests/auto/qchartview/tst_qchartview.cpp b/tests/auto/qchartview/tst_qchartview.cpp
index bffa45b..ad9af17 100644
--- a/tests/auto/qchartview/tst_qchartview.cpp
+++ b/tests/auto/qchartview/tst_qchartview.cpp
@@ -23,7 +23,7 @@
 #include <qlineseries.h>
 #include <cmath>
 #include <tst_definitions.h>
-#include <qvaluesaxis.h>
+#include <qvalueaxis.h>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
diff --git a/tests/auto/qvaluesaxis/qvaluesaxis.pro b/tests/auto/qvalueaxis/qvalueaxis.pro
similarity index 80%
rename from tests/auto/qvaluesaxis/qvaluesaxis.pro
rename to tests/auto/qvalueaxis/qvalueaxis.pro
index b515c0c..315a8a6 100644
--- a/tests/auto/qvaluesaxis/qvaluesaxis.pro
+++ b/tests/auto/qvalueaxis/qvalueaxis.pro
@@ -2,4 +2,4 @@
     error( "Couldn't find the auto.pri file!" )
 }
 HEADERS += ../qabstractaxis/tst_qabstractaxis.h
-SOURCES += tst_qvaluesaxis.cpp ../qabstractaxis/tst_qabstractaxis.cpp
+SOURCES += tst_qvalueaxis.cpp ../qabstractaxis/tst_qabstractaxis.cpp
diff --git a/tests/auto/qvaluesaxis/tst_qvaluesaxis.cpp b/tests/auto/qvalueaxis/tst_qvalueaxis.cpp
similarity index 96%
rename from tests/auto/qvaluesaxis/tst_qvaluesaxis.cpp
rename to tests/auto/qvalueaxis/tst_qvalueaxis.cpp
index d9e0e72..9d79993 100644
--- a/tests/auto/qvaluesaxis/tst_qvaluesaxis.cpp
+++ b/tests/auto/qvalueaxis/tst_qvalueaxis.cpp
@@ -19,7 +19,7 @@
  ****************************************************************************/
 
 #include "../qabstractaxis/tst_qabstractaxis.h"
-#include "qvaluesaxis.h"
+#include "qvalueaxis.h"
 #include <qlineseries.h>
 
 class tst_QValueAxis: public tst_QAbstractAxis
@@ -33,8 +33,8 @@ public slots:
     void cleanup();
 
 private slots:
-    void qvaluesaxis_data();
-    void qvaluesaxis();
+    void qvalueaxis_data();
+    void qvalueaxis();
     void max_raw_data();
     void max_raw();
     void max_data();
@@ -94,11 +94,11 @@ void tst_QValueAxis::cleanup()
     tst_QAbstractAxis::cleanup();
 }
 
-void tst_QValueAxis::qvaluesaxis_data()
+void tst_QValueAxis::qvalueaxis_data()
 {
 }
 
-void tst_QValueAxis::qvaluesaxis()
+void tst_QValueAxis::qvalueaxis()
 {
     qabstractaxis();
 
@@ -411,5 +411,5 @@ void tst_QValueAxis::autoscale()
 }
 
 QTEST_MAIN(tst_QValueAxis)
-#include "tst_qvaluesaxis.moc"
+#include "tst_qvalueaxis.moc"