diff --git a/cursors.cpp b/cursors.cpp
index 9af4ad8..d76828c 100644
--- a/cursors.cpp
+++ b/cursors.cpp
@@ -82,10 +82,10 @@ void Cursors::paintFront(QPainter &painter, QRect &rect, range_t<off_t> sampleRa
         QBrush(QColor(255, 255, 255, 50))
     );
 
-    // Draw vertical edges for individual bits
+    // Draw vertical edges for individual segments
     painter.setPen(QPen(Qt::gray, 1, Qt::DashLine));
-    for (int i = 1; i < bitCount; i++) {
-        int pos = cursorPositions[0] + (i * cursorRect.width() / bitCount);
+    for (int i = 1; i < segmentCount; i++) {
+        int pos = cursorPositions[0] + (i * cursorRect.width() / segmentCount);
         painter.drawLine(pos, rect.top(), pos, rect.bottom());
     }
 
@@ -108,9 +108,9 @@ range_t<int> Cursors::selection()
     }
 }
 
-void Cursors::setBits(int bits)
+void Cursors::setSegments(int segments)
 {
-    bitCount = std::max(bits, 1);
+    segmentCount = std::max(segments, 1);
 
 }
 
diff --git a/cursors.h b/cursors.h
index 9c6cedc..2fe87e9 100644
--- a/cursors.h
+++ b/cursors.h
@@ -32,7 +32,7 @@ public:
     Cursors(QObject * parent);
     void paintFront(QPainter &painter, QRect &rect, range_t<off_t> sampleRange);
     range_t<int> selection();
-    void setBits(int bits);
+    void setSegments(int segments);
     void setSelection(range_t<int> selection);
 
 signals:
@@ -44,7 +44,7 @@ protected:
 private:
 	bool pointOverCursor(QPoint point, int &cursor);
 
-	int bitCount = 1;
+	int segmentCount = 1;
 	bool dragging = false;
 	int selectedCursor = 0;
 	int cursorPositions[2] = {0, 50};
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 4999cde..117d27d 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -43,7 +43,7 @@ MainWindow::MainWindow()
     connect(dock->powerMaxSlider, SIGNAL(valueChanged(int)), plots, SLOT(setPowerMax(int)));
     connect(dock->powerMinSlider, SIGNAL(valueChanged(int)), plots, SLOT(setPowerMin(int)));
     connect(dock->cursorsCheckBox, &QCheckBox::stateChanged, plots, &PlotView::enableCursors);
-    connect(dock->cursorBitsSpinBox, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), plots, &PlotView::setCursorBits);
+    connect(dock->cursorSymbolsSpinBox, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), plots, &PlotView::setCursorSegments);
 
     // Connect dock outputs
     connect(plots, SIGNAL(timeSelectionChanged(float)), dock, SLOT(timeSelectionChanged(float)));
diff --git a/plotview.cpp b/plotview.cpp
index f2c4a62..a3c3893 100644
--- a/plotview.cpp
+++ b/plotview.cpp
@@ -130,9 +130,9 @@ void PlotView::invalidateEvent()
     horizontalScrollBar()->setMaximum(mainSampleSource->count());
 }
 
-void PlotView::setCursorBits(int bits)
+void PlotView::setCursorSegments(int segments)
 {
-    cursors.setBits(bits);
+    cursors.setSegments(segments);
     cursorsMoved();
     viewport()->update();
 }
diff --git a/plotview.h b/plotview.h
index 6c97476..16e0db2 100644
--- a/plotview.h
+++ b/plotview.h
@@ -45,7 +45,7 @@ public slots:
     void cursorsMoved();
     void enableCursors(bool enable);
     void invalidateEvent();
-    void setCursorBits(int bits);
+    void setCursorSegments(int segments);
     void setFFTAndZoom(int fftSize, int zoomLevel);
     void setPowerMin(int power);
     void setPowerMax(int power);
