diff --git a/example/presenterchart/chartview.h b/example/presenterchart/chartview.h
index 0264fee..050b98b 100644
--- a/example/presenterchart/chartview.h
+++ b/example/presenterchart/chartview.h
@@ -18,7 +18,7 @@ public slots:
 
 private:
     QTimer m_timer;
-    QList<QChartSeries*> m_series;
+    QList<QSeries*> m_series;
     int m_index;
 };
 
diff --git a/src/barchart/qbarseries.cpp b/src/barchart/qbarseries.cpp
index bb50016..ee156bc 100644
--- a/src/barchart/qbarseries.cpp
+++ b/src/barchart/qbarseries.cpp
@@ -21,9 +21,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn virtual QChartSeriesType QBarSeries::type() const
+    \fn virtual QSeriesType QBarSeries::type() const
     \brief Returns type of series.
-    \sa QChartSeries, QChartSeriesType
+    \sa QSeries, QSeriesType
 */
 /*!
     \fn void QBarSeries::changed(int index)
@@ -52,7 +52,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
     QBarSeries is QObject which is a child of a \a parent.
 */
 QBarSeries::QBarSeries(QBarCategory *category, QObject *parent)
-    : QChartSeries(parent)
+    : QSeries(parent)
     ,mModel(new BarChartModel(category, this))
 {
 }
diff --git a/src/barchart/qbarseries.h b/src/barchart/qbarseries.h
index a85bfa4..6bc6a19 100644
--- a/src/barchart/qbarseries.h
+++ b/src/barchart/qbarseries.h
@@ -1,7 +1,7 @@
 #ifndef BARSERIES_H
 #define BARSERIES_H
 
-#include "qchartseries.h"
+#include "qseries.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
@@ -10,13 +10,13 @@ class QBarSet;
 class BarChartModel;
 
 // Container for series
-class QTCOMMERCIALCHART_EXPORT QBarSeries : public QChartSeries
+class QTCOMMERCIALCHART_EXPORT QBarSeries : public QSeries
 {
     Q_OBJECT
 public:
     QBarSeries(QBarCategory *category, QObject* parent=0);
 
-    virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeBar; }
+    virtual QSeriesType type() const { return QSeries::SeriesTypeBar; }
 
     void addBarSet(QBarSet *set);               // Takes ownership of set
     void removeBarSet(QBarSet *set);            // Releases ownership, doesn't delete set
diff --git a/src/barchart/qpercentbarseries.cpp b/src/barchart/qpercentbarseries.cpp
index 15bfe9f..4058028 100644
--- a/src/barchart/qpercentbarseries.cpp
+++ b/src/barchart/qpercentbarseries.cpp
@@ -16,9 +16,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn virtual QChartSeriesType QPercentBarSeries::type() const
+    \fn virtual QSeriesType QPercentBarSeries::type() const
     \brief Returns type of series.
-    \sa QChartSeries, QChartSeriesType
+    \sa QSeries, QSeriesType
 */
 
 /*!
diff --git a/src/barchart/qpercentbarseries.h b/src/barchart/qpercentbarseries.h
index e1ebdc7..3855097 100644
--- a/src/barchart/qpercentbarseries.h
+++ b/src/barchart/qpercentbarseries.h
@@ -11,7 +11,7 @@ class QTCOMMERCIALCHART_EXPORT QPercentBarSeries : public QBarSeries
 public:
     QPercentBarSeries(QBarCategory *category, QObject* parent=0);
 
-    virtual QChartSeriesType type() const { return QChartSeries::SeriesTypePercentBar; }
+    virtual QSeriesType type() const { return QSeries::SeriesTypePercentBar; }
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/barchart/qstackedbarseries.cpp b/src/barchart/qstackedbarseries.cpp
index 31a0d53..9c1405f 100644
--- a/src/barchart/qstackedbarseries.cpp
+++ b/src/barchart/qstackedbarseries.cpp
@@ -16,9 +16,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn virtual QChartSeriesType QStackedBarSeries::type() const
+    \fn virtual QSeriesType QStackedBarSeries::type() const
     \brief Returns type of series.
-    \sa QChartSeries, QChartSeriesType
+    \sa QSeries, QSeriesType
 */
 
 /*!
diff --git a/src/barchart/qstackedbarseries.h b/src/barchart/qstackedbarseries.h
index 8df7cc0..43d591b 100644
--- a/src/barchart/qstackedbarseries.h
+++ b/src/barchart/qstackedbarseries.h
@@ -13,7 +13,7 @@ class QTCOMMERCIALCHART_EXPORT QStackedBarSeries : public QBarSeries
 public:
     QStackedBarSeries(QBarCategory *category, QObject* parent=0);
 
-    virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeStackedBar; }
+    virtual QSeriesType type() const { return QSeries::SeriesTypeStackedBar; }
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/chartdataset.cpp b/src/chartdataset.cpp
index d1b7d59..ac0fce5 100644
--- a/src/chartdataset.cpp
+++ b/src/chartdataset.cpp
@@ -33,7 +33,7 @@ const Domain ChartDataSet::domain(QChartAxis *axisY) const
     return m_domainMap.values(axisY).at(i);
 }
 
-void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
+void ChartDataSet::addSeries(QSeries* series, QChartAxis *axisY)
 {
     // TODO: we should check the series not already added
 
@@ -43,7 +43,7 @@ void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
     if(axisY==0) axisY = m_axisY;
     axisY->setParent(this); // take ownership
 
-    QList<QChartSeries*>  seriesList = m_seriesMap.values(axisY);
+    QList<QSeries*>  seriesList = m_seriesMap.values(axisY);
 
     QList<Domain> domainList = m_domainMap.values(axisY);
 
@@ -55,7 +55,7 @@ void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
 
     switch(series->type())
     {
-        case QChartSeries::SeriesTypeLine: {
+        case QSeries::SeriesTypeLine: {
 
             QLineSeries* xyseries = static_cast<QLineSeries*>(series);
 
@@ -70,7 +70,7 @@ void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
             }
             break;
         }
-        case QChartSeries::SeriesTypeBar: {
+        case QSeries::SeriesTypeBar: {
         qDebug() << "QChartSeries::SeriesTypeBar";
             QBarSeries* barSeries = static_cast<QBarSeries*>(series);
             qreal x = barSeries->countCategories();
@@ -81,7 +81,7 @@ void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
             domain.m_maxY = qMax(domain.m_maxY,y);
             break;
         }
-        case QChartSeries::SeriesTypeStackedBar: {
+        case QSeries::SeriesTypeStackedBar: {
         qDebug() << "QChartSeries::SeriesTypeStackedBar";
 
             QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);
@@ -93,7 +93,7 @@ void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
             domain.m_maxY = qMax(domain.m_maxY,y);
             break;
         }
-        case QChartSeries::SeriesTypePercentBar: {
+        case QSeries::SeriesTypePercentBar: {
         qDebug() << "QChartSeries::SeriesTypePercentBar";
 
             QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);
@@ -105,13 +105,13 @@ void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
             break;
         }
 
-        case QChartSeries::SeriesTypePie: {
+        case QSeries::SeriesTypePie: {
             QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
             // TODO: domain stuff
             break;
         }
 
-        case QChartSeries::SeriesTypeScatter: {
+        case QSeries::SeriesTypeScatter: {
             QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
             Q_ASSERT(scatterSeries);
             foreach (QPointF point, scatterSeries->data()) {
@@ -160,7 +160,7 @@ void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
 
 }
 
-void ChartDataSet::removeSeries(QChartSeries* series)
+void ChartDataSet::removeSeries(QSeries* series)
 {
     QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();
     foreach(QChartAxis* axis , keys) {
@@ -184,7 +184,7 @@ void ChartDataSet::removeAllSeries()
 {
     QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();
     foreach(QChartAxis* axis , keys) {
-        QList<QChartSeries*> seriesList = m_seriesMap.values(axis);
+        QList<QSeries*> seriesList = m_seriesMap.values(axis);
         for(int i =0 ; i < seriesList.size();i++ )
         {
             emit seriesRemoved(seriesList.at(i));
@@ -235,8 +235,8 @@ void ChartDataSet::setDomain(int index)
         Q_ASSERT(i>=0);
         domain = m_domainMap.values(axis).at(i);
         QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
-        QList<QChartSeries*> seriesList = m_seriesMap.values(axis);
-        foreach(QChartSeries* series, seriesList) {
+        QList<QSeries*> seriesList = m_seriesMap.values(axis);
+        foreach(QSeries* series, seriesList) {
             emit seriesDomainChanged(series,domain);
         }
         emit axisLabelsChanged(axis,labels);
@@ -281,8 +281,8 @@ void ChartDataSet::addDomain(const QRectF& rect, const QRectF& viewport)
     foreach (QChartAxis* axis , domainList){
         domain = m_domainMap.value(axis).subDomain(rect,viewport.width(),viewport.height());
         QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
-        QList<QChartSeries*> seriesList = m_seriesMap.values(axis);
-        foreach(QChartSeries* series, seriesList){
+        QList<QSeries*> seriesList = m_seriesMap.values(axis);
+        foreach(QSeries* series, seriesList){
             emit seriesDomainChanged(series,domain);
         }
         emit axisLabelsChanged(axis,labels);
@@ -295,7 +295,7 @@ void ChartDataSet::addDomain(const QRectF& rect, const QRectF& viewport)
     m_domainIndex++;
 }
 
-QChartAxis* ChartDataSet::axisY(QChartSeries* series) const
+QChartAxis* ChartDataSet::axisY(QSeries* series) const
 {
     if(series == 0) return m_axisY;
 
diff --git a/src/chartdataset_p.h b/src/chartdataset_p.h
index dced6e0..9cdd499 100644
--- a/src/chartdataset_p.h
+++ b/src/chartdataset_p.h
@@ -1,7 +1,7 @@
 #ifndef CHARTDATASET_P_H_
 #define CHARTDATASET_P_H_
 
-#include "qchartseries.h"
+#include "qseries.h"
 #include "domain_p.h"
 #include <QVector>
 
@@ -16,8 +16,8 @@ public:
     ChartDataSet(QObject* parent=0);
     virtual ~ChartDataSet();
 
-    void addSeries(QChartSeries* series,QChartAxis *axisY = 0);
-    void removeSeries(QChartSeries* series);
+    void addSeries(QSeries* series,QChartAxis *axisY = 0);
+    void removeSeries(QSeries* series);
     void removeAllSeries();
     void addDomain(const QRectF& rect, const QRectF& viewport);
     bool nextDomain();
@@ -28,15 +28,15 @@ public:
     void setDomain(int index);
 
     QChartAxis* axisX() const { return m_axisX;};
-    QChartAxis* axisY(QChartSeries* series = 0) const;
+    QChartAxis* axisY(QSeries* series = 0) const;
 
 signals:
-    void seriesAdded(QChartSeries* series);
-    void seriesRemoved(QChartSeries* series);
+    void seriesAdded(QSeries* series);
+    void seriesRemoved(QSeries* series);
     void axisAdded(QChartAxis* axis);
     void axisRemoved(QChartAxis* axis);
     void axisLabelsChanged(QChartAxis* axis, const QStringList& labels);
-    void seriesDomainChanged(QChartSeries* series,const Domain& domain);
+    void seriesDomainChanged(QSeries* series,const Domain& domain);
 
 private slots:
 	void handleMinChanged(qreal min);
@@ -48,7 +48,7 @@ private:
 
 private:
     QMultiMap<QChartAxis*, Domain> m_domainMap;
-    QMultiMap<QChartAxis*, QChartSeries*> m_seriesMap;
+    QMultiMap<QChartAxis*, QSeries*> m_seriesMap;
     QChartAxis* m_axisX;
     QChartAxis* m_axisY;
     int m_domainIndex;
diff --git a/src/chartpresenter.cpp b/src/chartpresenter.cpp
index 673603b..07b1efe 100644
--- a/src/chartpresenter.cpp
+++ b/src/chartpresenter.cpp
@@ -43,11 +43,11 @@ ChartPresenter::~ChartPresenter()
 void ChartPresenter::createConnections()
 {
     QObject::connect(m_chart,SIGNAL(geometryChanged()),this,SLOT(handleGeometryChanged()));
-    QObject::connect(m_dataset,SIGNAL(seriesAdded(QChartSeries*)),this,SLOT(handleSeriesAdded(QChartSeries*)));
-    QObject::connect(m_dataset,SIGNAL(seriesRemoved(QChartSeries*)),this,SLOT(handleSeriesRemoved(QChartSeries*)));
+    QObject::connect(m_dataset,SIGNAL(seriesAdded(QSeries*)),this,SLOT(handleSeriesAdded(QSeries*)));
+    QObject::connect(m_dataset,SIGNAL(seriesRemoved(QSeries*)),this,SLOT(handleSeriesRemoved(QSeries*)));
     QObject::connect(m_dataset,SIGNAL(axisAdded(QChartAxis*)),this,SLOT(handleAxisAdded(QChartAxis*)));
     QObject::connect(m_dataset,SIGNAL(axisRemoved(QChartAxis*)),this,SLOT(handleAxisRemoved(QChartAxis*)));
-    QObject::connect(m_dataset,SIGNAL(seriesDomainChanged(QChartSeries*,const Domain&)),this,SLOT(handleSeriesDomainChanged(QChartSeries*,const Domain&)));
+    QObject::connect(m_dataset,SIGNAL(seriesDomainChanged(QSeries*,const Domain&)),this,SLOT(handleSeriesDomainChanged(QSeries*,const Domain&)));
     QObject::connect(m_dataset,SIGNAL(axisLabelsChanged(QChartAxis*,const QStringList&)),this,SLOT(handleAxisLabelsChanged(QChartAxis*,const QStringList&)));
 }
 
@@ -104,11 +104,11 @@ void ChartPresenter::handleAxisRemoved(QChartAxis* axis)
 }
 
 
-void ChartPresenter::handleSeriesAdded(QChartSeries* series)
+void ChartPresenter::handleSeriesAdded(QSeries* series)
 {
     switch(series->type())
     {
-        case QChartSeries::SeriesTypeLine: {
+        case QSeries::SeriesTypeLine: {
             QLineSeries* lineSeries = static_cast<QLineSeries*>(series);
             LineChartItem* item;
             if(m_options.testFlag(QChart::SeriesAnimations)){
@@ -123,7 +123,7 @@ void ChartPresenter::handleSeriesAdded(QChartSeries* series)
             break;
         }
 
-        case QChartSeries::SeriesTypeBar: {
+        case QSeries::SeriesTypeBar: {
             QBarSeries* barSeries = static_cast<QBarSeries*>(series);
             BarPresenter* item = new BarPresenter(barSeries,m_chart);
             m_chartTheme->decorate(item,barSeries,m_chartItems.count());
@@ -134,7 +134,7 @@ void ChartPresenter::handleSeriesAdded(QChartSeries* series)
             break;
         }
 
-        case QChartSeries::SeriesTypeStackedBar: {
+        case QSeries::SeriesTypeStackedBar: {
 
             QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);
             StackedBarPresenter* item = new StackedBarPresenter(stackedBarSeries,m_chart);
@@ -145,7 +145,7 @@ void ChartPresenter::handleSeriesAdded(QChartSeries* series)
             break;
         }
 
-        case QChartSeries::SeriesTypePercentBar: {
+        case QSeries::SeriesTypePercentBar: {
 
             QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);
             PercentBarPresenter* item = new PercentBarPresenter(percentBarSeries,m_chart);
@@ -155,7 +155,7 @@ void ChartPresenter::handleSeriesAdded(QChartSeries* series)
             m_chartItems.insert(series,item);
             break;
         }
-        case QChartSeries::SeriesTypeScatter: {
+        case QSeries::SeriesTypeScatter: {
             QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
             ScatterPresenter *scatterPresenter = new ScatterPresenter(scatterSeries, m_chart);
             QObject::connect(scatterPresenter, SIGNAL(clicked()), scatterSeries, SIGNAL(clicked()));
@@ -165,7 +165,7 @@ void ChartPresenter::handleSeriesAdded(QChartSeries* series)
             m_chartItems.insert(scatterSeries, scatterPresenter);
             break;
         }
-        case QChartSeries::SeriesTypePie: {
+        case QSeries::SeriesTypePie: {
             QPieSeries *s = qobject_cast<QPieSeries *>(series);
             PiePresenter* pie = new PiePresenter(m_chart, s);
             m_chartTheme->decorate(pie, s, m_chartItems.count());
@@ -197,18 +197,18 @@ void ChartPresenter::handleSeriesAdded(QChartSeries* series)
     if(m_rect.isValid()) emit geometryChanged(m_rect);
 }
 
-void ChartPresenter::handleSeriesRemoved(QChartSeries* series)
+void ChartPresenter::handleSeriesRemoved(QSeries* series)
 {
 	ChartItem* item = m_chartItems.take(series);
 	delete item;
 }
 
-void ChartPresenter::handleSeriesChanged(QChartSeries* series)
+void ChartPresenter::handleSeriesChanged(QSeries* series)
 {
     //TODO:
 }
 
-void ChartPresenter::handleSeriesDomainChanged(QChartSeries* series, const Domain& domain)
+void ChartPresenter::handleSeriesDomainChanged(QSeries* series, const Domain& domain)
 {
     m_chartItems.value(series)->handleDomainChanged(domain);
 }
@@ -225,7 +225,7 @@ void ChartPresenter::setChartTheme(QChart::ChartTheme theme)
     m_chartTheme = ChartTheme::createTheme(theme);
 
     m_chartTheme->decorate(m_chart);
-    QMapIterator<QChartSeries*,ChartItem*> i(m_chartItems);
+    QMapIterator<QSeries*,ChartItem*> i(m_chartItems);
 
     int index=0;
     while (i.hasNext()) {
@@ -255,13 +255,13 @@ void ChartPresenter::setAnimationOptions(QChart::AnimationOptions options)
         //recreate elements
 
         QList<QChartAxis*> axisList = m_axisItems.uniqueKeys();
-        QList<QChartSeries*> seriesList = m_chartItems.uniqueKeys();
+        QList<QSeries*> seriesList = m_chartItems.uniqueKeys();
 
         foreach(QChartAxis* axis, axisList) {
             handleAxisRemoved(axis);
             handleAxisAdded(axis);
         }
-        foreach(QChartSeries* series, seriesList) {
+        foreach(QSeries* series, seriesList) {
             handleSeriesRemoved(series);
             handleSeriesAdded(series);
         }
diff --git a/src/chartpresenter_p.h b/src/chartpresenter_p.h
index 456284f..72f7ddc 100644
--- a/src/chartpresenter_p.h
+++ b/src/chartpresenter_p.h
@@ -9,7 +9,7 @@
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 class ChartItem;
-class QChartSeries;
+class QSeries;
 class ChartDataSet;
 //class QChart;
 class Domain;
@@ -40,18 +40,18 @@ private:
     void createConnections();
 
 public slots:
-    void handleSeriesAdded(QChartSeries* series);
-    void handleSeriesRemoved(QChartSeries* series);
+    void handleSeriesAdded(QSeries* series);
+    void handleSeriesRemoved(QSeries* series);
     void handleAxisAdded(QChartAxis* axis);
     void handleAxisRemoved(QChartAxis* axis);
-    void handleSeriesDomainChanged(QChartSeries* series, const Domain& domain);
+    void handleSeriesDomainChanged(QSeries* series, const Domain& domain);
     void handleAxisLabelsChanged(QChartAxis* axis, const QStringList& labels);
-    void handleSeriesChanged(QChartSeries* series);
+    void handleSeriesChanged(QSeries* series);
     void handleGeometryChanged();
 signals:
     void geometryChanged(const QRectF& rect);
 private:
-    QMap<QChartSeries*,ChartItem*> m_chartItems;
+    QMap<QSeries*,ChartItem*> m_chartItems;
     QMap<QChartAxis*,AxisItem*> m_axisItems;
     QChart* m_chart;
     ChartDataSet* m_dataset;
diff --git a/src/charttheme.cpp b/src/charttheme.cpp
index 38616c2..a244a6c 100644
--- a/src/charttheme.cpp
+++ b/src/charttheme.cpp
@@ -80,35 +80,35 @@ void ChartTheme::decorate(QChart* chart)
     chart->setChartBackgroundBrush(backgroundGradient);
 }
 //TODO helper to by removed later
-void ChartTheme::decorate(ChartItem* item, QChartSeries* series,int count)
+void ChartTheme::decorate(ChartItem* item, QSeries* series,int count)
 {
     switch(series->type())
     {
-        case QChartSeries::SeriesTypeLine: {
+        case QSeries::SeriesTypeLine: {
             QLineSeries* s = static_cast<QLineSeries*>(series);
             LineChartItem* i = static_cast<LineChartItem*>(item);
             decorate(i,s,count);
             break;
         }
-        case QChartSeries::SeriesTypeBar: {
+        case QSeries::SeriesTypeBar: {
             QBarSeries* b = static_cast<QBarSeries*>(series);
             BarPresenter* i = static_cast<BarPresenter*>(item);
             decorate(i,b,count);
             break;
         }
-        case QChartSeries::SeriesTypeStackedBar: {
+        case QSeries::SeriesTypeStackedBar: {
             QStackedBarSeries* s = static_cast<QStackedBarSeries*>(series);
             StackedBarPresenter* i = static_cast<StackedBarPresenter*>(item);
             decorate(i,s,count);
             break;
         }
-        case QChartSeries::SeriesTypePercentBar: {
+        case QSeries::SeriesTypePercentBar: {
             QPercentBarSeries* s = static_cast<QPercentBarSeries*>(series);
             PercentBarPresenter* i = static_cast<PercentBarPresenter*>(item);
             decorate(i,s,count);
             break;
         }
-        case QChartSeries::SeriesTypeScatter: {
+        case QSeries::SeriesTypeScatter: {
             QScatterSeries* s = qobject_cast<QScatterSeries*>(series);
             Q_ASSERT(s);
             ScatterPresenter* i = static_cast<ScatterPresenter*>(item);
@@ -116,7 +116,7 @@ void ChartTheme::decorate(ChartItem* item, QChartSeries* series,int count)
             decorate(i, s, count);
             break;
         }
-        case QChartSeries::SeriesTypePie: {
+        case QSeries::SeriesTypePie: {
             QPieSeries* s = static_cast<QPieSeries*>(series);
             PiePresenter* i = static_cast<PiePresenter*>(item);
             decorate(i,s,count);
diff --git a/src/charttheme_p.h b/src/charttheme_p.h
index e488a03..16a031f 100644
--- a/src/charttheme_p.h
+++ b/src/charttheme_p.h
@@ -8,7 +8,7 @@
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 class ChartItem;
-class QChartSeries;
+class QSeries;
 class LineChartItem;
 class QLineSeries;
 class BarPresenter;
@@ -30,7 +30,7 @@ public:
     static ChartTheme* createTheme(QChart::ChartTheme theme);
     QChart::ChartTheme id() const {return m_id;}
     void decorate(QChart* chart);
-    void decorate(ChartItem* item, QChartSeries* series,int count);
+    void decorate(ChartItem* item, QSeries* series,int count);
     void decorate(BarPresenter* item, QBarSeries* series,int count);
     void decorate(StackedBarPresenter* item, QStackedBarSeries* series,int count);
     void decorate(PercentBarPresenter* item, QPercentBarSeries* series,int count);
diff --git a/src/linechart/qlineseries.cpp b/src/linechart/qlineseries.cpp
index 58d3218..9cc9c59 100644
--- a/src/linechart/qlineseries.cpp
+++ b/src/linechart/qlineseries.cpp
@@ -28,9 +28,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn virtual QChartSeriesType QLineSeries::type() const
+    \fn virtual QSeriesType QLineSeries::type() const
     \brief Returns type of series.
-    \sa QChartSeries, QChartSeriesType
+    \sa QSeries, QSeriesType
 */
 
 /*!
@@ -55,7 +55,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
     Constructs empty series object which is a child of \a parent.
     When series object is added to QChartView or QChart instance ownerships is transfered.
 */
-QLineSeries::QLineSeries(QObject* parent):QChartSeries(parent),
+QLineSeries::QLineSeries(QObject* parent):QSeries(parent),
 m_pointsVisible(false)
 {
 }
diff --git a/src/linechart/qlineseries.h b/src/linechart/qlineseries.h
index 4e9a6ef..d32f619 100644
--- a/src/linechart/qlineseries.h
+++ b/src/linechart/qlineseries.h
@@ -1,15 +1,15 @@
-#ifndef QLINECHARTSERIES_H_
-#define QLINECHARTSERIES_H_
+#ifndef QLINESERIES_H_
+#define QLINESERIES_H_
 
 #include "qchartglobal.h"
-#include "qchartseries.h"
+#include "qseries.h"
 #include <QDebug>
 #include <QPen>
 #include <QBrush>
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-class QTCOMMERCIALCHART_EXPORT QLineSeries : public QChartSeries
+class QTCOMMERCIALCHART_EXPORT QLineSeries : public QSeries
 {
     Q_OBJECT
 public:
@@ -17,7 +17,7 @@ public:
     virtual ~QLineSeries();
 
 public: // from QChartSeries
-    virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeLine;}
+    virtual QSeriesType type() const { return QSeries::SeriesTypeLine;}
     void add(qreal x, qreal y);
     void add(const QPointF& point);
     void replace(qreal x,qreal y);
diff --git a/src/piechart/qpieseries.cpp b/src/piechart/qpieseries.cpp
index 4e7cdde..5eb1c58 100644
--- a/src/piechart/qpieseries.cpp
+++ b/src/piechart/qpieseries.cpp
@@ -124,7 +124,7 @@ bool QPieSeries::ChangeSet::isEmpty() const
     Constructs a series object which is a child of \a parent.
 */
 QPieSeries::QPieSeries(QObject *parent) :
-    QChartSeries(parent),
+    QSeries(parent),
     m_sizeFactor(1.0),
     m_position(PiePositionMaximized),
     m_pieStartAngle(0),
@@ -144,9 +144,9 @@ QPieSeries::~QPieSeries()
 /*!
     Returns QChartSeries::SeriesTypePie.
 */
-QChartSeries::QChartSeriesType QPieSeries::type() const
+QSeries::QSeriesType QPieSeries::type() const
 {
-    return QChartSeries::SeriesTypePie;
+    return QSeries::SeriesTypePie;
 }
 
 /*!
diff --git a/src/piechart/qpieseries.h b/src/piechart/qpieseries.h
index e5fc492..289900b 100644
--- a/src/piechart/qpieseries.h
+++ b/src/piechart/qpieseries.h
@@ -1,7 +1,7 @@
 #ifndef PIESERIES_H
 #define PIESERIES_H
 
-#include "qchartseries.h"
+#include "qseries.h"
 #include <QObject>
 #include <QRectF>
 #include <QColor>
@@ -15,7 +15,7 @@ class PiePresenter;
 class PieSlice;
 class QPieSlice;
 
-class QTCOMMERCIALCHART_EXPORT QPieSeries : public QChartSeries
+class QTCOMMERCIALCHART_EXPORT QPieSeries : public QSeries
 {
     Q_OBJECT
 
@@ -55,7 +55,7 @@ public:
     virtual ~QPieSeries();
 
 public: // from QChartSeries
-    QChartSeriesType type() const;
+    QSeriesType type() const;
     virtual bool setData(QList<qreal> data);  // TODO: remove this
 
 public:
diff --git a/src/qchart.cpp b/src/qchart.cpp
index 6f061dd..f2a3586 100644
--- a/src/qchart.cpp
+++ b/src/qchart.cpp
@@ -65,7 +65,7 @@ QChart::~QChart()
     If auto scaling is enabled, re-scales the axes the series is bound to (both the x axis and
     the y axis).
 */
-void QChart::addSeries(QChartSeries* series, QChartAxis* axisY)
+void QChart::addSeries(QSeries* series, QChartAxis* axisY)
 {
     m_dataset->addSeries(series, axisY);
 }
@@ -76,7 +76,7 @@ void QChart::addSeries(QChartSeries* series, QChartAxis* axisY)
     It does not delete the pointed QChartSeries data object
     \sa addSeries(), removeAllSeries()
 */
-void QChart::removeSeries(QChartSeries* series)
+void QChart::removeSeries(QSeries* series)
 {
     m_dataset->removeSeries(series);
 }
diff --git a/src/qchart.h b/src/qchart.h
index a396c5b..5f29265 100644
--- a/src/qchart.h
+++ b/src/qchart.h
@@ -2,7 +2,7 @@
 #define QCHART_H
 
 #include <qchartglobal.h>
-#include <qchartseries.h>
+#include <qseries.h>
 #include <QGraphicsWidget>
 #include <QLinearGradient>
 #include <QFont>
@@ -12,7 +12,7 @@ class QGraphicsSceneResizeEvent;
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 class AxisItem;
-class QChartSeries;
+class QSeries;
 class PlotDomain;
 class BarPresenter;
 class QChartAxis;
@@ -47,8 +47,8 @@ public:
     QChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
     ~QChart();
 
