diff --git a/examples/customchart/main.cpp b/examples/customchart/main.cpp
index 9b17fc3..36eb552 100644
--- a/examples/customchart/main.cpp
+++ b/examples/customchart/main.cpp
@@ -74,8 +74,8 @@ int main(int argc, char *argv[])
     // Customize axis colors
     QPen axisPen(QRgb(0xd18952));
     axisPen.setWidth(2);
-    axisX->setAxisPen(axisPen);
-    axisY->setAxisPen(axisPen);
+    axisX->setLinePen(axisPen);
+    axisY->setLinePen(axisPen);
 
     // Customize axis label colors
     QBrush axisBrush(Qt::white);
diff --git a/src/axis/chartaxis.cpp b/src/axis/chartaxis.cpp
index 50137b9..208e894 100644
--- a/src/axis/chartaxis.cpp
+++ b/src/axis/chartaxis.cpp
@@ -299,12 +299,12 @@ void ChartAxis::handleAxisUpdated()
 
     bool visible = m_chartAxis->isVisible();
 
-    setArrowVisibility(visible && m_chartAxis->isArrowVisible());
+    setArrowVisibility(visible && m_chartAxis->isLineVisible());
     setGridVisibility(visible && m_chartAxis->isGridLineVisible());
     setLabelsVisibility(visible && m_chartAxis->labelsVisible());
     setShadesVisibility(visible && m_chartAxis->shadesVisible());
     setLabelsAngle(m_chartAxis->labelsAngle());
-    setArrowPen(m_chartAxis->axisPen());
+    setArrowPen(m_chartAxis->linePen());
     setLabelsPen(m_chartAxis->labelsPen());
     setLabelsBrush(m_chartAxis->labelsBrush());
     setLabelsFont(m_chartAxis->labelsFont());
diff --git a/src/axis/qabstractaxis.cpp b/src/axis/qabstractaxis.cpp
index 5426e1e..aebfc51 100644
--- a/src/axis/qabstractaxis.cpp
+++ b/src/axis/qabstractaxis.cpp
@@ -278,7 +278,7 @@ QAbstractAxis::~QAbstractAxis()
 /*!
   Sets \a pen used to draw axis line and ticks.
  */