diff --git a/spectrogramcontrols.cpp b/spectrogramcontrols.cpp
index ca2c95c..7dbf4db 100644
--- a/spectrogramcontrols.cpp
+++ b/spectrogramcontrols.cpp
@@ -64,22 +64,22 @@ SpectrogramControls::SpectrogramControls(const QString & title, QWidget * parent
     cursorsCheckBox = new QCheckBox(widget);
     layout->addRow(new QLabel(tr("Enable cursors:")), cursorsCheckBox);
 
-    cursorBitsSpinBox = new QSpinBox();
-    cursorBitsSpinBox->setMinimum(1);
-    cursorBitsSpinBox->setMaximum(9999);
-    layout->addRow(new QLabel(tr("Bits:")), cursorBitsSpinBox);
+    cursorSymbolsSpinBox = new QSpinBox();
+    cursorSymbolsSpinBox->setMinimum(1);
+    cursorSymbolsSpinBox->setMaximum(9999);
+    layout->addRow(new QLabel(tr("Symbols:")), cursorSymbolsSpinBox);
 
-    timeSelectionFreqLabel = new QLabel();
-    layout->addRow(new QLabel(tr("Frequency:")), timeSelectionFreqLabel);
+    rateLabel = new QLabel();
+    layout->addRow(new QLabel(tr("Rate:")), rateLabel);
 
-    timeSelectionTimeLabel = new QLabel();
-    layout->addRow(new QLabel(tr("Time:")), timeSelectionTimeLabel);
+    periodLabel = new QLabel();
+    layout->addRow(new QLabel(tr("Period:")), periodLabel);
 
-    bitSelectionFreqLabel = new QLabel();
-    layout->addRow(new QLabel(tr("Bit frequency:")), bitSelectionFreqLabel);
+    symbolRateLabel = new QLabel();
+    layout->addRow(new QLabel(tr("Symbol rate:")), symbolRateLabel);
 
-    bitSelectionTimeLabel = new QLabel();
-    layout->addRow(new QLabel(tr("Bit time:")), bitSelectionTimeLabel);
+    symbolPeriodLabel = new QLabel();
+    layout->addRow(new QLabel(tr("Symbol period:")), symbolPeriodLabel);
 
     widget->setLayout(layout);
     setWidget(widget);
@@ -92,10 +92,10 @@ SpectrogramControls::SpectrogramControls(const QString & title, QWidget * parent
 
 void SpectrogramControls::clearCursorLabels()
 {
-    timeSelectionTimeLabel->setText("");
-    timeSelectionFreqLabel->setText("");
-    bitSelectionTimeLabel->setText("");
-    bitSelectionFreqLabel->setText("");
+    periodLabel->setText("");
+    rateLabel->setText("");
+    symbolPeriodLabel->setText("");
+    symbolRateLabel->setText("");
 }
 
 void SpectrogramControls::cursorsStateChanged(int state)
@@ -113,7 +113,7 @@ void SpectrogramControls::setDefaults()
     powerMaxSlider->setValue(0);
     powerMinSlider->setValue(-50);
     cursorsCheckBox->setCheckState(Qt::Unchecked);
-    cursorBitsSpinBox->setValue(1);
+    cursorSymbolsSpinBox->setValue(1);
 }
 
 void SpectrogramControls::fftOrZoomChanged(int value)
@@ -135,12 +135,12 @@ void SpectrogramControls::fileOpenButtonClicked()
 void SpectrogramControls::timeSelectionChanged(float time)
 {
     if (cursorsCheckBox->checkState() == Qt::Checked) {
-        timeSelectionTimeLabel->setText(QString::number(time) + "s");
-        timeSelectionFreqLabel->setText(QString::number(1 / time) + "Hz");
+        periodLabel->setText(QString::number(time) + "s");
+        rateLabel->setText(QString::number(1 / time) + "Hz");
 
-        int bits = cursorBitsSpinBox->value();
-        bitSelectionTimeLabel->setText(QString::number(time / bits) + "s");
-        bitSelectionFreqLabel->setText(QString::number(bits / time) + "Hz");
+        int symbols = cursorSymbolsSpinBox->value();
+        symbolPeriodLabel->setText(QString::number(time / symbols) + "s");
+        symbolRateLabel->setText(QString::number(symbols / time) + "Hz");
     }
 }
 
diff --git a/spectrogramcontrols.h b/spectrogramcontrols.h
index 92aba7a..cdf8744 100644
--- a/spectrogramcontrols.h
+++ b/spectrogramcontrols.h
@@ -63,9 +63,9 @@ public:
     QSlider *powerMaxSlider;
     QSlider *powerMinSlider;
     QCheckBox *cursorsCheckBox;
-    QSpinBox *cursorBitsSpinBox;
-    QLabel *timeSelectionFreqLabel;
-    QLabel *timeSelectionTimeLabel;
-    QLabel *bitSelectionFreqLabel;
-    QLabel *bitSelectionTimeLabel;
+    QSpinBox *cursorSymbolsSpinBox;
+    QLabel *rateLabel;
+    QLabel *periodLabel;
+    QLabel *symbolRateLabel;
+    QLabel *symbolPeriodLabel;
 };