diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp
index cb221a0ad..49fc50229 100644
--- a/qt-models/diveplannermodel.cpp
+++ b/qt-models/diveplannermodel.cpp
@@ -306,7 +306,7 @@ QVariant DivePlannerPointsModel::headerData(int section, Qt::Orientation orienta
 		case GAS:
 			return tr("Used gas");
 		case CCSETPOINT:
-			return tr("CC set point");
+			return tr("CC setpoint");
 		}
 	} else if (role == Qt::FontRole) {
 		return defaultModelFont();
diff --git a/qt-ui/btdeviceselectiondialog.cpp b/qt-ui/btdeviceselectiondialog.cpp
index dc5d70d8b..74afda616 100644
--- a/qt-ui/btdeviceselectiondialog.cpp
+++ b/qt-ui/btdeviceselectiondialog.cpp
@@ -343,7 +343,7 @@ void BtDeviceSelectionDialog::pairingFinished(const QBluetoothAddress &address,
 		pairingStatusLabel = tr("AUTHORIZED_PAIRED");
 		pairingColor = QColor(Qt::blue);
 		enableSaveButton = true;
-		dialogStatusMessage = tr("Device %1 was authorized paired.").arg(remoteDeviceStringAddress);
+		dialogStatusMessage = tr("Device %1 was paired and is authorized.").arg(remoteDeviceStringAddress);
 	}
 
 	// Find the items which represent the BTH device and update their state
diff --git a/qt-ui/configuredivecomputerdialog.ui b/qt-ui/configuredivecomputerdialog.ui
index cd78a7767..c6bd647ec 100644
--- a/qt-ui/configuredivecomputerdialog.ui
+++ b/qt-ui/configuredivecomputerdialog.ui
@@ -1246,7 +1246,7 @@
               </column>
               <column>
                <property name="text">
-                <string>Set point</string>
+                <string>Setpoint</string>
                </property>
               </column>
               <column>
@@ -2495,7 +2495,7 @@
               </column>
               <column>
                <property name="text">
-                <string>Set point</string>
+                <string>Setpoint</string>
                </property>
               </column>
               <column>