Changed "tick" to "segment"

Talking about tick count was misleading, since we are counting the
segments between ticks instead of ticks themselves. Changed the
term accordingly to reduce confusion.

Change-Id: Ic044b179a950083ba9116173a424b865ebb5785a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

35 files changed, 247 insertions, 247 deletions

diff --git a/examples/barchart/main.cpp b/examples/barchart/main.cpp
index 55e87e4a..ce5e49e0 100644
--- a/examples/barchart/main.cpp
+++ b/examples/barchart/main.cpp
@@ -208,7 +208,7 @@ void ChartDataGenerator::setupModel()
     m_chart->rowAxis()->setTitle("Week of year");
     m_chart->columnAxis()->setTitle("Day of week");
     m_chart->valueAxis()->setTitle("Hours playing banjo");
-    m_chart->valueAxis()->setTickCount(5);
+    m_chart->valueAxis()->setSegmentCount(5);
     m_chart->rowAxis()->setLabels(weeks);
     m_chart->columnAxis()->setLabels(days);
 
diff --git a/examples/qmlbarchart/qml/qmlbarchart/main.qml b/examples/qmlbarchart/qml/qmlbarchart/main.qml
index 5522ba12..b726b037 100644
--- a/examples/qmlbarchart/qml/qmlbarchart/main.qml
+++ b/examples/qmlbarchart/qml/qmlbarchart/main.qml
@@ -110,7 +110,7 @@ Item {
 
     Component.onCompleted: {
         console.log("setting data!")
-        testchart.setTickCount(10, 3, 0)
+        testchart.setSegmentCount(10, 3, 0)
         testchart.data = dataModel
     }
 
diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatterchart/scatterchart.cpp
index f2d3d50a..6a945bd4 100644
--- a/examples/scatterchart/scatterchart.cpp
+++ b/examples/scatterchart/scatterchart.cpp
@@ -79,8 +79,8 @@ void ScatterDataModifier::addData()
                  << "other 0.0" << "other 0.2" << "other 0.4" << "other 0.6" << "other 0.8"
                  << "other 1.0";
 
-    // Set tick count and step
-    m_chart->setTickCount(10, 0.1f, -1.0f);
+    // Set segment count and step
+    m_chart->setSegmentCount(10, 0.1f, -1.0f);
 
     // Add labels
     m_chart->rowAxis()->setTitle("Somethings");
diff --git a/examples/spectrum/spectrumapp/main.cpp b/examples/spectrum/spectrumapp/main.cpp
index 583d8ad4..4f27931f 100644
--- a/examples/spectrum/spectrumapp/main.cpp
+++ b/examples/spectrum/spectrumapp/main.cpp
@@ -92,7 +92,7 @@ MainApp::MainApp(Q3DBars *window)
     m_chart->setGridVisible(false);
     // Disable auto-scaling of height by defining explicit range
     // By setting count to 0 we avoid getting any grid
-    m_chart->valueAxis()->setTickCount(0);
+    m_chart->valueAxis()->setSegmentCount(0);
     m_chart->valueAxis()->setRange(0.0, 1.0);
     // Disable shadows
     m_chart->setShadowQuality(ShadowNone);
diff --git a/examples/surfacechart/chartmodifier.cpp b/examples/surfacechart/chartmodifier.cpp
index 2e3bc15b..7548e226 100644
--- a/examples/surfacechart/chartmodifier.cpp
+++ b/examples/surfacechart/chartmodifier.cpp
@@ -92,7 +92,7 @@ void ChartModifier::toggleSqrtSin(bool enable)
             }
         }
 
-        m_chart->setTickCount(4, 0.5f);
+        m_chart->setSegmentCount(4, 0.5f);
         m_chart->appendSeries(series, m_xCount, m_zCount);
 
         qDebug() << "biggest = " << biggest << ", smallest = " << smallest;
@@ -114,7 +114,7 @@ void ChartModifier::togglePlane(bool enable)
             }
         }
 
-        m_chart->setTickCount(4, 0.5f);
+        m_chart->setSegmentCount(4, 0.5f);
         m_chart->appendSeries(series, m_xCount, m_zCount);
     }
 }
diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp
index af35bba6..ebf283b6 100644
--- a/examples/widget/chart.cpp
+++ b/examples/widget/chart.cpp
@@ -60,8 +60,8 @@ ChartModifier::ChartModifier(Q3DBars *barchart)
       m_barSpacingX(0.1f),
       m_barSpacingZ(0.1f),
       m_fontSize(20),
-      m_ticks(4),
-      m_subTicks(3),
+      m_segments(4),
+      m_subSegments(3),
       m_minval(-20.0), // TODO Barchart Y-axis currently only properly supports zero-centered ranges
       m_maxval(20.0)
 {
@@ -107,8 +107,8 @@ void ChartModifier::restart(bool dynamicData)
         m_chart->setupSampleSpace(m_rowCount, m_columnCount);
         // Set selection mode to full
         m_chart->setSelectionMode(ModeBarRowAndColumn);
-        m_chart->valueAxis()->setTickCount(m_ticks * 2);
-        m_chart->valueAxis()->setSubTickCount(0);
+        m_chart->valueAxis()->setSegmentCount(m_segments * 2);
+        m_chart->valueAxis()->setSubSegmentCount(0);
         m_chart->valueAxis()->setAutoAdjustRange(true);
 
         m_chart->rowAxis()->setTitle("Generic Row");
@@ -156,8 +156,8 @@ void ChartModifier::addDataSet()
     m_chart->valueAxis()->setTitle("Average temperature (" + celsiusString + ")");
     m_chart->rowAxis()->setLabels(years);
     m_chart->columnAxis()->setLabels(months);
-    m_chart->valueAxis()->setTickCount(m_ticks);
-    m_chart->valueAxis()->setSubTickCount(m_subTicks);
+    m_chart->valueAxis()->setSegmentCount(m_segments);
+    m_chart->valueAxis()->setSubSegmentCount(m_subSegments);
     m_chart->valueAxis()->setRange(m_minval, m_maxval);
 
     // Create data rows
diff --git a/examples/widget/chart.h b/examples/widget/chart.h
index a35f76f9..612447b7 100644
--- a/examples/widget/chart.h
+++ b/examples/widget/chart.h
@@ -98,8 +98,8 @@ private:
     float m_barSpacingX;
     float m_barSpacingZ;
     int m_fontSize;
-    int m_ticks;
-    int m_subTicks;
+    int m_segments;
+    int m_subSegments;
     qreal m_minval;
     qreal m_maxval;
     QStringList m_genericRowLabels;
diff --git a/src/datavis3d/axis/qvalueaxis.cpp b/src/datavis3d/axis/qvalueaxis.cpp
index 54851965..ca28736a 100644
--- a/src/datavis3d/axis/qvalueaxis.cpp
+++ b/src/datavis3d/axis/qvalueaxis.cpp
@@ -81,31 +81,31 @@ qreal QValueAxis::max() const
     return dptrc()->m_max;
 }
 
-void QValueAxis::setTickCount(int count)
+void QValueAxis::setSegmentCount(int count)
 {
-    if (dptr()->m_tickCount != count){
-        dptr()->m_tickCount = count;
+    if (dptr()->m_segmentCount != count){
+        dptr()->m_segmentCount = count;
         dptr()->recreateLabels();
-        emit tickCountChanged(count);
+        emit segmentCountChanged(count);
     }
 }
 
-int QValueAxis::tickCount() const
+int QValueAxis::segmentCount() const
 {
-    return dptrc()->m_tickCount;
+    return dptrc()->m_segmentCount;
 }
 
-void QValueAxis::setSubTickCount(int count)
+void QValueAxis::setSubSegmentCount(int count)
 {
-    if (dptr()->m_subTickCount != count) {
-        dptr()->m_subTickCount = count;
-        emit subTickCountChanged(count);
+    if (dptr()->m_subSegmentCount != count) {
+        dptr()->m_subSegmentCount = count;
+        emit subSegmentCountChanged(count);
     }
 }
 
-int QValueAxis::subTickCount() const
+int QValueAxis::subSegmentCount() const
 {
-    return dptrc()->m_subTickCount;
+    return dptrc()->m_subSegmentCount;
 }
 
 void QValueAxis::setAutoAdjustRange(bool autoAdjust)
@@ -149,8 +149,8 @@ QValueAxisPrivate::QValueAxisPrivate(QValueAxis *q)
     : QAbstractAxisPrivate(q, QAbstractAxis::AxisTypeValue),
       m_min(0.0),
       m_max(10.0),
-      m_tickCount(10),
-      m_subTickCount(0),
+      m_segmentCount(10),
+      m_subSegmentCount(0),
       m_autoAdjust(true)
 {
 }
@@ -222,14 +222,14 @@ void QValueAxisPrivate::setMax(qreal max)
 void QValueAxisPrivate::recreateLabels()
 {
     QStringList newLabels;
-    newLabels.reserve(m_tickCount + 1);
+    newLabels.reserve(m_segmentCount + 1);
 
-    // First label is at axis min, which is an extra tick
-    qreal tickStep = (m_max - m_min) / m_tickCount;
+    // First label is at axis min, which is an extra segment
+    qreal segmentStep = (m_max - m_min) / m_segmentCount;
 
-    for (int i = 0; i < m_tickCount; i++) {
+    for (int i = 0; i < m_segmentCount; i++) {
         // TODO Actually do proper formatting
-        newLabels.append(QString::number(m_min + (tickStep * i)));
+        newLabels.append(QString::number(m_min + (segmentStep * i)));
     }
     // Ensure max label doesn't suffer from any rounding errors
     newLabels.append(QString::number(m_max));
diff --git a/src/datavis3d/axis/qvalueaxis.h b/src/datavis3d/axis/qvalueaxis.h
index 09b99123..14608ec7 100644
--- a/src/datavis3d/axis/qvalueaxis.h
+++ b/src/datavis3d/axis/qvalueaxis.h
@@ -61,10 +61,10 @@ public:
     qreal min() const;
     qreal max() const;
 
-    void setTickCount(int count);
-    int tickCount() const;
-    void setSubTickCount(int count);
-    int subTickCount() const;
+    void setSegmentCount(int count);
+    int segmentCount() const;
+    void setSubSegmentCount(int count);
+    int subSegmentCount() const;
 
     void setAutoAdjustRange(bool autoAdjust);
     bool isAutoAdjustRange() const;
@@ -74,8 +74,8 @@ public:
 
 signals:
     void rangeChanged(qreal min, qreal max);
-    void tickCountChanged(int count);
-    void subTickCountChanged(int count);
+    void segmentCountChanged(int count);
+    void subSegmentCountChanged(int count);
     void autoAdjustRangeChanged(bool autoAdjust);
     void labelFormatChanged(QString format);
 
diff --git a/src/datavis3d/axis/qvalueaxis_p.h b/src/datavis3d/axis/qvalueaxis_p.h
index c9c9417a..2d80991b 100644
--- a/src/datavis3d/axis/qvalueaxis_p.h
+++ b/src/datavis3d/axis/qvalueaxis_p.h
@@ -74,8 +74,8 @@ protected:
 
     qreal m_min;
     qreal m_max;
-    int m_tickCount;
-    int m_subTickCount;
+    int m_segmentCount;
+    int m_subSegmentCount;
     bool m_autoAdjust;
     QString m_labelFormat;
 
diff --git a/src/datavis3d/engine/abstract3dcontroller.cpp b/src/datavis3d/engine/abstract3dcontroller.cpp
index 086aa6d6..794b82c6 100644
--- a/src/datavis3d/engine/abstract3dcontroller.cpp
+++ b/src/datavis3d/engine/abstract3dcontroller.cpp
@@ -302,26 +302,26 @@ void Abstract3DController::handleAxisRangeChanged(qreal min, qreal max)
         qWarning() << __FUNCTION__ << "invoked for invalid axis";
 }
 
-void Abstract3DController::handleAxisTickCountChanged(int count)
+void Abstract3DController::handleAxisSegmentCountChanged(int count)
 {
     if (sender() == m_axisX)
-        emit axisTickCountChanged(QAbstractAxis::AxisOrientationX, count);
+        emit axisSegmentCountChanged(QAbstractAxis::AxisOrientationX, count);
     else if (sender() == m_axisY)
-        emit axisTickCountChanged(QAbstractAxis::AxisOrientationY, count);
+        emit axisSegmentCountChanged(QAbstractAxis::AxisOrientationY, count);
     else if (sender() == m_axisZ)
-        emit axisTickCountChanged(QAbstractAxis::AxisOrientationZ, count);
+        emit axisSegmentCountChanged(QAbstractAxis::AxisOrientationZ, count);
     else
         qWarning() << __FUNCTION__ << "invoked for invalid axis";
 }
 
-void Abstract3DController::handleAxisSubTickCountChanged(int count)
+void Abstract3DController::handleAxisSubSegmentCountChanged(int count)
 {
     if (sender() == m_axisX)
-        emit axisSubTickCountChanged(QAbstractAxis::AxisOrientationX, count);
+        emit axisSubSegmentCountChanged(QAbstractAxis::AxisOrientationX, count);
     else if (sender() == m_axisY)
-        emit axisSubTickCountChanged(QAbstractAxis::AxisOrientationY, count);
+        emit axisSubSegmentCountChanged(QAbstractAxis::AxisOrientationY, count);
     else if (sender() == m_axisZ)
-        emit axisSubTickCountChanged(QAbstractAxis::AxisOrientationZ, count);
+        emit axisSubSegmentCountChanged(QAbstractAxis::AxisOrientationZ, count);
     else
         qWarning() << __FUNCTION__ << "invoked for invalid axis";
 }
@@ -355,15 +355,15 @@ void Abstract3DController::setAxisHelper(QAbstractAxis::AxisOrientation orientat
         QValueAxis *valueAxis = static_cast<QValueAxis *>(axis);
         QObject::connect(valueAxis, &QValueAxis::rangeChanged,
                          this, &Abstract3DController::handleAxisRangeChanged);
-        QObject::connect(valueAxis, &QValueAxis::tickCountChanged,
-                         this, &Abstract3DController::handleAxisTickCountChanged);
-        QObject::connect(valueAxis, &QValueAxis::subTickCountChanged,
-                         this, &Abstract3DController::handleAxisSubTickCountChanged);
+        QObject::connect(valueAxis, &QValueAxis::segmentCountChanged,
+                         this, &Abstract3DController::handleAxisSegmentCountChanged);
+        QObject::connect(valueAxis, &QValueAxis::subSegmentCountChanged,
+                         this, &Abstract3DController::handleAxisSubSegmentCountChanged);
         QObject::connect(valueAxis, &QValueAxis::autoAdjustRangeChanged,
                          this, &Abstract3DController::handleAxisAutoAdjustRangeChanged);
         emit axisRangeChanged(orientation, valueAxis->min(), valueAxis->max());
-        emit axisTickCountChanged(orientation, valueAxis->tickCount());
-        emit axisSubTickCountChanged(orientation, valueAxis->subTickCount());
+        emit axisSegmentCountChanged(orientation, valueAxis->segmentCount());
+        emit axisSubSegmentCountChanged(orientation, valueAxis->subSegmentCount());
         handleAxisAutoAdjustRangeChanged(valueAxis->isAutoAdjustRange());
     }
 }
diff --git a/src/datavis3d/engine/abstract3dcontroller_p.h b/src/datavis3d/engine/abstract3dcontroller_p.h
index b2042764..f65fe923 100644
--- a/src/datavis3d/engine/abstract3dcontroller_p.h
+++ b/src/datavis3d/engine/abstract3dcontroller_p.h
@@ -164,8 +164,8 @@ public slots:
     virtual void handleAxisTitleChanged(const QString &title);
     virtual void handleAxisLabelsChanged();
     virtual void handleAxisRangeChanged(qreal min, qreal max);
-    virtual void handleAxisTickCountChanged(int count);
-    virtual void handleAxisSubTickCountChanged(int count);
+    virtual void handleAxisSegmentCountChanged(int count);
+    virtual void handleAxisSubSegmentCountChanged(int count);
     virtual void handleAxisAutoAdjustRangeChanged(bool autoAdjust);
 
 signals:
@@ -181,8 +181,8 @@ signals:
     void axisTitleChanged(QAbstractAxis::AxisOrientation orientation, QString title);
     void axisLabelsChanged(QAbstractAxis::AxisOrientation orientation, QStringList labels);
     void axisRangeChanged(QAbstractAxis::AxisOrientation orientation, qreal min, qreal max);
-    void axisTickCountChanged(QAbstractAxis::AxisOrientation orientation, int count);
-    void axisSubTickCountChanged(QAbstractAxis::AxisOrientation orientation, int count);
+    void axisSegmentCountChanged(QAbstractAxis::AxisOrientation orientation, int count);
+    void axisSubSegmentCountChanged(QAbstractAxis::AxisOrientation orientation, int count);
 
 private:
     void setAxisHelper(QAbstractAxis::AxisOrientation orientation, QAbstractAxis *axis, QAbstractAxis **axisPtr);
diff --git a/src/datavis3d/engine/abstract3drenderer.cpp b/src/datavis3d/engine/abstract3drenderer.cpp
index 6c1d1878..472cdc58 100644
--- a/src/datavis3d/engine/abstract3drenderer.cpp
+++ b/src/datavis3d/engine/abstract3drenderer.cpp
@@ -76,10 +76,10 @@ void Abstract3DRenderer::initializePreOpenGL()
                      &Abstract3DRenderer::updateAxisLabels);
     QObject::connect(m_controller, &Abstract3DController::axisRangeChanged, this,
                      &Abstract3DRenderer::updateAxisRange);
-    QObject::connect(m_controller, &Abstract3DController::axisTickCountChanged, this,
-                     &Abstract3DRenderer::updateAxisTickCount);
-    QObject::connect(m_controller, &Abstract3DController::axisSubTickCountChanged, this,
-                     &Abstract3DRenderer::updateAxisSubTickCount);
+    QObject::connect(m_controller, &Abstract3DController::axisSegmentCountChanged, this,
+                     &Abstract3DRenderer::updateAxisSegmentCount);
+    QObject::connect(m_controller, &Abstract3DController::axisSubSegmentCountChanged, this,
+                     &Abstract3DRenderer::updateAxisSubSegmentCount);
 
     updateTheme(m_controller->theme());
     updateFont(m_controller->font());
@@ -211,14 +211,14 @@ void Abstract3DRenderer::updateAxisRange(QAbstractAxis::AxisOrientation orientat
     cache.setMax(max);
 }
 
-void Abstract3DRenderer::updateAxisTickCount(QAbstractAxis::AxisOrientation orientation, int count)
+void Abstract3DRenderer::updateAxisSegmentCount(QAbstractAxis::AxisOrientation orientation, int count)
 {
-    axisCacheForOrientation(orientation).setTickCount(count);
+    axisCacheForOrientation(orientation).setSegmentCount(count);
 }
 
-void Abstract3DRenderer::updateAxisSubTickCount(QAbstractAxis::AxisOrientation orientation, int count)
+void Abstract3DRenderer::updateAxisSubSegmentCount(QAbstractAxis::AxisOrientation orientation, int count)
 {
-    axisCacheForOrientation(orientation).setSubTickCount(count);
+    axisCacheForOrientation(orientation).setSubSegmentCount(count);
 }
 
 // This method needs to be called under the controller-renderer sync mutex
@@ -233,8 +233,8 @@ void Abstract3DRenderer::initializeAxisCache(QAbstractAxis::AxisOrientation orie
         if (axis->type() & QAbstractAxis::AxisTypeValue) {
             const QValueAxis *valueAxis = static_cast<const QValueAxis *>(axis);
             updateAxisRange(orientation, valueAxis->min(), valueAxis->max());
-            updateAxisTickCount(orientation, valueAxis->tickCount());
-            updateAxisSubTickCount(orientation, valueAxis->subTickCount());
+            updateAxisSegmentCount(orientation, valueAxis->segmentCount());
+            updateAxisSubSegmentCount(orientation, valueAxis->subSegmentCount());
         }
     }
 }
diff --git a/src/datavis3d/engine/abstract3drenderer_p.h b/src/datavis3d/engine/abstract3drenderer_p.h
index bbbbae7f..323057a7 100644
--- a/src/datavis3d/engine/abstract3drenderer_p.h
+++ b/src/datavis3d/engine/abstract3drenderer_p.h
@@ -104,8 +104,8 @@ protected:
     virtual void updateAxisTitle(QAbstractAxis::AxisOrientation orientation, const QString &title);
     virtual void updateAxisLabels(QAbstractAxis::AxisOrientation orientation, const QStringList &labels);
     virtual void updateAxisRange(QAbstractAxis::AxisOrientation orientation, qreal min, qreal max);
-    virtual void updateAxisTickCount(QAbstractAxis::AxisOrientation orientation, int count);
-    virtual void updateAxisSubTickCount(QAbstractAxis::AxisOrientation orientation, int count);
+    virtual void updateAxisSegmentCount(QAbstractAxis::AxisOrientation orientation, int count);
+    virtual void updateAxisSubSegmentCount(QAbstractAxis::AxisOrientation orientation, int count);
 
     void initializeAxisCache(QAbstractAxis::AxisOrientation orientation, const QAbstractAxis *axis);
     AxisRenderCache &axisCacheForOrientation(QAbstractAxis::AxisOrientation orientation);
diff --git a/src/datavis3d/engine/axisrendercache.cpp b/src/datavis3d/engine/axisrendercache.cpp
index 5595dd60..3008dcae 100644
--- a/src/datavis3d/engine/axisrendercache.cpp
+++ b/src/datavis3d/engine/axisrendercache.cpp
@@ -48,11 +48,11 @@ AxisRenderCache::AxisRenderCache()
     : m_type(QAbstractAxis::AxisTypeNone),
       m_min(0.0),
       m_max(0.0),
-      m_tickCount(0),
-      m_subTickCount(0),
+      m_segmentCount(0),
+      m_subSegmentCount(0),
       m_drawer(0),
-      m_tickStep(0.0f),
-      m_subTickStep(0.0f)
+      m_segmentStep(0.0f),
+      m_subSegmentStep(0.0f)
 {
 }
 
@@ -120,25 +120,25 @@ void AxisRenderCache::setLabels(const QStringList &labels)
 void AxisRenderCache::setMin(qreal min)
 {
     m_min = min;
-    updateTickStep();
+    updateSegmentStep();
 }
 
 void AxisRenderCache::setMax(qreal max)
 {
     m_max = max;
-    updateTickStep();
+    updateSegmentStep();
 }
 
-void AxisRenderCache::setTickCount(int count)
+void AxisRenderCache::setSegmentCount(int count)
 {
-    m_tickCount = count;
-    updateTickStep();
+    m_segmentCount = count;
+    updateSegmentStep();
 }
 
-void AxisRenderCache::setSubTickCount(int count)
+void AxisRenderCache::setSubSegmentCount(int count)
 {
-    m_subTickCount = count;
-    updateSubTickStep();
+    m_subSegmentCount = count;
+    updateSubSegmentStep();
 }
 
 void AxisRenderCache::updateTextures()
@@ -156,21 +156,21 @@ void AxisRenderCache::updateTextures()
     }
 }
 
-void AxisRenderCache::updateTickStep()
+void AxisRenderCache::updateSegmentStep()
 {
-    if (m_tickCount > 0)
-        m_tickStep = qFabs((m_max - m_min) / m_tickCount);
+    if (m_segmentCount > 0)
+        m_segmentStep = qFabs((m_max - m_min) / m_segmentCount);
     else
-        m_tickStep = 0.0f; // Irrelevant
-    updateSubTickStep();
+        m_segmentStep = 0.0f; // Irrelevant
+    updateSubSegmentStep();
 }
 
-void AxisRenderCache::updateSubTickStep()
+void AxisRenderCache::updateSubSegmentStep()
 {
-    if (m_subTickCount > 1)
-        m_subTickStep = m_tickStep / m_subTickCount;
+    if (m_subSegmentCount > 1)
+        m_subSegmentStep = m_segmentStep / m_subSegmentCount;
     else
-        m_subTickStep = m_tickStep;
+        m_subSegmentStep = m_segmentStep;
 }
 
 QT_DATAVIS3D_END_NAMESPACE
diff --git a/src/datavis3d/engine/axisrendercache_p.h b/src/datavis3d/engine/axisrendercache_p.h
index f20a093f..788ac7b7 100644
--- a/src/datavis3d/engine/axisrendercache_p.h
+++ b/src/datavis3d/engine/axisrendercache_p.h
@@ -78,22 +78,22 @@ public:
     inline qreal min() { return m_min; }
     void setMax(qreal max);
     inline qreal max() { return m_max; }
-    void setTickCount(int count);
-    inline int tickCount() const { return m_tickCount; }
-    void setSubTickCount(int count);
-    inline int subTickCount() const { return m_subTickCount; }
+    void setSegmentCount(int count);
+    inline int segmentCount() const { return m_segmentCount; }
+    void setSubSegmentCount(int count);
+    inline int subSegmentCount() const { return m_subSegmentCount; }
 
     inline LabelItem &titleItem() { return m_titleItem; }
     inline QList<LabelItem *> &labelItems() { return m_labelItems; }
-    inline GLfloat tickStep() const { return m_tickStep; }
-    inline GLfloat subTickStep() const { return m_subTickStep; }
+    inline GLfloat segmentStep() const { return m_segmentStep; }
+    inline GLfloat subSegmentStep() const { return m_subSegmentStep; }
 
 public slots:
     void updateTextures();
 
 private:
-    void updateTickStep();
-    void updateSubTickStep();
+    void updateSegmentStep();
+    void updateSubSegmentStep();
 
     // Cached axis values
     QAbstractAxis::AxisType m_type;
@@ -101,15 +101,15 @@ private:
     QStringList m_labels;
     qreal m_min;
     qreal m_max;
-    int m_tickCount;
-    int m_subTickCount;
+    int m_segmentCount;
+    int m_subSegmentCount;
 
     // Renderer items
     Drawer *m_drawer; // Not owned
     LabelItem m_titleItem;
     QList<LabelItem *> m_labelItems;
-    GLfloat m_tickStep;
-    GLfloat m_subTickStep;
+    GLfloat m_segmentStep;
+    GLfloat m_subSegmentStep;
 
     Q_DISABLE_COPY(AxisRenderCache)
 };
diff --git a/src/datavis3d/engine/bars3drenderer.cpp b/src/datavis3d/engine/bars3drenderer.cpp
index 7df1e2b9..9b5fdf38 100644
--- a/src/datavis3d/engine/bars3drenderer.cpp
+++ b/src/datavis3d/engine/bars3drenderer.cpp
@@ -1154,9 +1154,9 @@ void Bars3dRenderer::drawScene(CameraHelper *camera,
             }
         }
 
-        if (m_axisCacheY.tickCount() > 0) {
+        if (m_axisCacheY.segmentCount() > 0) {
             // Wall lines: back wall
-            GLfloat heightStep = m_axisCacheY.subTickStep();
+            GLfloat heightStep = m_axisCacheY.subSegmentStep();
             GLfloat startLine = 0.0f;
 
             if (m_hasNegativeValues)
@@ -1447,7 +1447,7 @@ void Bars3dRenderer::drawScene(CameraHelper *camera,
 
     // Y Labels
     int labelNbr = 0;
-    GLfloat heightStep = m_axisCacheY.tickStep();
+    GLfloat heightStep = m_axisCacheY.segmentStep();
     GLfloat startLine = 0.0f;
     int labelCount = m_axisCacheY.labels().size();
     if (m_hasNegativeValues)
diff --git a/src/datavis3d/engine/q3dscatter.cpp b/src/datavis3d/engine/q3dscatter.cpp
index f8f3653c..bb90f47e 100644
--- a/src/datavis3d/engine/q3dscatter.cpp
+++ b/src/datavis3d/engine/q3dscatter.cpp
@@ -456,20 +456,20 @@ QScatterDataProxy *Q3DScatter::dataProxy()
 }
 
 /*!
- * \a tickCount How many ticks will be drawn in addition to the start line. \c 5 by default.
- * \n There will be tickCount + 1 lines drawn, as there is always the start line.
+ * \a segmentCount How many segments will be drawn in addition to the start line. \c 5 by default.
+ * \n There will be segmentCount + 1 lines drawn, as there is always the start line.
  *
- * \a step How large a step each tick is.
+ * \a step How large a step each segment is.
  *
  * \a minimum Minimum value a bar in data set can have. Setting this correctly is especially
  * important if values can be negative, or autoscaling won't work correctly.
  *
- * Sets tick count and step. Note; tickCount * step should be the maximum possible value of data
+ * Sets segment count and step. Note; segmentCount * step should be the maximum possible value of data
  * set.
  */
-void Q3DScatter::setTickCount(int tickCount, qreal step, qreal minimum)
+void Q3DScatter::setSegmentCount(int segmentCount, qreal step, qreal minimum)
 {
-    d_ptr->m_shared->setTickCount(GLint(tickCount), GLfloat(step), GLfloat(minimum));
+    d_ptr->m_shared->setSegmentCount(GLint(segmentCount), GLfloat(step), GLfloat(minimum));
 }
 
 Q3DScatterPrivate::Q3DScatterPrivate(Q3DScatter *q, QRect rect)
diff --git a/src/datavis3d/engine/q3dscatter.h b/src/datavis3d/engine/q3dscatter.h
index 13c50415..f85a5c5f 100644
--- a/src/datavis3d/engine/q3dscatter.h
+++ b/src/datavis3d/engine/q3dscatter.h
@@ -104,10 +104,10 @@ public:
     void setBarColor(QColor baseColor, QColor heightColor, QColor depthColor,
                      bool uniform = true);
 
-    // Set tick count and step. Note; tickCount * step should be the maximum possible value of data
+    // Set segment count and step. Note; segmentCount * step should be the maximum possible value of data
     // set. Minimum is the absolute minimum possible value a bar can have. This is especially
     // important to set if values can be negative.
-    void setTickCount(int tickCount, qreal step, qreal minimum = 0.0f);
+    void setSegmentCount(int segmentCount, qreal step, qreal minimum = 0.0f);
 
     // override bar type with own mesh
     void setMeshFileName(const QString &objFileName);
diff --git a/src/datavis3d/engine/q3dsurface.cpp b/src/datavis3d/engine/q3dsurface.cpp
index c4465165..49a61e8e 100644
--- a/src/datavis3d/engine/q3dsurface.cpp
+++ b/src/datavis3d/engine/q3dsurface.cpp
@@ -132,19 +132,19 @@ void Q3DSurface::setHeight(const int height)
 }
 
 /*!
- * \a tickCount How many ticks will be drawn. \c 5 by default.
+ * \a segmentCount How many segments will be drawn. \c 5 by default.
  *
- * \a step How large a step each tick is.
+ * \a step How large a step each segment is.
  *
  * \a minimum Minimum value a bar in data set can have. Setting this correctly is especially
  * important if values can be negative, or autoscaling won't work correctly.
  *
- * Sets tick count and step. Note; tickCount * step should be the maximum possible value of data
+ * Sets segment count and step. Note; segmentCount * step should be the maximum possible value of data
  * set.
  */
-void Q3DSurface::setTickCount(int tickCount, qreal step, qreal minimum)
+void Q3DSurface::setSegmentCount(int segmentCount, qreal step, qreal minimum)
 {
-    d_ptr->m_shared->setTickCount(GLint(tickCount), GLfloat(step), GLfloat(minimum));
+    d_ptr->m_shared->setSegmentCount(GLint(segmentCount), GLfloat(step), GLfloat(minimum));
 }
 
 void Q3DSurface::setGradientColorAt(qreal pos, const QColor &color)
diff --git a/src/datavis3d/engine/q3dsurface.h b/src/datavis3d/engine/q3dsurface.h
index 3c169a84..cabd1f53 100644
--- a/src/datavis3d/engine/q3dsurface.h
+++ b/src/datavis3d/engine/q3dsurface.h
@@ -69,10 +69,10 @@ public:
 
     void setGradientColorAt(qreal pos, const QColor &color);
 
-    // Set tick count and step. Note; tickCount * step should be the maximum possible value of data
+    // Set segment count and step. Note; segmentCount * step should be the maximum possible value of data
     // set. Minimum is the absolute minimum possible value a bar can have. This is especially
     // important to set if values can be negative.
-    void setTickCount(int tickCount, qreal step, qreal minimum = 0.0f);
+    void setSegmentCount(int segmentCount, qreal step, qreal minimum = 0.0f);
 
 //TODO part
     void appendSeries(QList<qreal> series, int width, int depth);
diff --git a/src/datavis3d/engine/scatter3dcontroller.cpp b/src/datavis3d/engine/scatter3dcontroller.cpp
index 3e07f0b1..67f6c18f 100644
--- a/src/datavis3d/engine/scatter3dcontroller.cpp
+++ b/src/datavis3d/engine/scatter3dcontroller.cpp
@@ -67,9 +67,9 @@ Scatter3DController::Scatter3DController(QRect boundRect)
       m_font(QFont(QStringLiteral("Arial"))),
       m_isGridEnabled(true),
       m_isBackgroundEnabled(true),
-      m_tickCount(0),
-      m_tickStep(0),
-      m_tickMinimum(0.0f),
+      m_segmentCount(0),
+      m_segmentStep(0),
+      m_segmentMinimum(0.0f),
       m_renderer(0),
       m_data(0),
       m_valuesDirty(false)
@@ -406,16 +406,16 @@ bool Scatter3DController::backgroundEnabled()
     return m_isBackgroundEnabled;
 }
 
-void Scatter3DController::setTickCount(GLint tickCount, GLfloat step, GLfloat minimum)
+void Scatter3DController::setSegmentCount(GLint segmentCount, GLfloat step, GLfloat minimum)
 {
-    if (tickCount <= 0) {
-        qCritical("Invalid tick count. It must be positive.");
+    if (segmentCount <= 0) {
+        qCritical("Invalid segment count. It must be positive.");
         return;
     }
-    m_tickCount = tickCount;
-    m_tickStep = step;
-    m_tickMinimum = minimum;
-    emit tickCountChanged(m_tickCount, m_tickStep, m_tickMinimum);
+    m_segmentCount = segmentCount;
+    m_segmentStep = step;
+    m_segmentMinimum = minimum;
+    emit segmentCountChanged(m_segmentCount, m_segmentStep, m_segmentMinimum);
 }
 
 QT_DATAVIS3D_END_NAMESPACE
diff --git a/src/datavis3d/engine/scatter3dcontroller_p.h b/src/datavis3d/engine/scatter3dcontroller_p.h
index ce63a139..7150c8b9 100644
--- a/src/datavis3d/engine/scatter3dcontroller_p.h
+++ b/src/datavis3d/engine/scatter3dcontroller_p.h
@@ -97,9 +97,9 @@ private:
     QFont m_font;
     bool m_isGridEnabled;
     bool m_isBackgroundEnabled;
-    GLint m_tickCount;
-    GLfloat m_tickStep;
-    GLfloat m_tickMinimum;
+    GLint m_segmentCount;
+    GLfloat m_segmentStep;
+    GLfloat m_segmentMinimum;
 
     Scatter3DRenderer *m_renderer;
     QScatterDataProxy *m_data;
@@ -128,10 +128,10 @@ public:
     // override bar type with own mesh
     void setMeshFileName(const QString &objFileName);
 
-    // Set tick count and step. Note; tickCount * step should be the maximum possible value of data
+    // Set segment count and step. Note; segmentCount * step should be the maximum possible value of data
     // set. Minimum is the absolute minimum possible value a bar can have. This is especially
     // important to set if values can be negative.
-    void setTickCount(GLint tickCount, GLfloat step, GLfloat minimum = 0.0f);
+    void setSegmentCount(GLint segmentCount, GLfloat step, GLfloat minimum = 0.0f);
 
     // TODO: light placement API
 
@@ -182,7 +182,7 @@ signals:
     void fontChanged(QFont font);
     void gridEnabledChanged(bool enable);
     void backgroundEnabledChanged(bool enable);
-    void tickCountChanged(GLint tickCount, GLfloat step, GLfloat minimum);
+    void segmentCountChanged(GLint segmentCount, GLfloat step, GLfloat minimum);
 
 private:
     void handleLimitChange();
diff --git a/src/datavis3d/engine/scatter3drenderer.cpp b/src/datavis3d/engine/scatter3drenderer.cpp
index 7964d662..4184abc9 100644
--- a/src/datavis3d/engine/scatter3drenderer.cpp
+++ b/src/datavis3d/engine/scatter3drenderer.cpp
@@ -83,8 +83,8 @@ Scatter3DRenderer::Scatter3DRenderer(Scatter3DController *controller)
       m_controller(controller),
       m_selectedItem(0),
       m_previouslySelectedItem(0),
-      m_tickCount(5),
-      m_tickStep(0.2f),
+      m_segmentCount(5),
+      m_segmentStep(0.2f),
       m_xFlipped(false),
       m_zFlipped(false),
       m_updateLabels(false),
@@ -158,8 +158,8 @@ void Scatter3DRenderer::initializePreOpenGL()
                      &Scatter3DRenderer::updateGridEnabled);
     QObject::connect(m_controller, &Scatter3DController::backgroundEnabledChanged, this,
                      &Scatter3DRenderer::updateBackgroundEnabled);
-    QObject::connect(m_controller, &Scatter3DController::tickCountChanged, this,
-                     &Scatter3DRenderer::updateTickCount);
+    QObject::connect(m_controller, &Scatter3DController::segmentCountChanged, this,
+                     &Scatter3DRenderer::updateSegmentCount);
     QObject::connect(m_controller, &Scatter3DController::zoomLevelChanged, this,
                      &Scatter3DRenderer::updateZoomLevel);
 
@@ -806,7 +806,7 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
     // Disable textures
     glDisable(GL_TEXTURE_2D);
 
-    // TODO: Grid lines cannot be done as in bars; we need configurable lines. Let's use ticks for now.
+    // TODO: Grid lines cannot be done as in bars; we need configurable lines. Let's use segments for now.
     // Draw grid lines
     if (m_cachedIsGridEnabled && m_heightNormalizer) {
         // Bind bar shader
@@ -821,10 +821,10 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
 
         // Floor lines: rows
 #ifdef USE_UNIFORM_SCALING
-        GLfloat lineStep = (2.0f * m_scaleFactor * aspectRatio) / m_tickCount;
+        GLfloat lineStep = (2.0f * m_scaleFactor * aspectRatio) / m_segmentCount;
         GLfloat startLine = -m_scaleFactor * aspectRatio;
 #else
-        GLfloat lineStep = (2.0f * m_areaSize.height() * aspectRatio) / m_tickCount;
+        GLfloat lineStep = (2.0f * m_areaSize.height() * aspectRatio) / m_segmentCount;
         GLfloat startLine = -m_areaSize.height() * aspectRatio;
 #endif
 
@@ -885,7 +885,7 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
 
         // Floor lines: columns
 #ifndef USE_UNIFORM_SCALING
-        lineStep = (2.0f * m_areaSize.width() * aspectRatio) / m_tickCount;
+        lineStep = (2.0f * m_areaSize.width() * aspectRatio) / m_segmentCount;
         startLine = -m_areaSize.width() * aspectRatio;
 #endif
 
@@ -945,7 +945,7 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
         }
 
         // Wall lines: back wall
-        lineStep = 2.0f * m_tickStep;
+        lineStep = 2.0f * m_segmentStep;
         startLine = -m_heightNormalizer;
 
         for (GLfloat linePos = startLine; linePos <= -startLine; linePos += lineStep) {
@@ -1150,10 +1150,10 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
 
     // Z Labels
 #ifdef USE_UNIFORM_SCALING
-    GLfloat posStep = (2.0f * m_scaleFactor * aspectRatio) / m_tickCount;
+    GLfloat posStep = (2.0f * m_scaleFactor * aspectRatio) / m_segmentCount;
     GLfloat startPos = -m_scaleFactor * aspectRatio;
 #else
-    GLfloat posStep = (2.0f * m_areaSize.height() * aspectRatio) / m_tickCount;
+    GLfloat posStep = (2.0f * m_areaSize.height() * aspectRatio) / m_segmentCount;
     GLfloat startPos = -m_areaSize.height() * aspectRatio;
 #endif
     int labelNbr = 0;
@@ -1196,7 +1196,7 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
     }
     // X Labels
 #ifndef USE_UNIFORM_SCALING
-    posStep = (2.0f * m_areaSize.width() * aspectRatio) / m_tickCount;
+    posStep = (2.0f * m_areaSize.width() * aspectRatio) / m_segmentCount;
     startPos = -m_areaSize.width() * aspectRatio;
 #endif
     labelNbr = 0;
@@ -1238,7 +1238,7 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
         labelNbr++;
     }
     // Y Labels
-    posStep = 2.0f * m_tickStep;
+    posStep = 2.0f * m_segmentStep;
     startPos = -m_heightNormalizer;
     labelNbr = 0;
     for (GLfloat labelPos = startPos; labelPos <= -startPos; labelPos += posStep) {
@@ -1418,14 +1418,14 @@ void Scatter3DRenderer::updateShadowQuality(ShadowQuality quality)
 #endif
 }
 
-void Scatter3DRenderer::updateTickCount(GLint tickCount, GLfloat step, GLfloat minimum)
+void Scatter3DRenderer::updateSegmentCount(GLint segmentCount, GLfloat step, GLfloat minimum)
 {
     //qDebug() << __FUNCTION__;
-    m_tickCount = tickCount;
-    m_tickStep = step;
-    if (tickCount > 0 && step > 0) {
+    m_segmentCount = segmentCount;
+    m_segmentStep = step;
+    if (segmentCount > 0 && step > 0) {
         m_autoAdjust = false;
-        m_heightNormalizer = tickCount * step;
+        m_heightNormalizer = segmentCount * step;
         calculateHeightAdjustment(QPair<float, float>(minimum, m_heightNormalizer));
         m_valueUpdateNeeded = true;
     }
@@ -1494,13 +1494,13 @@ void Scatter3DRenderer::calculateSceneScalingFactors(const QVector3D &limits)
 {
     if (m_autoAdjust) {
         m_heightNormalizer = (GLfloat)qMax((qreal)m_heightNormalizer, qFabs(limits.y()));
-        m_tickStep = m_heightNormalizer / m_tickCount;
+        m_segmentStep = m_heightNormalizer / m_segmentCount;
     }
-    // Auto-adjust these anyway (until axis -based ticks are taken into use)
+    // Auto-adjust these anyway (until axis -based segments are taken into use)
     m_areaSize.setHeight(qMax(m_areaSize.height(), (qreal)limits.z()));
     m_areaSize.setWidth(qMax(m_areaSize.width(), (qreal)limits.x()));
     m_scaleFactor = qMax(qMax((qreal)m_scaleFactor, m_areaSize.width()), m_areaSize.height());
-    //qDebug() << m_heightNormalizer << m_areaSize << m_scaleFactor << m_tickStep;
+    //qDebug() << m_heightNormalizer << m_areaSize << m_scaleFactor << m_segmentStep;
 }
 
 void Scatter3DRenderer::calculateHeightAdjustment(const QPair<GLfloat, GLfloat> &limits)
diff --git a/src/datavis3d/engine/scatter3drenderer_p.h b/src/datavis3d/engine/scatter3drenderer_p.h
index ba6f8bff..830cd062 100644
--- a/src/datavis3d/engine/scatter3drenderer_p.h
+++ b/src/datavis3d/engine/scatter3drenderer_p.h
@@ -105,8 +105,8 @@ private:
     // Internal state
     ScatterRenderItem *m_selectedItem; // points to renderitem array
     ScatterRenderItem *m_previouslySelectedItem; // points to renderitem array
-    GLint m_tickCount;
-    GLfloat m_tickStep;
+    GLint m_segmentCount;
+    GLfloat m_segmentStep;
     bool m_xFlipped;
     bool m_zFlipped;
     QRect m_mainViewPort;
@@ -166,7 +166,7 @@ public slots:
     void updateZoomLevel(int newZoomLevel);
     void updateGridEnabled(bool enable);
     void updateBackgroundEnabled(bool enable);
-    void updateTickCount(GLint tickCount, GLfloat step, GLfloat minimum = 0.0f);
+    void updateSegmentCount(GLint segmentCount, GLfloat step, GLfloat minimum = 0.0f);
     void updateMeshFileName(const QString &objFileName);
 
     // Requests that upon next render pass the column and row under the given point is inspected for selection.
diff --git a/src/datavis3d/engine/surface3dcontroller.cpp b/src/datavis3d/engine/surface3dcontroller.cpp
index 2124c615..dc53b64b 100644
--- a/src/datavis3d/engine/surface3dcontroller.cpp
+++ b/src/datavis3d/engine/surface3dcontroller.cpp
@@ -191,13 +191,13 @@ Drawer *Surface3dController::drawer()
         return 0;
 }
 
-void Surface3dController::setTickCount(GLint tickCount, GLfloat step, GLfloat minimum)
+void Surface3dController::setSegmentCount(GLint segmentCount, GLfloat step, GLfloat minimum)
 {
-    m_tickCount   = tickCount;
-    m_tickStep    = step;
-    m_tickMinimum = minimum;
+    m_segmentCount   = segmentCount;
+    m_segmentStep    = step;
+    m_segmentMinimum = minimum;
 
-    emit tickCountChanged(m_tickCount, m_tickStep, m_tickMinimum);
+    emit segmentCountChanged(m_segmentCount, m_segmentStep, m_segmentMinimum);
 }
 
 void Surface3dController::setGradientColorAt(qreal pos, const QColor &color)
diff --git a/src/datavis3d/engine/surface3dcontroller_p.h b/src/datavis3d/engine/surface3dcontroller_p.h
index 67edce9b..dd1e8724 100644
--- a/src/datavis3d/engine/surface3dcontroller_p.h
+++ b/src/datavis3d/engine/surface3dcontroller_p.h
@@ -74,9 +74,9 @@ private:
     bool m_smoothSurface;
     bool m_surfaceGrid;
 
-    GLint m_tickCount;
-    GLfloat m_tickStep;
-    GLfloat m_tickMinimum;
+    GLint m_segmentCount;
+    GLfloat m_segmentStep;
+    GLfloat m_segmentMinimum;
 
     // Interaction
     MouseState m_mouseState;
@@ -107,10 +107,10 @@ public:
 
     void setGradientColorAt(qreal pos, const QColor &color);
 
-    // Set tick count and step. Note; tickCount * step should be the maximum possible value of data
+    // Set segment count and step. Note; segmentCount * step should be the maximum possible value of data
     // set. Minimum is the absolute minimum possible value a bar can have. This is especially
     // important to set if values can be negative.
-    void setTickCount(GLint tickCount, GLfloat step, GLfloat minimum = 0.0f);
+    void setSegmentCount(GLint segmentCount, GLfloat step, GLfloat minimum = 0.0f);
 
     //TODO: Temp solution
     void setData(QList<qreal> series, int width, int depth);
@@ -130,7 +130,7 @@ public:
 signals:
     void smoothStatusChanged(bool enable);
     void surfaceGridChanged(bool enable);
-    void tickCountChanged(GLint tickCount, GLfloat step, GLfloat minimum);
+    void segmentCountChanged(GLint segmentCount, GLfloat step, GLfloat minimum);
     void leftMousePressed();
 
 private:
diff --git a/src/datavis3d/engine/surface3drenderer.cpp b/src/datavis3d/engine/surface3drenderer.cpp
index baccf607..62469efe 100644
--- a/src/datavis3d/engine/surface3drenderer.cpp
+++ b/src/datavis3d/engine/surface3drenderer.cpp
@@ -74,10 +74,10 @@ Surface3dRenderer::Surface3dRenderer(Surface3dController *controller)
       m_labelTransparency(TransparencyFromTheme),
       m_font(QFont(QStringLiteral("Arial"))),
       m_hasNegativeValues(false),
-      m_tickYCount(0),
-      m_tickYStep(0.0f),
-      m_tickXCount(0),
-      m_tickZCount(0),
+      m_segmentYCount(0),
+      m_segmentYStep(0.0f),
+      m_segmentXCount(0),
+      m_segmentZCount(0),
       m_backgroundShader(0),
       m_surfaceShader(0),
       m_surfaceGridShader(0),
@@ -111,8 +111,8 @@ Surface3dRenderer::Surface3dRenderer(Surface3dController *controller)
                      &Surface3dRenderer::updateSmoothStatus);
     QObject::connect(m_controller, &Surface3dController::surfaceGridChanged, this,
                      &Surface3dRenderer::updateSurfaceGridStatus);
-    QObject::connect(m_controller, &Surface3dController::tickCountChanged, this,
-                     &Surface3dRenderer::updateTickCount);
+    QObject::connect(m_controller, &Surface3dController::segmentCountChanged, this,
+                     &Surface3dRenderer::updateSegmentCount);
     QObject::connect(m_controller, &Surface3dController::themeChanged, this,
                      &Surface3dRenderer::updateTheme);
     QObject::connect(m_controller, &Surface3dController::leftMousePressed, this,
@@ -510,26 +510,26 @@ void Surface3dRenderer::drawScene(CameraHelper *camera, const GLuint defaultFboH
     }
 }
 
-void Surface3dRenderer::updateTickCount(GLint tickCount, GLfloat step, GLfloat minimum)
+void Surface3dRenderer::updateSegmentCount(GLint segmentCount, GLfloat step, GLfloat minimum)
 {
-    m_tickYCount = tickCount;
-    m_tickYStep = step;
-    if (tickCount > 0 && step > 0.0) {
-        m_yRange = m_tickYCount * m_tickYStep;
+    m_segmentYCount = segmentCount;
+    m_segmentYStep = step;
+    if (segmentCount > 0 && step > 0.0) {
+        m_yRange = m_segmentYCount * m_segmentYStep;
         m_yAdjustment = 2.0f - ((m_yRange - minimum) / m_yRange); // TODO: to function
     }
 
     qDebug() << "m_yAdjustment = " << m_yAdjustment;
 }
 
-void Surface3dRenderer::setXZStuff(GLint tickXCount, GLint tickZCount)
+void Surface3dRenderer::setXZStuff(GLint segmentXCount, GLint segmentZCount)
 {
-    m_tickXCount = tickXCount;
-    m_tickZCount = tickZCount;
+    m_segmentXCount = segmentXCount;
+    m_segmentZCount = segmentZCount;
 
     // TODO: Invent "idiotproof" max scene size formula..
     // This seems to work ok if spacing is not negative (and row/column or column/row ratio is not too high)
-    m_maxSceneSize = 2 * qSqrt(tickXCount * tickZCount);
+    m_maxSceneSize = 2 * qSqrt(segmentXCount * segmentZCount);
 
     calculateSceneScalingFactors();
 }
@@ -565,8 +565,8 @@ void Surface3dRenderer::updateSelectionTexture()
     // Create the selection ID image. Each grid corner gets 2x2 pixel area of
     // ID color so that each vertex (data point) has 4x4 pixel area of ID color
     // TODO: power of two thing for ES
-    int idImageWidth = (m_tickXCount - 1) * 4;
-    int idImageHeight = (m_tickZCount - 1) * 4;
+    int idImageWidth = (m_segmentXCount - 1) * 4;
+    int idImageHeight = (m_segmentZCount - 1) * 4;
     int stride = idImageWidth * 4 * sizeof(uchar); // 4 = number of color components (rgba)
 
     uchar *bits = new uchar[idImageWidth * idImageHeight * 4 * sizeof(uchar)];
@@ -581,10 +581,10 @@ void Surface3dRenderer::updateSelectionTexture()
             idToRGBA(id + 1, &r, &g, &b, &a);
             fillIdCorner(&bits[p + 8], r, g, b, a, stride);
 
-            idToRGBA(id + m_tickXCount, &r, &g, &b, &a);
+            idToRGBA(id + m_segmentXCount, &r, &g, &b, &a);
             fillIdCorner(&bits[p + 2 * stride], r, g, b, a, stride);
 
-            idToRGBA(id + m_tickXCount + 1, &r, &g, &b, &a);
+            idToRGBA(id + m_segmentXCount + 1, &r, &g, &b, &a);
             fillIdCorner(&bits[p + 2 * stride + 8], r, g, b, a, stride);
 
             id++;
@@ -662,9 +662,9 @@ void Surface3dRenderer::setSeries(QList<qreal> series)
         loadSurfaceObj();
 
     if (m_cachedSmoothSurface)
-        m_surfaceObj->setUpSmoothData(series, m_tickXCount, m_tickZCount, m_yRange, true);
+        m_surfaceObj->setUpSmoothData(series, m_segmentXCount, m_segmentZCount, m_yRange, true);
     else
-        m_surfaceObj->setUpData(series, m_tickXCount, m_tickZCount, m_yRange, true);
+        m_surfaceObj->setUpData(series, m_segmentXCount, m_segmentZCount, m_yRange, true);
 
     updateSelectionTexture();
 }
@@ -680,11 +680,11 @@ void Surface3dRenderer::calculateSceneScalingFactors()
 //    m_scaleX = m_barThickness.width() / m_scaleFactor;
 //    m_scaleZ = m_barThickness.height() / m_scaleFactor;
 
-    m_xLength = m_tickXCount;
-    m_zLength = m_tickZCount;
+    m_xLength = m_segmentXCount;
+    m_zLength = m_segmentZCount;
     m_maxDimension = qMax(m_xLength, m_zLength);
-    m_scaleFactor = qMin((m_tickXCount * (m_maxDimension / m_maxSceneSize)),
-                         (m_tickZCount * (m_maxDimension / m_maxSceneSize)));
+    m_scaleFactor = qMin((m_segmentXCount * (m_maxDimension / m_maxSceneSize)),
+                         (m_segmentZCount * (m_maxDimension / m_maxSceneSize)));
     m_scaleX = 1.0f / m_scaleFactor; // TODO: correspondance to m_barThickness
     m_scaleZ = 1.0f / m_scaleFactor; // TODO: correspondance to m_barThickness
 
@@ -701,9 +701,9 @@ void Surface3dRenderer::updateSmoothStatus(bool enable)
         return;
 
     if (m_cachedSmoothSurface)
-        m_surfaceObj->setUpSmoothData(m_series, m_tickXCount, m_tickZCount, m_yRange, true);
+        m_surfaceObj->setUpSmoothData(m_series, m_segmentXCount, m_segmentZCount, m_yRange, true);
     else
-        m_surfaceObj->setUpData(m_series, m_tickXCount, m_tickZCount, m_yRange, true);
+        m_surfaceObj->setUpData(m_series, m_segmentXCount, m_segmentZCount, m_yRange, true);
 
     initSurfaceShaders();
 }
diff --git a/src/datavis3d/engine/surface3drenderer_p.h b/src/datavis3d/engine/surface3drenderer_p.h
index 3660ad46..cb57351e 100644
--- a/src/datavis3d/engine/surface3drenderer_p.h
+++ b/src/datavis3d/engine/surface3drenderer_p.h
@@ -108,10 +108,10 @@ public:
 private:
     // Data parameters
     QList<qreal> m_series; // TODO: TEMP
-    GLint m_tickYCount;
-    GLfloat m_tickYStep;
-    GLint m_tickXCount;
-    GLint m_tickZCount;
+    GLint m_segmentYCount;
+    GLfloat m_segmentYStep;
+    GLint m_segmentXCount;
+    GLint m_segmentZCount;
 
     // Internal attributes purely related to how the scene is drawn with GL.
     QRect m_mainViewPort;
@@ -163,7 +163,7 @@ public slots:
     void updateSmoothStatus(bool enable);
     void updateSurfaceGridStatus(bool enable);
     void updateSurfaceGradient();
-    void updateTickCount(GLint tickCount, GLfloat step, GLfloat minimum = 0.0f);
+    void updateSegmentCount(GLint segmentCount, GLfloat step, GLfloat minimum = 0.0f);
 
     void getSelection();
 
@@ -191,7 +191,7 @@ public:
     void loadSurfaceObj();
 
     // TODO: temp
-    void setXZStuff(GLint tickXCount, GLint tickZCount);
+    void setXZStuff(GLint segmentXCount, GLint segmentZCount);
     void setSeries(QList<qreal> series);
 
 private:
diff --git a/src/datavis3dqml2/declarativebars.cpp b/src/datavis3dqml2/declarativebars.cpp
index 0f3ddd9a..e668c7f2 100644
--- a/src/datavis3dqml2/declarativebars.cpp
+++ b/src/datavis3dqml2/declarativebars.cpp
@@ -128,15 +128,15 @@ QSGNode *DeclarativeBars::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
         m_cachedState->m_isGridSet = false;
     }
 
