diff --git a/src/areachart/qareaseries.cpp b/src/areachart/qareaseries.cpp
index 28970f4..f07d6d5 100644
--- a/src/areachart/qareaseries.cpp
+++ b/src/areachart/qareaseries.cpp
@@ -356,7 +356,7 @@ void QAreaSeriesPrivate::scaleDomain(Domain& domain)
     domain.setRange(minX,maxX,minY,maxY);
 }
 
-Chart* QAreaSeriesPrivate::createGraphics(ChartPresenter* presenter)
+ChartElement* QAreaSeriesPrivate::createGraphics(ChartPresenter* presenter)
 {
     Q_Q(QAreaSeries);
 
diff --git a/src/areachart/qareaseries_p.h b/src/areachart/qareaseries_p.h
index cf3a8f4..ce4487d 100644
--- a/src/areachart/qareaseries_p.h
+++ b/src/areachart/qareaseries_p.h
@@ -44,7 +44,7 @@ public:
     QAreaSeriesPrivate(QLineSeries *upperSeries, QLineSeries *lowerSeries,QAreaSeries* q);
 
     void scaleDomain(Domain& domain);
-    Chart* createGraphics(ChartPresenter* presenter);
+    ChartElement* createGraphics(ChartPresenter* presenter);
     QList<LegendMarker*> createLegendMarker(QLegend* legend);
     void initializeAxis(QAbstractAxis* axis);
     QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;
diff --git a/src/axis/chartaxis.cpp b/src/axis/chartaxis.cpp
index 60356ec..1095ec9 100644
--- a/src/axis/chartaxis.cpp
+++ b/src/axis/chartaxis.cpp
@@ -28,7 +28,7 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-ChartAxis::ChartAxis(QAbstractAxis *axis,ChartPresenter *presenter) : Chart(presenter),
+ChartAxis::ChartAxis(QAbstractAxis *axis,ChartPresenter *presenter) : ChartElement(presenter),
     m_chartAxis(axis),
     m_labelsAngle(0),
     m_grid(new QGraphicsItemGroup(presenter->rootItem())),
diff --git a/src/axis/chartaxis_p.h b/src/axis/chartaxis_p.h
index 2dd63b9..671acbf 100644
--- a/src/axis/chartaxis_p.h
+++ b/src/axis/chartaxis_p.h
@@ -31,7 +31,7 @@
 #define CHARTAXIS_H
 
 #include "qchartglobal.h"
-#include "chart_p.h"
+#include "chartelement_p.h"
 #include "axisanimation_p.h"
 #include <QGraphicsItem>
 #include <QFont>
@@ -41,7 +41,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 class QAbstractAxis;
 class ChartPresenter;
 
-class ChartAxis : public Chart
+class ChartAxis : public ChartElement
 {
     Q_OBJECT
 public:
diff --git a/src/barchart/horizontal/bar/qhorizontalbarseries.cpp b/src/barchart/horizontal/bar/qhorizontalbarseries.cpp
index 26cf632..6e8f8fb 100644
--- a/src/barchart/horizontal/bar/qhorizontalbarseries.cpp
+++ b/src/barchart/horizontal/bar/qhorizontalbarseries.cpp
@@ -101,7 +101,7 @@ void QHorizontalBarSeriesPrivate::scaleDomain(Domain& domain)
     domain.setRange(minX,maxX,minY,maxY);
 }
 
-Chart* QHorizontalBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
+ChartElement* QHorizontalBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
 {
     Q_Q(QHorizontalBarSeries);
 
diff --git a/src/barchart/horizontal/bar/qhorizontalbarseries_p.h b/src/barchart/horizontal/bar/qhorizontalbarseries_p.h
index 1bc22c4..91aa205 100644
--- a/src/barchart/horizontal/bar/qhorizontalbarseries_p.h
+++ b/src/barchart/horizontal/bar/qhorizontalbarseries_p.h
@@ -39,7 +39,7 @@ class QHorizontalBarSeriesPrivate: public QAbstractBarSeriesPrivate
 {
 public:
     QHorizontalBarSeriesPrivate(QHorizontalBarSeries* q);
-    Chart* createGraphics(ChartPresenter* presenter);
+    ChartElement* createGraphics(ChartPresenter* presenter);
     void scaleDomain(Domain& domain);
 private:
     Q_DECLARE_PUBLIC(QHorizontalBarSeries)
diff --git a/src/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp b/src/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp
index 5d95f5c..b001488 100644
--- a/src/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp
+++ b/src/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp
@@ -49,7 +49,7 @@ void QHorizontalPercentBarSeriesPrivate::scaleDomain(Domain& domain)
     domain.setRange(minX,maxX,minY,maxY);
 }
 
-Chart* QHorizontalPercentBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
+ChartElement* QHorizontalPercentBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
 {
     Q_Q(QHorizontalPercentBarSeries);
 
diff --git a/src/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h b/src/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h
index 8327bc3..98fbe49 100644
--- a/src/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h
+++ b/src/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h
@@ -39,7 +39,7 @@ class QHorizontalPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate
 {
 public:
     QHorizontalPercentBarSeriesPrivate(QHorizontalPercentBarSeries* q);
-    Chart* createGraphics(ChartPresenter* presenter);
+    ChartElement* createGraphics(ChartPresenter* presenter);
     void scaleDomain(Domain& domain);
 private:
     Q_DECLARE_PUBLIC(QHorizontalPercentBarSeries)
diff --git a/src/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp b/src/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp
index acd5a0c..0175689 100644
--- a/src/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp
+++ b/src/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp
@@ -50,7 +50,7 @@ void QHorizontalStackedBarSeriesPrivate::scaleDomain(Domain& domain)
     domain.setRange(minX,maxX,minY,maxY);
 }
 
-Chart* QHorizontalStackedBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
+ChartElement* QHorizontalStackedBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
 {
     Q_Q(QHorizontalStackedBarSeries);
 
diff --git a/src/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h b/src/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h
index 32f0564..7ab1f26 100644
--- a/src/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h
+++ b/src/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h
@@ -39,7 +39,7 @@ class QHorizontalStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate
 {
 public:
     QHorizontalStackedBarSeriesPrivate(QHorizontalStackedBarSeries* q);
-    Chart* createGraphics(ChartPresenter* presenter);
+    ChartElement* createGraphics(ChartPresenter* presenter);
     void scaleDomain(Domain& domain);
 private:
     Q_DECLARE_PUBLIC(QHorizontalStackedBarSeries)
diff --git a/src/barchart/qabstractbarseries.cpp b/src/barchart/qabstractbarseries.cpp
index 39b07ca..90c637f 100644
--- a/src/barchart/qabstractbarseries.cpp
+++ b/src/barchart/qabstractbarseries.cpp
@@ -26,7 +26,6 @@
 #include "legendmarker_p.h"
 #include "chartdataset_p.h"
 #include "charttheme_p.h"
-#include "chartanimator_p.h"
 #include "qvaluesaxis.h"
 #include "qbarcategoriesaxis.h"
 
@@ -569,7 +568,7 @@ void QAbstractBarSeriesPrivate::scaleDomain(Domain& domain)
     domain.setRange(minX,maxX,minY,maxY);
 }
 
-Chart* QAbstractBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
+ChartElement* QAbstractBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
 {
     Q_UNUSED(presenter);
     qWarning() << "QAbstractBarSeriesPrivate::createGraphics called";
diff --git a/src/barchart/qabstractbarseries_p.h b/src/barchart/qabstractbarseries_p.h
index 83d1774..0ba8f1a 100644
--- a/src/barchart/qabstractbarseries_p.h
+++ b/src/barchart/qabstractbarseries_p.h
@@ -54,7 +54,7 @@ public:
     void setLabelsVisible(bool visible);
 
     void scaleDomain(Domain& domain);
-    Chart* createGraphics(ChartPresenter* presenter);
+    ChartElement* createGraphics(ChartPresenter* presenter);
     QList<LegendMarker*> createLegendMarker(QLegend* legend);
 
     void initializeAxis(QAbstractAxis* axis);
diff --git a/src/barchart/vertical/bar/qbarseries.cpp b/src/barchart/vertical/bar/qbarseries.cpp
index 061a002..42d9014 100644
--- a/src/barchart/vertical/bar/qbarseries.cpp
+++ b/src/barchart/vertical/bar/qbarseries.cpp
@@ -104,7 +104,7 @@ void QBarSeriesPrivate::scaleDomain(Domain& domain)
 }
 
 
-Chart* QBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
+ChartElement* QBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
 {
     Q_Q(QBarSeries);
 
diff --git a/src/barchart/vertical/bar/qbarseries_p.h b/src/barchart/vertical/bar/qbarseries_p.h
index 8c66910..df74eff 100644
--- a/src/barchart/vertical/bar/qbarseries_p.h
+++ b/src/barchart/vertical/bar/qbarseries_p.h
@@ -40,7 +40,7 @@ class QBarSeriesPrivate: public QAbstractBarSeriesPrivate
 {
 public:
     QBarSeriesPrivate(QBarSeries* q);
-    Chart* createGraphics(ChartPresenter* presenter);
+    ChartElement* createGraphics(ChartPresenter* presenter);
     void scaleDomain(Domain& domain);
 private:
     Q_DECLARE_PUBLIC(QBarSeries)
diff --git a/src/barchart/vertical/percent/qpercentbarseries.cpp b/src/barchart/vertical/percent/qpercentbarseries.cpp
index c72a319..a95d1b3 100644
--- a/src/barchart/vertical/percent/qpercentbarseries.cpp
+++ b/src/barchart/vertical/percent/qpercentbarseries.cpp
@@ -103,7 +103,7 @@ void QPercentBarSeriesPrivate::scaleDomain(Domain& domain)
 }
 
 
-Chart* QPercentBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
+ChartElement* QPercentBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
 {
     Q_Q(QPercentBarSeries);
 
diff --git a/src/barchart/vertical/percent/qpercentbarseries_p.h b/src/barchart/vertical/percent/qpercentbarseries_p.h
index 88ba693..cb92ba9 100644
--- a/src/barchart/vertical/percent/qpercentbarseries_p.h
+++ b/src/barchart/vertical/percent/qpercentbarseries_p.h
@@ -41,7 +41,7 @@ class QPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate
 public:
     QPercentBarSeriesPrivate(QPercentBarSeries* q);
     void scaleDomain(Domain& domain);
-    Chart* createGraphics(ChartPresenter* presenter);
+    ChartElement* createGraphics(ChartPresenter* presenter);
 private:
     Q_DECLARE_PUBLIC(QPercentBarSeries)
 };
diff --git a/src/barchart/vertical/stacked/qstackedbarseries.cpp b/src/barchart/vertical/stacked/qstackedbarseries.cpp
index ab8f051..9f5d362 100644
--- a/src/barchart/vertical/stacked/qstackedbarseries.cpp
+++ b/src/barchart/vertical/stacked/qstackedbarseries.cpp
@@ -104,7 +104,7 @@ void QStackedBarSeriesPrivate::scaleDomain(Domain& domain)
 }
 
 
-Chart* QStackedBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
+ChartElement* QStackedBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
 {
     Q_Q(QStackedBarSeries);
 
diff --git a/src/barchart/vertical/stacked/qstackedbarseries_p.h b/src/barchart/vertical/stacked/qstackedbarseries_p.h
index 475c0bf..5723011 100644
--- a/src/barchart/vertical/stacked/qstackedbarseries_p.h
+++ b/src/barchart/vertical/stacked/qstackedbarseries_p.h
@@ -40,7 +40,7 @@ class QStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate
 {
 public:
     QStackedBarSeriesPrivate(QStackedBarSeries* q);
-    Chart* createGraphics(ChartPresenter* presenter);
+    ChartElement* createGraphics(ChartPresenter* presenter);
     void scaleDomain(Domain& domain);
 private:
     Q_DECLARE_PUBLIC(QStackedBarSeries)
diff --git a/src/chart.cpp b/src/chartelement.cpp
similarity index 83%
rename from src/chart.cpp
rename to src/chartelement.cpp
index 9e06e76..577403f 100644
--- a/src/chart.cpp
+++ b/src/chartelement.cpp
@@ -18,45 +18,45 @@
 **
 ****************************************************************************/
 
-#include "chart_p.h"
+#include "chartelement_p.h"
 #include "chartpresenter_p.h"
 #include "domain_p.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-Chart::Chart(ChartPresenter *presenter):QObject(presenter),
+ChartElement::ChartElement(ChartPresenter *presenter):QObject(presenter),
     m_presenter(presenter),
     m_domain(0)
 {
 }
 
-void Chart::setPresenter(ChartPresenter *presenter)
+void ChartElement::setPresenter(ChartPresenter *presenter)
 {
     m_presenter=presenter;
 }
 
-ChartPresenter* Chart::presenter() const
+ChartPresenter* ChartElement::presenter() const
 {
     return m_presenter;
 }
 
-void Chart::setDomain(Domain *domain)
+void ChartElement::setDomain(Domain *domain)
 {
     m_domain=domain;
 }
 
-Domain* Chart::domain() const
+Domain* ChartElement::domain() const
 {
     return m_domain;
 }
 
-void Chart::handleGeometryChanged(const QRectF& rect)
+void ChartElement::handleGeometryChanged(const QRectF& rect)
 {
     Q_UNUSED(rect);
     qWarning()<<"Slot not implemented";
 }
 
-void Chart::handleDomainChanged(qreal minX,qreal maxX,qreal minY,qreal maxY)
+void ChartElement::handleDomainChanged(qreal minX,qreal maxX,qreal minY,qreal maxY)
 {
     Q_UNUSED(minX);
     Q_UNUSED(maxX);
@@ -65,12 +65,12 @@ void Chart::handleDomainChanged(qreal minX,qreal maxX,qreal minY,qreal maxY)
     qWarning()<<"Slot not implemented";
 }
 
-void Chart::handleDomainUpdated()
+void ChartElement::handleDomainUpdated()
 {
     qWarning()<<"Slot not implemented";
 }
 
 
-#include "moc_chart_p.cpp"
+#include "moc_chartelement_p.cpp"
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/chart_p.h b/src/chartelement_p.h
similarity index 92%
rename from src/chart_p.h
rename to src/chartelement_p.h
index 5a2fae3..a17870b 100644
--- a/src/chart_p.h
+++ b/src/chartelement_p.h
@@ -27,8 +27,8 @@
 //
 // We mean it.
 
-#ifndef CHART_H
-#define CHART_H
+#ifndef CHARTELEMENT_H
+#define CHARTELEMENT_H
 
 #include "qchartglobal.h"
 #include <QObject>
@@ -41,11 +41,11 @@ class ChartPresenter;
 class ChartAnimation;
 class Domain;
 
-class Chart: public QObject
+class ChartElement: public QObject
 {
     Q_OBJECT
 public:
-    explicit Chart(ChartPresenter *presenter);
+    explicit ChartElement(ChartPresenter *presenter);
 
 public Q_SLOTS:
     virtual void handleGeometryChanged(const QRectF& rect);
diff --git a/src/chartitem_p.h b/src/chartitem_p.h
index 884f7ab..4637bb9 100644
--- a/src/chartitem_p.h
+++ b/src/chartitem_p.h
@@ -30,17 +30,17 @@
 #ifndef CHARTITEM_H
 #define CHARTITEM_H
 
-#include "chart_p.h"
+#include "chartelement_p.h"
 #include "chartpresenter_p.h"
 #include <QGraphicsItem>
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-class ChartItem : public QGraphicsItem, public Chart
+class ChartItem : public QGraphicsItem, public ChartElement
 {
     enum ChartItemTypes{ AXIS_ITEM = UserType + 1, XYLINE_ITEM };
 public:
-    ChartItem(ChartPresenter *presenter) : QGraphicsItem(presenter ? presenter->rootItem() : 0), Chart(presenter) {}
+    ChartItem(ChartPresenter *presenter) : QGraphicsItem(presenter ? presenter->rootItem() : 0), ChartElement(presenter) {}
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/chartpresenter.cpp b/src/chartpresenter.cpp
index cca7e21..ffe8e55 100644
--- a/src/chartpresenter.cpp
+++ b/src/chartpresenter.cpp
@@ -104,7 +104,7 @@ void ChartPresenter::handleAxisRemoved(QAbstractAxis* axis)
 
 void ChartPresenter::handleSeriesAdded(QAbstractSeries* series,Domain* domain)
 {
-    Chart *item = series->d_ptr->createGraphics(this);
+    ChartElement *item = series->d_ptr->createGraphics(this);
     Q_ASSERT(item);
     item->setDomain(domain);
 
@@ -119,7 +119,7 @@ void ChartPresenter::handleSeriesAdded(QAbstractSeries* series,Domain* domain)
 
 void ChartPresenter::handleSeriesRemoved(QAbstractSeries* series)
 {
-    Chart* item = m_chartItems.take(series);
+    ChartElement* item = m_chartItems.take(series);
     Q_ASSERT(item);
     item->deleteLater();
 }
@@ -214,7 +214,7 @@ void ChartPresenter::resetAllElements()
            handleAxisAdded(axis,domain);
     }
 
-    QMapIterator<QAbstractSeries*, Chart*> j(m_chartItems);
+    QMapIterator<QAbstractSeries*, ChartElement*> j(m_chartItems);
        while (j.hasNext()) {
               j.next();
               Domain* domain = j.value()->domain();
diff --git a/src/chartpresenter_p.h b/src/chartpresenter_p.h
index 058ea7d..4c359f4 100644
--- a/src/chartpresenter_p.h
+++ b/src/chartpresenter_p.h
@@ -36,7 +36,7 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-class Chart;
+class ChartElement;
 class QAbstractSeries;
 class ChartDataSet;
 class Domain;
@@ -157,7 +157,7 @@ private:
     QChart* m_chart;
     ChartDataSet* m_dataset;
     ChartTheme *m_chartTheme;
-    QMap<QAbstractSeries*, Chart*> m_chartItems;
+    QMap<QAbstractSeries*, ChartElement*> m_chartItems;
     QMap<QAbstractAxis*, ChartAxis*> m_axisItems;
     QRectF m_rect;
     QChart::AnimationOptions m_options;
diff --git a/src/linechart/qlineseries.cpp b/src/linechart/qlineseries.cpp
index 20d8747..1cf42a8 100644
--- a/src/linechart/qlineseries.cpp
+++ b/src/linechart/qlineseries.cpp
@@ -116,7 +116,7 @@ QLineSeriesPrivate::QLineSeriesPrivate(QLineSeries* q):QXYSeriesPrivate(q)
 
 };
 
-Chart* QLineSeriesPrivate::createGraphics(ChartPresenter* presenter)
+ChartElement* QLineSeriesPrivate::createGraphics(ChartPresenter* presenter)
 {
     Q_Q(QLineSeries);
     LineChartItem* line = new LineChartItem(q,presenter);
diff --git a/src/linechart/qlineseries_p.h b/src/linechart/qlineseries_p.h
index b925ebb..83cfaf2 100644
--- a/src/linechart/qlineseries_p.h
+++ b/src/linechart/qlineseries_p.h
@@ -39,7 +39,7 @@ class QLineSeriesPrivate: public QXYSeriesPrivate
 {
 public:
     QLineSeriesPrivate(QLineSeries* q);
-    Chart* createGraphics(ChartPresenter* presenter);
+    ChartElement* createGraphics(ChartPresenter* presenter);
 
 private:
     Q_DECLARE_PUBLIC(QLineSeries);
diff --git a/src/piechart/qpieseries.cpp b/src/piechart/qpieseries.cpp
index 4d8250b..eca6a06 100644
--- a/src/piechart/qpieseries.cpp
+++ b/src/piechart/qpieseries.cpp
@@ -818,7 +818,7 @@ void QPieSeriesPrivate::scaleDomain(Domain& domain)
     // does not apply to pie
 }
 
-Chart* QPieSeriesPrivate::createGraphics(ChartPresenter* presenter)
+ChartElement* QPieSeriesPrivate::createGraphics(ChartPresenter* presenter)
 {
     Q_Q(QPieSeries);
     PieChartItem* pie = new PieChartItem(q,presenter);
diff --git a/src/piechart/qpieseries_p.h b/src/piechart/qpieseries_p.h
index c8e62de..479b07d 100644
--- a/src/piechart/qpieseries_p.h
+++ b/src/piechart/qpieseries_p.h
@@ -45,7 +45,7 @@ public:
     ~QPieSeriesPrivate();
 
     void scaleDomain(Domain& domain);
-    Chart* createGraphics(ChartPresenter *presenter);
+    ChartElement* createGraphics(ChartPresenter *presenter);
     QList<LegendMarker*> createLegendMarker(QLegend *legend);
     void initializeAxis(QAbstractAxis* axis);
     QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;
diff --git a/src/qabstractseries_p.h b/src/qabstractseries_p.h
index 251597f..262fed4 100644
--- a/src/qabstractseries_p.h
+++ b/src/qabstractseries_p.h
@@ -36,7 +36,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 class Domain;
 class ChartPresenter;
-class Chart;
+class ChartElement;
 class LegendMarker;
 class QLegend;
 class ChartDataSet;
@@ -50,7 +50,7 @@ public:
     ~QAbstractSeriesPrivate();
 
     virtual void scaleDomain(Domain& domain) = 0;
-    virtual Chart* createGraphics(ChartPresenter* presenter) = 0;
+    virtual ChartElement* createGraphics(ChartPresenter* presenter) = 0;
     virtual QList<LegendMarker*> createLegendMarker(QLegend* legend) = 0;
     virtual void initializeAxis(QAbstractAxis* axis) = 0;
     virtual QAbstractAxis::AxisType defaultAxisType(Qt::Orientation) const = 0;
diff --git a/src/scatterchart/qscatterseries.cpp b/src/scatterchart/qscatterseries.cpp
index b45fe07..7a056ac 100644
--- a/src/scatterchart/qscatterseries.cpp
+++ b/src/scatterchart/qscatterseries.cpp
@@ -246,7 +246,7 @@ QScatterSeriesPrivate::QScatterSeriesPrivate(QScatterSeries* q) :
 {
 }
 
-Chart* QScatterSeriesPrivate::createGraphics(ChartPresenter* presenter)
+ChartElement* QScatterSeriesPrivate::createGraphics(ChartPresenter* presenter)
 {
     Q_Q(QScatterSeries);
     ScatterChartItem *scatter = new ScatterChartItem(q,presenter);
diff --git a/src/scatterchart/qscatterseries_p.h b/src/scatterchart/qscatterseries_p.h
index 6dba063..2c87715 100644
--- a/src/scatterchart/qscatterseries_p.h
+++ b/src/scatterchart/qscatterseries_p.h
@@ -38,7 +38,7 @@ class QScatterSeriesPrivate: public QXYSeriesPrivate
 {
 public:
     QScatterSeriesPrivate(QScatterSeries* q);
-    Chart* createGraphics(ChartPresenter* presenter);
+    ChartElement* createGraphics(ChartPresenter* presenter);
 
 private:
     QScatterSeries::MarkerShape m_shape;
diff --git a/src/splinechart/qsplineseries.cpp b/src/splinechart/qsplineseries.cpp
index 0459678..5b03f4c 100644
--- a/src/splinechart/qsplineseries.cpp
+++ b/src/splinechart/qsplineseries.cpp
@@ -217,7 +217,7 @@ void QSplineSeriesPrivate::updateControlPoints()
     }
 }
 
-Chart* QSplineSeriesPrivate::createGraphics(ChartPresenter* presenter)
+ChartElement* QSplineSeriesPrivate::createGraphics(ChartPresenter* presenter)
 {
     Q_Q(QSplineSeries);
     SplineChartItem* spline  = new SplineChartItem(q,presenter);
diff --git a/src/splinechart/qsplineseries_p.h b/src/splinechart/qsplineseries_p.h
index a410c7f..917f143 100644
--- a/src/splinechart/qsplineseries_p.h
+++ b/src/splinechart/qsplineseries_p.h
@@ -39,7 +39,7 @@ class QSplineSeriesPrivate: public QLineSeriesPrivate
 {
     Q_OBJECT
 public:
-    Chart* createGraphics(ChartPresenter* presenter);
+    ChartElement* createGraphics(ChartPresenter* presenter);
     QSplineSeriesPrivate(QSplineSeries* q);
 
     QPointF controlPoint(int index) const;
diff --git a/src/src.pro b/src/src.pro
index 5b0761e..c5e1780 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -36,7 +36,7 @@ SOURCES += \
     $$PWD/qchartview.cpp \
     $$PWD/qabstractseries.cpp \
     $$PWD/chartbackground.cpp \
-    $$PWD/chart.cpp \
+    $$PWD/chartelement.cpp \
     $$PWD/scroller.cpp \
     $$PWD/chartlayout.cpp
 PRIVATE_HEADERS += \
@@ -46,7 +46,7 @@ PRIVATE_HEADERS += \
     $$PWD/charttheme_p.h \
     $$PWD/domain_p.h \
     $$PWD/chartbackground_p.h \
-    $$PWD/chart_p.h \
+    $$PWD/chartelement_p.h \
     $$PWD/chartconfig_p.h \
     $$PWD/qchart_p.h \
     $$PWD/qchartview_p.h \
diff --git a/src/xychart/xychart.cpp b/src/xychart/xychart.cpp
index dc8b365..ff4d8fb 100644
--- a/src/xychart/xychart.cpp
+++ b/src/xychart/xychart.cpp
@@ -32,7 +32,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 //TODO: optimize : remove points which are not visible
 
-XYChart::XYChart(QXYSeries *series, ChartPresenter *presenter):Chart(presenter),
+XYChart::XYChart(QXYSeries *series, ChartPresenter *presenter):ChartElement(presenter),
 m_minX(0),
 m_maxX(0),
 m_minY(0),
diff --git a/src/xychart/xychart_p.h b/src/xychart/xychart_p.h
index 8d1758a..368f8fb 100644
--- a/src/xychart/xychart_p.h
+++ b/src/xychart/xychart_p.h
@@ -41,7 +41,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 class ChartPresenter;
 class QXYSeries;
 
-class XYChart :  public Chart
+class XYChart :  public ChartElement
 {
      Q_OBJECT
 public: