diff --git a/plugins/declarative/declarativechart.cpp b/plugins/declarative/declarativechart.cpp
index cfb20a8..4d46e8c 100644
--- a/plugins/declarative/declarativechart.cpp
+++ b/plugins/declarative/declarativechart.cpp
@@ -26,7 +26,7 @@
 #include "declarativepieseries.h"
 #include "declarativesplineseries.h"
 #include "declarativescatterseries.h"
-#include "qbarcategoriesaxis.h"
+#include "qbarcategoryaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/plugins/declarative/plugin.cpp b/plugins/declarative/plugin.cpp
index 33f2b22..9569e98 100644
--- a/plugins/declarative/plugin.cpp
+++ b/plugins/declarative/plugin.cpp
@@ -23,7 +23,7 @@
 #include "qchart.h"
 #include "qabstractaxis.h"
 #include "qvalueaxis.h"
-#include "qbarcategoriesaxis.h"
+#include "qbarcategoryaxis.h"
 #include "declarativechart.h"
 #include "declarativexypoint.h"
 #include "declarativelineseries.h"
diff --git a/src/axis/axis.pri b/src/axis/axis.pri
index f4c8a42..94046bf 100644
--- a/src/axis/axis.pri
+++ b/src/axis/axis.pri
@@ -2,13 +2,13 @@
 
 INCLUDEPATH += $$PWD \
     $$PWD/valueaxis \
-    $$PWD/categoriesaxis \
+    $$PWD/barcategoryaxis \
     $$PWD/intervalsaxis \
     $$PWD/datetimeaxis
 
 DEPENDPATH += $$PWD \
     $$PWD/valueaxis \
-    $$PWD/categoriesaxis \
+    $$PWD/barcategoryaxis \
     $$PWD/intervalsaxis \
     $$PWD/datetimeaxis
 
@@ -18,9 +18,9 @@ SOURCES += \
     $$PWD/valueaxis/chartvalueaxisx.cpp \
     $$PWD/valueaxis/chartvalueaxisy.cpp \
     $$PWD/valueaxis/qvalueaxis.cpp \
-    $$PWD/categoriesaxis/chartcategoriesaxisx.cpp \
-    $$PWD/categoriesaxis/chartcategoriesaxisy.cpp \
-    $$PWD/categoriesaxis/qbarcategoriesaxis.cpp \
+    $$PWD/barcategoryaxis/chartbarcategoryaxisx.cpp \
+    $$PWD/barcategoryaxis/chartbarcategoryaxisy.cpp \
+    $$PWD/barcategoryaxis/qbarcategoryaxis.cpp \
     $$PWD/intervalsaxis/chartintervalsaxisx.cpp \
     $$PWD/intervalsaxis/chartintervalsaxisy.cpp \
     $$PWD/intervalsaxis/qintervalsaxis.cpp \
@@ -34,9 +34,9 @@ PRIVATE_HEADERS += \
     $$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 \
+    $$PWD/barcategoryaxis/chartbarcategoryaxisx_p.h \
+    $$PWD/barcategoryaxis/chartbarcategoryaxisy_p.h \
+    $$PWD/barcategoryaxis/qbarcategoryaxis_p.h \
     $$PWD/intervalsaxis/chartintervalsaxisx_p.h \
     $$PWD/intervalsaxis/chartintervalsaxisy_p.h \
     $$PWD/intervalsaxis/qintervalsaxis_p.h \
@@ -47,6 +47,6 @@ PRIVATE_HEADERS += \
 PUBLIC_HEADERS += \
     $$PWD/qabstractaxis.h \
     $$PWD/valueaxis/qvalueaxis.h \
-    $$PWD/categoriesaxis/qbarcategoriesaxis.h \
+    $$PWD/barcategoryaxis/qbarcategoryaxis.h \
     $$PWD/intervalsaxis/qintervalsaxis.h \
     $$PWD/datetimeaxis/qdatetimeaxis.h
diff --git a/src/axis/categoriesaxis/chartcategoriesaxisx.cpp b/src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp
similarity index 98%
rename from src/axis/categoriesaxis/chartcategoriesaxisx.cpp
rename to src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp
index 490a582..e6289e8 100644
--- a/src/axis/categoriesaxis/chartcategoriesaxisx.cpp
+++ b/src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp
@@ -18,9 +18,9 @@
  **
  ****************************************************************************/
 
-#include "chartcategoriesaxisx_p.h"
+#include "chartbarcategoryaxisx_p.h"
 #include "chartpresenter_p.h"
-#include "qbarcategoriesaxis_p.h"
+#include "qbarcategoryaxis_p.h"
 #include <QDebug>
 #include <qmath.h>
 
diff --git a/src/axis/categoriesaxis/chartcategoriesaxisx_p.h b/src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h
similarity index 100%
rename from src/axis/categoriesaxis/chartcategoriesaxisx_p.h
rename to src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h
diff --git a/src/axis/categoriesaxis/chartcategoriesaxisy.cpp b/src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp
similarity index 98%
rename from src/axis/categoriesaxis/chartcategoriesaxisy.cpp
rename to src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp
index 798e36d..2f907a7 100644
--- a/src/axis/categoriesaxis/chartcategoriesaxisy.cpp
+++ b/src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp
@@ -18,9 +18,9 @@
  **
  ****************************************************************************/
 