-    if (m_cachedState->m_isTickCountSet) {
+    if (m_cachedState->m_isSegmentCountSet) {
         // TODO needs proper axis support on QML side, too
         QValueAxis *axis = static_cast<QValueAxis *>(m_shared->axisY());
         if (axis) {
-            axis->setTickCount(m_cachedState->m_tickCount);
-            axis->setRange(m_cachedState->m_tickMin,
-                          (m_cachedState->m_tickCount * m_cachedState->m_tickStep));
+            axis->setSegmentCount(m_cachedState->m_segmentCount);
+            axis->setRange(m_cachedState->m_segmentMin,
+                          (m_cachedState->m_segmentCount * m_cachedState->m_segmentStep));
         }
-        m_cachedState->m_isTickCountSet = false;
+        m_cachedState->m_isSegmentCountSet = false;
     }
 
 
@@ -259,12 +259,12 @@ bool DeclarativeBars::isBackgroundVisible()
 }
 
 // TODO needs proper axis support also in QML
-void DeclarativeBars::setTickCount(int tickCount, qreal step, qreal minimum)
+void DeclarativeBars::setSegmentCount(int segmentCount, qreal step, qreal minimum)
 {
-    m_cachedState->m_isTickCountSet = true;
-    m_cachedState->m_tickCount = tickCount;
-    m_cachedState->m_tickStep = step;
-    m_cachedState->m_tickMin = minimum;
+    m_cachedState->m_isSegmentCountSet = true;
+    m_cachedState->m_segmentCount = segmentCount;
+    m_cachedState->m_segmentStep = step;
+    m_cachedState->m_segmentMin = minimum;
 
     update();
 }
@@ -435,10 +435,10 @@ DeclarativeBarsCachedStatePrivate::DeclarativeBarsCachedStatePrivate() :
     m_shadowQuality(ShadowNone),
     m_isGridSet(false),
     m_isGridEnabled(true),
-    m_isTickCountSet(false),
-    m_tickCount(5),
-    m_tickStep(1),
-    m_tickMin(0)
+    m_isSegmentCountSet(false),
+    m_segmentCount(5),
+    m_segmentStep(1),
+    m_segmentMin(0)
 
 
 {
diff --git a/src/datavis3dqml2/declarativebars.h b/src/datavis3dqml2/declarativebars.h
index cada9870..a48d953a 100644
--- a/src/datavis3dqml2/declarativebars.h
+++ b/src/datavis3dqml2/declarativebars.h
@@ -160,10 +160,10 @@ public:
     Q_INVOKABLE void setBarColor(QColor baseColor, QColor heightColor, QColor depthColor,
                                  bool uniform = true);
 
-    // Set tick count and step. Note; tickCount * step should be the maximum possible value of data
+    // Set segment count and step. Note; segmentCount * step should be the maximum possible value of data
     // set. Minimum is the absolute minimum possible value a bar can have. This is especially
     // important to set if values can be negative.
-    Q_INVOKABLE void setTickCount(int tickCount, qreal step, qreal minimum);
+    Q_INVOKABLE void setSegmentCount(int segmentCount, qreal step, qreal minimum);
 
     // TODO: light placement API
 
diff --git a/src/datavis3dqml2/declarativebars_p.h b/src/datavis3dqml2/declarativebars_p.h
index 237b69a3..d8297500 100644
--- a/src/datavis3dqml2/declarativebars_p.h
+++ b/src/datavis3dqml2/declarativebars_p.h
@@ -82,10 +82,10 @@ public:
     bool m_isGridSet;
     bool m_isGridEnabled;
 
-    bool m_isTickCountSet;
-    int m_tickCount;
-    qreal m_tickStep;
-    qreal m_tickMin;
+    bool m_isSegmentCountSet;
+    int m_segmentCount;
+    qreal m_segmentStep;
+    qreal m_segmentMin;
 };
 
 QT_DATAVIS3D_END_NAMESPACE
diff --git a/src/datavis3dqml2/declarativescatter.cpp b/src/datavis3dqml2/declarativescatter.cpp
index f990f8ad..0e062dea 100644
--- a/src/datavis3dqml2/declarativescatter.cpp
+++ b/src/datavis3dqml2/declarativescatter.cpp
@@ -121,11 +121,11 @@ QSGNode *DeclarativeScatter::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDa
         m_cachedState->m_isGridSet = false;
     }
 
-    if (m_cachedState->m_isTickCountSet) {
-        m_shared->setTickCount(GLint(m_cachedState->m_tickCount),
-                               GLfloat(m_cachedState->m_tickStep),
-                               GLfloat(m_cachedState->m_tickMin));
-        m_cachedState->m_isTickCountSet = false;
+    if (m_cachedState->m_isSegmentCountSet) {
+        m_shared->setSegmentCount(GLint(m_cachedState->m_segmentCount),
+                               GLfloat(m_cachedState->m_segmentStep),
+                               GLfloat(m_cachedState->m_segmentMin));
+        m_cachedState->m_isSegmentCountSet = false;
     }
 
 
@@ -233,12 +233,12 @@ bool DeclarativeScatter::isBackgroundVisible()
     return m_shared->backgroundEnabled();
 }
 
-void DeclarativeScatter::setTickCount(int tickCount, qreal step, qreal minimum)
+void DeclarativeScatter::setSegmentCount(int segmentCount, qreal step, qreal minimum)
 {
-    m_cachedState->m_isTickCountSet = true;
-    m_cachedState->m_tickCount = tickCount;
-    m_cachedState->m_tickStep = step;
-    m_cachedState->m_tickMin = minimum;
+    m_cachedState->m_isSegmentCountSet = true;
+    m_cachedState->m_segmentCount = segmentCount;
+    m_cachedState->m_segmentStep = step;
+    m_cachedState->m_segmentMin = minimum;
 
     update();
 }
@@ -385,10 +385,10 @@ DeclarativeScatterCachedStatePrivate::DeclarativeScatterCachedStatePrivate() :
     m_shadowQuality(ShadowNone),
     m_isGridSet(false),
     m_isGridEnabled(true),
-    m_isTickCountSet(false),
-    m_tickCount(5),
-    m_tickStep(1),
-    m_tickMin(0)
+    m_isSegmentCountSet(false),
+    m_segmentCount(5),
+    m_segmentStep(1),
+    m_segmentMin(0)
 {
 }
 
diff --git a/src/datavis3dqml2/declarativescatter.h b/src/datavis3dqml2/declarativescatter.h
index d04642d8..1fd73ed6 100644
--- a/src/datavis3dqml2/declarativescatter.h
+++ b/src/datavis3dqml2/declarativescatter.h
@@ -148,10 +148,10 @@ public:
     Q_INVOKABLE void setBarColor(QColor baseColor, QColor heightColor, QColor depthColor,
                                  bool uniform = true);
 
-    // Set tick count and step. Note; tickCount * step should be the maximum possible value of data
+    // Set segment count and step. Note; segmentCount * step should be the maximum possible value of data
     // set. Minimum is the absolute minimum possible value a bar can have. This is especially
     // important to set if values can be negative.
-    Q_INVOKABLE void setTickCount(int tickCount, qreal step, qreal minimum);
+    Q_INVOKABLE void setSegmentCount(int segmentCount, qreal step, qreal minimum);
 
     // TODO: light placement API
 
diff --git a/src/datavis3dqml2/declarativescatter_p.h b/src/datavis3dqml2/declarativescatter_p.h
index 51e90a32..fbc1987b 100644
--- a/src/datavis3dqml2/declarativescatter_p.h
+++ b/src/datavis3dqml2/declarativescatter_p.h
@@ -79,10 +79,10 @@ public:
     bool m_isGridSet;
     bool m_isGridEnabled;
 
-    bool m_isTickCountSet;
-    int m_tickCount;
-    qreal m_tickStep;
-    qreal m_tickMin;
+    bool m_isSegmentCountSet;
+    int m_segmentCount;
+    qreal m_segmentStep;
+    qreal m_segmentMin;
 };
 
 QT_DATAVIS3D_END_NAMESPACE