-void QAbstractAxis::setAxisPen(const QPen &pen)
+void QAbstractAxis::setLinePen(const QPen &pen)
 {
 	if (d_ptr->m_axisPen!=pen) {
 	    d_ptr->m_axisPen = pen;
@@ -289,22 +289,22 @@ void QAbstractAxis::setAxisPen(const QPen &pen)
 /*!
   Returns pen used to draw axis and ticks.
 */
-QPen QAbstractAxis::axisPen() const
+QPen QAbstractAxis::linePen() const
 {
     return d_ptr->m_axisPen;
 }
 
-void QAbstractAxis::setAxisPenColor(QColor color)
+void QAbstractAxis::setLinePenColor(QColor color)
 {
     QPen p = d_ptr->m_axisPen;
     if (p.color() != color) {
         p.setColor(color);
-        setAxisPen(p);
+        setLinePen(p);
         emit colorChanged(color);
     }
 }
 
-QColor QAbstractAxis::axisPenColor() const
+QColor QAbstractAxis::linePenColor() const
 {
     return d_ptr->m_axisPen.color();
 }
@@ -312,16 +312,16 @@ QColor QAbstractAxis::axisPenColor() const
 /*!
   Sets if axis and ticks are \a visible.
  */
-void QAbstractAxis::setArrowVisible(bool visible)
+void QAbstractAxis::setLineVisible(bool visible)
 {
     if (d_ptr->m_arrowVisible != visible) {
         d_ptr->m_arrowVisible = visible;
         d_ptr->emitUpdated();
-        emit arrowVisibleChanged(visible);
+        emit lineVisibleChanged(visible);
 	}
 }
 
-bool QAbstractAxis::isArrowVisible() const
+bool QAbstractAxis::isLineVisible() const
 {
     return d_ptr->m_arrowVisible;
 }
diff --git a/src/axis/qabstractaxis.h b/src/axis/qabstractaxis.h
index b01415a..9772bad 100644
--- a/src/axis/qabstractaxis.h
+++ b/src/axis/qabstractaxis.h
@@ -34,8 +34,8 @@ class QTCOMMERCIALCHART_EXPORT QAbstractAxis : public QObject
 {
 	Q_OBJECT
 	Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
-    Q_PROPERTY(bool arrowVisible READ isArrowVisible WRITE setArrowVisible NOTIFY arrowVisibleChanged)
-    Q_PROPERTY(QColor color READ axisPenColor WRITE setAxisPenColor NOTIFY colorChanged)
+    Q_PROPERTY(bool arrowVisible READ isLineVisible WRITE setLineVisible NOTIFY lineVisibleChanged)
+    Q_PROPERTY(QColor color READ linePenColor WRITE setLinePenColor NOTIFY colorChanged)
     Q_PROPERTY(bool labelsVisible READ labelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged)
     Q_PROPERTY(int labelsAngle READ labelsAngle WRITE setLabelsAngle)
     Q_PROPERTY(QFont labelsFont READ labelsFont WRITE setLabelsFont)
@@ -71,12 +71,12 @@ public:
 
 
     //axis handling
-    bool isArrowVisible() const;
-    void setArrowVisible(bool visible = true);
-    void setAxisPen(const QPen &pen);
-    QPen axisPen() const;
-    void setAxisPenColor(QColor color);
-    QColor axisPenColor() const;
+    bool isLineVisible() const;
+    void setLineVisible(bool visible = true);
+    void setLinePen(const QPen &pen);
+    QPen linePen() const;
+    void setLinePenColor(QColor color);
+    QColor linePenColor() const;
 
     //grid handling
     bool isGridLineVisible() const;
@@ -122,7 +122,7 @@ public:
 
 Q_SIGNALS:
     void visibleChanged(bool visible);
-    void arrowVisibleChanged(bool visible);
+    void lineVisibleChanged(bool visible);
     void labelsVisibleChanged(bool visible);
     void gridVisibleChanged(bool visible);
     void colorChanged(QColor color);
diff --git a/src/charttheme.cpp b/src/charttheme.cpp
index 5b32a6b..8bcae74 100644
--- a/src/charttheme.cpp
+++ b/src/charttheme.cpp
@@ -266,7 +266,7 @@ void ChartTheme::decorate(QAbstractAxis *axis)
 
     bool axisX = axis->orientation()== Qt::Horizontal;
 
-    if (axis->isArrowVisible()) {
+    if (axis->isLineVisible()) {
 
         if(m_force || brush == axis->labelsBrush()){
             axis->setLabelsBrush(m_labelBrush);
@@ -294,8 +294,8 @@ void ChartTheme::decorate(QAbstractAxis *axis)
             }
         }
 
-        if(m_force || pen == axis->axisPen()){
-            axis->setAxisPen(m_axisLinePen);
+        if(m_force || pen == axis->linePen()){
+            axis->setLinePen(m_axisLinePen);
         }
 
         if(m_force || pen == axis->gridLinePen()){
diff --git a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp
index b44098e..53b28aa 100644
--- a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp
+++ b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp
@@ -49,10 +49,10 @@ void tst_QAbstractAxis::cleanup()
 
 void tst_QAbstractAxis::qabstractaxis()
 {
-    QCOMPARE(m_axis->axisPen(), QPen());
+    QCOMPARE(m_axis->linePen(), QPen());
     //TODO QCOMPARE(m_axis->axisPenColor(), QColor());
     QCOMPARE(m_axis->gridLinePen(), QPen());
-    QCOMPARE(m_axis->isArrowVisible(), true);
+    QCOMPARE(m_axis->isLineVisible(), true);
     QCOMPARE(m_axis->isGridLineVisible(), true);
     QCOMPARE(m_axis->isVisible(), false);
     QCOMPARE(m_axis->labelsAngle(), 0);
@@ -62,9 +62,9 @@ void tst_QAbstractAxis::qabstractaxis()
     QCOMPARE(m_axis->labelsPen(), QPen());
     QCOMPARE(m_axis->labelsVisible(), true);
     QCOMPARE(m_axis->orientation(), Qt::Orientation(0));
-    m_axis->setArrowVisible(false);
-    m_axis->setAxisPen(QPen());
-    m_axis->setAxisPenColor(QColor());
+    m_axis->setLineVisible(false);
+    m_axis->setLinePen(QPen());
+    m_axis->setLinePenColor(QColor());
     m_axis->setGridLinePen(QPen());
     m_axis->setGridLineVisible(false);
     m_axis->setLabelsAngle(-1);
@@ -114,8 +114,8 @@ void tst_QAbstractAxis::axisPen()
     QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
     QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
 
-    m_axis->setAxisPen(axisPen);
-    QCOMPARE(m_axis->axisPen(), axisPen);
+    m_axis->setLinePen(axisPen);
+    QCOMPARE(m_axis->linePen(), axisPen);
 
     QCOMPARE(spy0.count(), 0);
     QCOMPARE(spy1.count(), 0);
@@ -197,7 +197,7 @@ void tst_QAbstractAxis::arrowVisible()
 {
     QFETCH(bool, arrowVisible);
 
-    m_axis->setArrowVisible(!arrowVisible);
+    m_axis->setLineVisible(!arrowVisible);
 
     QSignalSpy spy0(m_axis, SIGNAL(arrowVisibleChanged(bool)));
     QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
@@ -209,8 +209,8 @@ void tst_QAbstractAxis::arrowVisible()
     QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
     QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
 
-    m_axis->setArrowVisible(arrowVisible);
-    QCOMPARE(m_axis->isArrowVisible(), arrowVisible);
+    m_axis->setLineVisible(arrowVisible);
+    QCOMPARE(m_axis->isLineVisible(), arrowVisible);
 
     QCOMPARE(spy0.count(), 1);
     QCOMPARE(spy1.count(), 0);
@@ -225,7 +225,7 @@ void tst_QAbstractAxis::arrowVisible()
     m_chart->setAxisX(m_axis, m_series);
     m_view->show();
     QTest::qWaitForWindowShown(m_view);
-    QCOMPARE(m_axis->isArrowVisible(), arrowVisible);
+    QCOMPARE(m_axis->isLineVisible(), arrowVisible);
 }
 
 void tst_QAbstractAxis::gridLineVisible_data()