-    void addSeries(QChartSeries* series, QChartAxis* axisY = 0);
-    void removeSeries(QChartSeries* series); //returns ownership , deletes axis if no series attached
+    void addSeries(QSeries* series, QChartAxis* axisY = 0);
+    void removeSeries(QSeries* series); //returns ownership , deletes axis if no series attached
     void removeAllSeries(); // deletes series and axis
 
     void setMargin(int margin);
diff --git a/src/qchartview.cpp b/src/qchartview.cpp
index f80ec76..f544b1e 100644
--- a/src/qchartview.cpp
+++ b/src/qchartview.cpp
@@ -75,7 +75,7 @@ void QChartView::resizeEvent(QResizeEvent *event)
     the y axis).
     \sa removeSeries(), removeAllSeries()
 */
-void QChartView::addSeries(QChartSeries* series,QChartAxis *axisY)
+void QChartView::addSeries(QSeries* series,QChartAxis *axisY)
 {
     m_chart->addSeries(series,axisY);
 }
@@ -86,7 +86,7 @@ void QChartView::addSeries(QChartSeries* series,QChartAxis *axisY)
     It does not delete the pointed QChartSeries data object
     \sa addSeries(), removeAllSeries()
 */
-void QChartView::removeSeries(QChartSeries* series)
+void QChartView::removeSeries(QSeries* series)
 {
     m_chart->removeSeries(series);
 }
diff --git a/src/qchartview.h b/src/qchartview.h
index 237092c..0272edb 100644
--- a/src/qchartview.h
+++ b/src/qchartview.h
@@ -2,7 +2,7 @@
 #define QCHARTWIDGET_H
 
 #include "qchartglobal.h"
-#include "qchartseries.h"
+#include "qseries.h"
 #include "qchart.h"
 #include <QGraphicsView>
 
@@ -24,8 +24,8 @@ public:
     //implement from QWidget
     void resizeEvent(QResizeEvent *event);
 
-    void addSeries(QChartSeries* series,QChartAxis* axisY=0);// takes series ownership , takes axis ownership
-    void removeSeries(QChartSeries* series); //returns ownership , deletes axis if no series attached
+    void addSeries(QSeries* series,QChartAxis* axisY=0);// takes series ownership , takes axis ownership
+    void removeSeries(QSeries* series); //returns ownership , deletes axis if no series attached
     void removeAllSeries(); // deletes series and axis
     int margin() const;
 
diff --git a/src/qchartseries.cpp b/src/qseries.cpp
similarity index 82%
rename from src/qchartseries.cpp
rename to src/qseries.cpp
index 5df08fc..01fc4a0 100644
--- a/src/qchartseries.cpp
+++ b/src/qseries.cpp
@@ -1,7 +1,7 @@
-#include "qchartseries.h"
+#include "qseries.h"
 
 /*!
-    \class QChartSeries
+    \class QSeries
     \brief Base class for all QtCommercial Chart series.
     \mainclass
 
@@ -10,7 +10,7 @@
 */
 
 /*!
-    \enum QChartSeries::QChartSeriesType
+    \enum QSeries::QSeriesType
 
     The type of the series object.
 
@@ -25,22 +25,22 @@
 */
 
 /*!
-    \fn QChartSeries::QChartSeries(QObject *parent)
+    \fn QSeries::QSeries(QObject *parent)
     \brief Constructs ChartSeries object with \a parent.
 */
 
 /*!
-    \fn QChartSeries::~QChartSeries()
+    \fn QSeries::~QSeries()
     \brief Virtual destructor for the chart series.
 */
 
 /*!
-    \fn QChartSeriesType QChartSeries::type() const
+    \fn QSeriesType QSeries::type() const
     \brief The type of the series.
 */
 
 /*!
-    \fn bool QChartSeries::setModel(QAbstractItemModel *model)
+    \fn bool QSeries::setModel(QAbstractItemModel *model)
     \brief Use the \a model to provide data for the series. The model overrides possible user data
     set with QChartSeries type specific data setters. For example if you call both
     QScatterSeries::addData() and QScatterSeries::setModel, only the data provided by the model is
@@ -48,5 +48,5 @@
 */
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
-#include "moc_qchartseries.cpp"
+#include "moc_qseries.cpp"
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/qchartseries.h b/src/qseries.h
similarity index 76%
rename from src/qchartseries.h
rename to src/qseries.h
index e8ff21f..8cc8782 100644
--- a/src/qchartseries.h
+++ b/src/qseries.h
@@ -1,5 +1,5 @@
-#ifndef QCHARTSERIES_H
-#define QCHARTSERIES_H
+#ifndef QSERIES_H
+#define QSERIES_H
 
 #include "qchartglobal.h"
 #include <QObject>
@@ -7,11 +7,11 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-class QTCOMMERCIALCHART_EXPORT QChartSeries : public QObject
+class QTCOMMERCIALCHART_EXPORT QSeries : public QObject
 {
     Q_OBJECT
 public:
-    enum QChartSeriesType {
+    enum QSeriesType {
         SeriesTypeLine,
         SeriesTypeArea,
         SeriesTypeBar,
@@ -23,11 +23,11 @@ public:
     };
 
 protected:
-    QChartSeries(QObject *parent = 0) : QObject(parent) {}
+    QSeries(QObject *parent = 0) : QObject(parent) {}
 
 public:
-    virtual ~QChartSeries() {}
-    virtual QChartSeriesType type() const = 0;
+    virtual ~QSeries() {}
+    virtual QSeriesType type() const = 0;
     // TODO
     virtual bool setModel(QAbstractItemModel* /*model*/) { return false; }
 };
diff --git a/src/scatterseries/qscatterseries.cpp b/src/scatterseries/qscatterseries.cpp
index 969d4e5..09a377a 100644
--- a/src/scatterseries/qscatterseries.cpp
+++ b/src/scatterseries/qscatterseries.cpp
@@ -62,7 +62,7 @@ QScatterSeriesPrivate::QScatterSeriesPrivate() :
     Constructs a series object which is a child of \a parent.
 */
 QScatterSeries::QScatterSeries(QObject *parent) :
-    QChartSeries(parent),
+    QSeries(parent),
     d(new QScatterSeriesPrivate())
 {
 }
diff --git a/src/scatterseries/qscatterseries.h b/src/scatterseries/qscatterseries.h
index 20ec3ab..0063390 100644
--- a/src/scatterseries/qscatterseries.h
+++ b/src/scatterseries/qscatterseries.h
@@ -1,14 +1,14 @@
 #ifndef QSCATTERSERIES_H
 #define QSCATTERSERIES_H
 
-#include "qchartseries.h"
+#include "qseries.h"
 #include <QRectF>
 #include <QColor>
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 class QScatterSeriesPrivate;
 
-class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QChartSeries
+class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QSeries
 {
     Q_OBJECT
 
@@ -30,7 +30,7 @@ public:
     ~QScatterSeries();
 
 public: // from QChartSeries
-    QChartSeriesType type() const { return QChartSeries::SeriesTypeScatter; }
+    QSeriesType type() const { return QSeries::SeriesTypeScatter; }
 
 public:
     void add(qreal x, qreal y);
diff --git a/src/scatterseries/scatterseries_p.h b/src/scatterseries/scatterseries_p.h
index 8ca522e..4518812 100644
--- a/src/scatterseries/scatterseries_p.h
+++ b/src/scatterseries/scatterseries_p.h
@@ -2,7 +2,7 @@
 #define QSCATTERSERIESPRIVATE_H
 
 #include "qchartglobal.h"
-#include "qchartseries.h"
+#include "qseries.h"
 #include <QPen>
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
diff --git a/src/src.pro b/src/src.pro
index 9a29bd6..1bc5f5c 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -6,8 +6,7 @@ QT += core \
     gui
 CONFIG += debug_and_release
 CONFIG(debug, debug|release):TARGET = QtCommercialChartd
-SOURCES += \
-    axisitem.cpp \
+SOURCES += axisitem.cpp \
     axisanimationitem.cpp \
     chartdataset.cpp \
     chartpresenter.cpp \
@@ -15,28 +14,24 @@ SOURCES += \
     domain.cpp \
     qchart.cpp \
     qchartaxis.cpp \
-    qchartseries.cpp \
-    qchartview.cpp 
-PRIVATE_HEADERS += \
-    axisitem_p.h \
+    qchartview.cpp \
+    qseries.cpp
+PRIVATE_HEADERS += axisitem_p.h \
     axisanimationitem_p.h \
     chartdataset_p.h \
     chartitem_p.h \
     chartpresenter_p.h \
     charttheme_p.h \
     domain_p.h
-PUBLIC_HEADERS += \
-    qchart.h \
+PUBLIC_HEADERS += qchart.h \
     qchartaxis.h \
     qchartglobal.h \
-    qchartseries.h \
-    qchartview.h \
-
-include(linechart/linechart.pri)   
-include(barchart/barchart.pri)    
+    qseries.h \
+    qchartview.h
+include(linechart/linechart.pri)
+include(barchart/barchart.pri)
 include(piechart/piechart.pri)
 include(scatterseries/scatter.pri)
-
 THEMES += themes/chartthemeicy_p.h \
     themes/chartthemegrayscale_p.h \
     themes/chartthemescientific_p.h \
@@ -74,7 +69,8 @@ install_build_private_headers.commands = $$QMAKE_COPY \
     $$CHART_BUILD_PRIVATE_HEADER_DIR
 install_build_private_headers.CONFIG += target_predeps \
     no_link
-QMAKE_EXTRA_COMPILERS += install_build_public_headers install_build_private_headers
+QMAKE_EXTRA_COMPILERS += install_build_public_headers \
+    install_build_private_headers
 chartversion.target = qchartversion_p.h
 chartversion.commands = @echo \
     "build_time" \
@@ -91,4 +87,3 @@ unix:QMAKE_DISTCLEAN += -r \
 win32:QMAKE_DISTCLEAN += /Q \
     $$CHART_BUILD_HEADER_DIR \
     $$CHART_BUILD_LIB_DIR
-
diff --git a/test/auto/chartdataset/tst_chartdataset.cpp b/test/auto/chartdataset/tst_chartdataset.cpp
index e43cea1..2bf9185 100644
--- a/test/auto/chartdataset/tst_chartdataset.cpp
+++ b/test/auto/chartdataset/tst_chartdataset.cpp
@@ -1,6 +1,5 @@
 #include <QtTest/QtTest>
 #include <qchartaxis.h>
-#include <qchartseries.h>
 #include <qlineseries.h>
 #include <private/chartdataset_p.h>
 #include <private/domain_p.h>
@@ -9,7 +8,7 @@ QTCOMMERCIALCHART_USE_NAMESPACE
 
 Q_DECLARE_METATYPE(Domain)
 Q_DECLARE_METATYPE(QChartAxis*)
-Q_DECLARE_METATYPE(QChartSeries*)
+Q_DECLARE_METATYPE(QSeries*)
 Q_DECLARE_METATYPE(QLineSeries*)
 
 class tst_ChartDataSet: public QObject {
@@ -47,7 +46,7 @@ void tst_ChartDataSet::initTestCase()
 {
 	qRegisterMetaType<Domain>("Domain");
 	qRegisterMetaType<QChartAxis*>();
-	qRegisterMetaType<QChartSeries*>();
+	qRegisterMetaType<QSeries*>();
 }
 
 void tst_ChartDataSet::cleanupTestCase()
@@ -111,10 +110,10 @@ void tst_ChartDataSet::addDomain()
 	QSignalSpy spy1(&dataSet,
 			SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
 	QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
-	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
+	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
 	QSignalSpy spy4(&dataSet,
-			SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
-	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
+			SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
+	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
 
 	Domain domain2 = dataSet.domain(dataSet.axisY());
 	QVERIFY(domain1 == domain2);
@@ -157,10 +156,10 @@ void tst_ChartDataSet::addSeries()
 	QSignalSpy spy1(&dataSet,
 			SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
 	QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
-	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
+	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
 	QSignalSpy spy4(&dataSet,
-			SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
-	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
+			SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
+	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
 
 	QList<QChartAxis*> axisList;
 
@@ -271,10 +270,10 @@ void tst_ChartDataSet::clearDomains()
 	QSignalSpy spy1(&dataSet,
 			SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
 	QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
-	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
+	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
 	QSignalSpy spy4(&dataSet,
-			SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
-	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
+			SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
+	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
 
 	dataSet.clearDomains(indexCount);
 
@@ -329,10 +328,10 @@ void tst_ChartDataSet::domain()
 	QSignalSpy spy1(&dataSet,
 			SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
 	QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
-	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
+	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
 	QSignalSpy spy4(&dataSet,
-			SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
-	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
+			SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
+	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
 
 	dataSet.addSeries(series1);
 	dataSet.addSeries(series2);
@@ -406,10 +405,10 @@ void tst_ChartDataSet::nextpreviousDomain()
 	QSignalSpy spy1(&dataSet,
 			SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
 	QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
-	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
+	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
 	QSignalSpy spy4(&dataSet,
-			SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
-	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
+			SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
+	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
 
 	Domain domain;
 
@@ -476,7 +475,7 @@ void tst_ChartDataSet::removeSeries()
 	ChartDataSet dataSet;
 
 	QList<QChartAxis*> axisList;
-	QList<QChartSeries*> seriesList;
+	QList<QSeries*> seriesList;
 
 	for (int i = 0; i < axisYCount; i++) {
 		QChartAxis* axis = new QChartAxis();
@@ -504,10 +503,10 @@ void tst_ChartDataSet::removeSeries()
 	QSignalSpy spy1(&dataSet,
 			SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
 	QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
-	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
+	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
 	QSignalSpy spy4(&dataSet,
-			SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
-	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
+			SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
+	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
 
 	for (int i = 0; i < seriesCount; i++) {
 		dataSet.removeSeries(seriesList.at(i));
@@ -574,9 +573,9 @@ void tst_ChartDataSet::removeAllSeries()
     QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*)));
     QSignalSpy spy1(&dataSet, SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
     QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
-    QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
-    QSignalSpy spy4(&dataSet, SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
-    QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
+    QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
+    QSignalSpy spy4(&dataSet, SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
+    QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
 
     dataSet.removeAllSeries();
     //default axis
diff --git a/test/chartwidgettest/mainwidget.cpp b/test/chartwidgettest/mainwidget.cpp
index 869dee4..cf6d988 100644
--- a/test/chartwidgettest/mainwidget.cpp
+++ b/test/chartwidgettest/mainwidget.cpp
@@ -1,6 +1,5 @@
 #include "mainwidget.h"
 #include "dataseriedialog.h"
-#include "qchartseries.h"
 #include "qpieseries.h"
 #include "qscatterseries.h"
 #include <qlineseries.h>
@@ -281,24 +280,24 @@ void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QS
     // TODO: spline and area
 }
 
-void MainWidget::setCurrentSeries(QChartSeries *series)
+void MainWidget::setCurrentSeries(QSeries *series)
 {
     if (series) {
         m_currentSeries = series;
         switch (m_currentSeries->type()) {
-        case QChartSeries::SeriesTypeLine:
+        case QSeries::SeriesTypeLine:
             break;
-        case QChartSeries::SeriesTypeScatter:
+        case QSeries::SeriesTypeScatter:
             break;
-        case QChartSeries::SeriesTypePie:
+        case QSeries::SeriesTypePie:
             break;
-        case QChartSeries::SeriesTypeBar:
+        case QSeries::SeriesTypeBar:
             qDebug() << "setCurrentSeries (bar)";
             break;
-        case QChartSeries::SeriesTypeStackedBar:
+        case QSeries::SeriesTypeStackedBar:
             qDebug() << "setCurrentSeries (Stackedbar)";
             break;
-        case QChartSeries::SeriesTypePercentBar:
+        case QSeries::SeriesTypePercentBar:
             qDebug() << "setCurrentSeries (Percentbar)";
             break;
         default:
diff --git a/test/chartwidgettest/mainwidget.h b/test/chartwidgettest/mainwidget.h
index 21fe2fc..9ddc288 100644
--- a/test/chartwidgettest/mainwidget.h
+++ b/test/chartwidgettest/mainwidget.h
@@ -36,7 +36,7 @@ private slots:
     void xMaxChanged(int value);
     void yMinChanged(int value);
     void yMaxChanged(int value);
-    void setCurrentSeries(QChartSeries *series);
+    void setCurrentSeries(QSeries *series);
     void changeChartTheme(int themeIndex);
     void setPieSizeFactor(double margin);
     void setPiePosition(int position);
@@ -51,7 +51,7 @@ private:
     QSpinBox *m_yMinSpin;
     QSpinBox *m_yMaxSpin;
     QString m_defaultSeriesName;
-    QChartSeries *m_currentSeries;
+    QSeries *m_currentSeries;
     QGridLayout *m_scatterLayout;
     QGridLayout *m_pieLayout;
 };