-#include "chartcategoriesaxisy_p.h"
+#include "chartbarcategoryaxisy_p.h"
 #include "chartpresenter_p.h"
-#include "qbarcategoriesaxis_p.h"
+#include "qbarcategoryaxis_p.h"
 #include <qmath.h>
 
 static int label_padding = 5;
diff --git a/src/axis/categoriesaxis/chartcategoriesaxisy_p.h b/src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h
similarity index 100%
rename from src/axis/categoriesaxis/chartcategoriesaxisy_p.h
rename to src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h
diff --git a/src/axis/categoriesaxis/qbarcategoriesaxis.cpp b/src/axis/barcategoryaxis/qbarcategoryaxis.cpp
similarity index 98%
rename from src/axis/categoriesaxis/qbarcategoriesaxis.cpp
rename to src/axis/barcategoryaxis/qbarcategoryaxis.cpp
index 39b12b4..da65dd4 100644
--- a/src/axis/categoriesaxis/qbarcategoriesaxis.cpp
+++ b/src/axis/barcategoryaxis/qbarcategoryaxis.cpp
@@ -18,10 +18,10 @@
 **
 ****************************************************************************/
 
-#include "qbarcategoriesaxis.h"
-#include "qbarcategoriesaxis_p.h"
-#include "chartcategoriesaxisx_p.h"
-#include "chartcategoriesaxisy_p.h"
+#include "qbarcategoryaxis.h"
+#include "qbarcategoryaxis_p.h"
+#include "chartbarcategoryaxisx_p.h"
+#include "chartbarcategoryaxisy_p.h"
 #include "domain_p.h"
 #include "chartdataset_p.h"
 #include <qmath.h>
@@ -465,7 +465,7 @@ void QBarCategoryAxisPrivate::intializeDomain(Domain* domain)
     }
 }
 
-#include "moc_qbarcategoriesaxis.cpp"
-#include "moc_qbarcategoriesaxis_p.cpp"
+#include "moc_qbarcategoryaxis.cpp"
+#include "moc_qbarcategoryaxis_p.cpp"
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/axis/categoriesaxis/qbarcategoriesaxis.h b/src/axis/barcategoryaxis/qbarcategoryaxis.h
similarity index 100%
rename from src/axis/categoriesaxis/qbarcategoriesaxis.h
rename to src/axis/barcategoryaxis/qbarcategoryaxis.h
diff --git a/src/axis/categoriesaxis/qbarcategoriesaxis_p.h b/src/axis/barcategoryaxis/qbarcategoryaxis_p.h
similarity index 98%
rename from src/axis/categoriesaxis/qbarcategoriesaxis_p.h
rename to src/axis/barcategoryaxis/qbarcategoryaxis_p.h
index 1f91a3d..a6c87d7 100644
--- a/src/axis/categoriesaxis/qbarcategoriesaxis_p.h
+++ b/src/axis/barcategoryaxis/qbarcategoryaxis_p.h
@@ -30,7 +30,7 @@
 #ifndef QBARCATEGORIESAXIS_P_H
 #define QBARCATEGORIESAXIS_P_H
 
-#include "qbarcategoriesaxis.h"
+#include "qbarcategoryaxis.h"
 #include "qabstractaxis_p.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
diff --git a/src/barchart/horizontal/bar/qhorizontalbarseries.cpp b/src/barchart/horizontal/bar/qhorizontalbarseries.cpp
index debe12c..c910249 100644
--- a/src/barchart/horizontal/bar/qhorizontalbarseries.cpp
+++ b/src/barchart/horizontal/bar/qhorizontalbarseries.cpp
@@ -22,7 +22,7 @@
 #include "qhorizontalbarseries_p.h"
 #include "horizontalbarchartitem_p.h"
 #include "horizontalbaranimation_p.h"
-#include "qbarcategoriesaxis.h"
+#include "qbarcategoryaxis.h"
 
 #include "chartdataset_p.h"
 #include "charttheme_p.h"
diff --git a/src/barchart/qabstractbarseries.cpp b/src/barchart/qabstractbarseries.cpp
index 15137eb..9b10c98 100644
--- a/src/barchart/qabstractbarseries.cpp
+++ b/src/barchart/qabstractbarseries.cpp
@@ -27,7 +27,7 @@
 #include "chartdataset_p.h"
 #include "charttheme_p.h"
 #include "qvalueaxis.h"
-#include "qbarcategoriesaxis.h"
+#include "qbarcategoryaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/src/barchart/vertical/bar/qbarseries.cpp b/src/barchart/vertical/bar/qbarseries.cpp
index df6b878..970591b 100644
--- a/src/barchart/vertical/bar/qbarseries.cpp
+++ b/src/barchart/vertical/bar/qbarseries.cpp
@@ -25,7 +25,7 @@
 #include "charttheme_p.h"
 #include "baranimation_p.h"
 #include "qvalueaxis.h"
-#include "qbarcategoriesaxis.h"
+#include "qbarcategoryaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/src/chartdataset.cpp b/src/chartdataset.cpp
index 24ca69a..1ec61ff 100644
--- a/src/chartdataset.cpp
+++ b/src/chartdataset.cpp
@@ -21,7 +21,7 @@
 #include "chartdataset_p.h"
 #include "qchart.h"
 #include "qvalueaxis.h"
-#include "qbarcategoriesaxis.h"
+#include "qbarcategoryaxis.h"
 #include "qvalueaxis_p.h"
 #include "qintervalsaxis.h"
 #include "qdatetimeaxis.h"
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index a24ce13..fe9e7b9 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -23,7 +23,7 @@ SUBDIRS += \
            qvalueaxis \
            qintervalsaxis \
            qdatetimeaxis \
-           qbarcategoriesaxis
+           qbarcategoryaxis
 
 test_private:{
     SUBDIRS += domain chartdataset
diff --git a/tests/auto/chartdataset/tst_chartdataset.cpp b/tests/auto/chartdataset/tst_chartdataset.cpp
index 1aca523..72ca800 100644
--- a/tests/auto/chartdataset/tst_chartdataset.cpp
+++ b/tests/auto/chartdataset/tst_chartdataset.cpp
@@ -21,7 +21,7 @@
 #include <QtTest/QtTest>
 #include <qabstractaxis.h>
 #include <qvalueaxis.h>
-#include <qbarcategoriesaxis.h>
+#include <qbarcategoryaxis.h>
 #include <qlineseries.h>
 #include <qareaseries.h>
 #include <qscatterseries.h>
diff --git a/tests/auto/qbarcategoriesaxis/qbarcategoriesaxis.pro b/tests/auto/qbarcategoryaxis/qbarcategoryaxis.pro
similarity index 80%
rename from tests/auto/qbarcategoriesaxis/qbarcategoriesaxis.pro
rename to tests/auto/qbarcategoryaxis/qbarcategoryaxis.pro
index 6e05d9f..b80424a 100644
--- a/tests/auto/qbarcategoriesaxis/qbarcategoriesaxis.pro
+++ b/tests/auto/qbarcategoryaxis/qbarcategoryaxis.pro
@@ -2,4 +2,4 @@
     error( "Couldn't find the auto.pri file!" )
 }
 HEADERS += ../qabstractaxis/tst_qabstractaxis.h
-SOURCES += tst_qbarcategoriesaxis.cpp ../qabstractaxis/tst_qabstractaxis.cpp
+SOURCES += tst_qbarcategoryaxis.cpp ../qabstractaxis/tst_qabstractaxis.cpp
diff --git a/tests/auto/qbarcategoriesaxis/tst_qbarcategoriesaxis.cpp b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp
similarity index 97%
rename from tests/auto/qbarcategoriesaxis/tst_qbarcategoriesaxis.cpp
rename to tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp
index 940cc68..1a104c7 100644
--- a/tests/auto/qbarcategoriesaxis/tst_qbarcategoriesaxis.cpp
+++ b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp
@@ -21,7 +21,7 @@
 #include "../qabstractaxis/tst_qabstractaxis.h"
 #include <qbarseries.h>
 #include <qbarset.h>
-#include <qbarcategoriesaxis.h>
+#include <qbarcategoryaxis.h>
 
 class tst_QBarCategoriesAxis: public tst_QAbstractAxis
 {
@@ -34,8 +34,8 @@ public slots:
     void cleanup();
 
 private slots:
-    void qbarcategoriesaxis_data();
-    void qbarcategoriesaxis();
+    void qbarcategoryaxis_data();
+    void qbarcategoryaxis();
 
     void append_data();
     void append();
@@ -129,11 +129,11 @@ void tst_QBarCategoriesAxis::cleanup()
     tst_QAbstractAxis::cleanup();
 }
 
-void tst_QBarCategoriesAxis::qbarcategoriesaxis_data()
+void tst_QBarCategoriesAxis::qbarcategoryaxis_data()
 {
 }
 
-void tst_QBarCategoriesAxis::qbarcategoriesaxis()
+void tst_QBarCategoriesAxis::qbarcategoryaxis()
 {
     qabstractaxis();
     QBarCategoryAxis axis;
@@ -645,5 +645,5 @@ void tst_QBarCategoriesAxis::autoscale()
 
 
 QTEST_MAIN(tst_QBarCategoriesAxis)
-#include "tst_qbarcategoriesaxis.moc"
+#include "tst_qbarcategoryaxis.moc"
 
diff --git a/tests/auto/qchart/tst_qchart.cpp b/tests/auto/qchart/tst_qchart.cpp
index 4e0cbe7..9cadf38 100644
--- a/tests/auto/qchart/tst_qchart.cpp
+++ b/tests/auto/qchart/tst_qchart.cpp
@@ -30,7 +30,7 @@
 #include <qpercentbarseries.h>
 #include <qstackedbarseries.h>
 #include <qvalueaxis.h>
-#include <qbarcategoriesaxis.h>
+#include <qbarcategoryaxis.h>
 
 QTCOMMERCIALCHART_USE_NAMESPACE