diff --git a/Changelog b/Changelog
index 79e3b6b4..7f078097 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,7 @@
+Version 1.9.25
+---------
+ * Fix typo in log messages.
+
 Version 1.9.24
 ---------
  * Remove leftover pid files in /var/tmp during offline backup (#114)
diff --git a/README.md b/README.md
index f92bb4a8..4c243bd8 100644
--- a/README.md
+++ b/README.md
@@ -886,7 +886,7 @@ like it would be possible using the `virsh -c` option:
 ## The thin provisioned backups are bigger than the original qcow images
 
 Virtual machines using the qcow format do compress data. During backup, the
-image contents are exposed as NDB device which is a RAW device. The backup data
+image contents are exposed as NBD device which is a RAW device. The backup data
 will be at least as big as the used data within the virtual machine. 
 
 You can use the `--compress` option or other tools to compress the backup
diff --git a/libvirtnbdbackup/__init__.py b/libvirtnbdbackup/__init__.py
index c1950215..2a4006cd 100644
--- a/libvirtnbdbackup/__init__.py
+++ b/libvirtnbdbackup/__init__.py
@@ -15,4 +15,4 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-__version__ = "1.9.24"
+__version__ = "1.9.25"
diff --git a/libvirtnbdbackup/argopt.py b/libvirtnbdbackup/argopt.py
index d63cd8e9..fe0cc8ea 100644
--- a/libvirtnbdbackup/argopt.py
+++ b/libvirtnbdbackup/argopt.py
@@ -69,7 +69,7 @@ def addRemoteArgs(opt: _ArgumentGroup) -> None:
         default=10809,
         required=False,
         help=(
-            "Port used by remote NDB Service, should be unique for each"
+            "Port used by remote NBD Service, should be unique for each"
             " started backup. (default: %(default)s)"
         ),
     )
diff --git a/libvirtnbdbackup/extenthandler/extenthandler.py b/libvirtnbdbackup/extenthandler/extenthandler.py
index 611990c4..d7da160c 100644
--- a/libvirtnbdbackup/extenthandler/extenthandler.py
+++ b/libvirtnbdbackup/extenthandler/extenthandler.py
@@ -150,7 +150,7 @@ def queryExtentsNbd(self) -> List[_ExtentObj]:
         maxRequestLen = self._setRequestAligment()
         offset = 0
         size = self._nbdFh.nbd.get_size()
-        log.debug("Size returned from NDB server: %s", size)
+        log.debug("Size returned from NBD server: %s", size)
         lastExtentLen = len(self._extentEntries)
         while offset < size:
             if size < maxRequestLen:
diff --git a/man/virtnbdbackup.1 b/man/virtnbdbackup.1
index 82975553..e0c3123b 100644
--- a/man/virtnbdbackup.1
+++ b/man/virtnbdbackup.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH VIRTNBDBACKUP "1" "April 2023" "virtnbdbackup 1.9.24" "User Commands"
+.TH VIRTNBDBACKUP "1" "June 2023" "virtnbdbackup 1.9.25" "User Commands"
 .SH NAME
 virtnbdbackup \- backup utility for libvirt
 .SH DESCRIPTION
@@ -48,7 +48,7 @@ Backup only disk with target dev name (\fB\-i\fR vda)
 Exclude disk(s) with target dev name (\fB\-x\fR vda,vdb)
 .TP
 \fB\-f\fR SOCKETFILE, \fB\-\-socketfile\fR SOCKETFILE
-Use specified file for NBD Server socket (default: \fI\,/var/tmp/virtnbdbackup.51823\/\fP)
+Use specified file for NBD Server socket (default: \fI\,/var/tmp/virtnbdbackup.4066\/\fP)
 .TP
 \fB\-n\fR, \fB\-\-noprogress\fR
 Disable progress bar
@@ -82,7 +82,7 @@ User to authenticate against remote sshd: used for remote copy of files. (defaul
 Password to authenticate against libvirtd. (default: None)
 .TP
 \fB\-P\fR NBD_PORT, \fB\-\-nbd\-port\fR NBD_PORT
-Port used by remote NDB Service, should be unique for each started backup. (default: 10809)
+Port used by remote NBD Service, should be unique for each started backup. (default: 10809)
 .TP
 \fB\-I\fR NBD_IP, \fB\-\-nbd\-ip\fR NBD_IP
 IP used to bind remote NBD service on (default: hostname returned by libvirtd)
diff --git a/man/virtnbdmap.1 b/man/virtnbdmap.1
index d9b9e0da..82748737 100644
--- a/man/virtnbdmap.1
+++ b/man/virtnbdmap.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH VIRTNBDMAP "1" "April 2023" "virtnbdmap 1.9.24" "User Commands"
+.TH VIRTNBDMAP "1" "June 2023" "virtnbdmap 1.9.25" "User Commands"
 .SH NAME
 virtnbdmap \- map virtnbdbackup image files to nbd devices
 .SH DESCRIPTION
diff --git a/man/virtnbdrestore.1 b/man/virtnbdrestore.1
index 7545eba4..3404cc57 100644
--- a/man/virtnbdrestore.1
+++ b/man/virtnbdrestore.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH VIRTNBDRESTORE "1" "April 2023" "virtnbdrestore 1.9.24" "User Commands"
+.TH VIRTNBDRESTORE "1" "June 2023" "virtnbdrestore 1.9.25" "User Commands"
 .SH NAME
 virtnbdrestore \- restore utility for libvirt
 .SH DESCRIPTION
@@ -40,7 +40,7 @@ Process only disk matching target dev name. (default: None)
 Disable progress bar
 .TP
 \fB\-f\fR SOCKETFILE, \fB\-\-socketfile\fR SOCKETFILE
-Use specified file for NBD Server socket (default: \fI\,/var/tmp/virtnbdbackup.51828\/\fP)
+Use specified file for NBD Server socket (default: \fI\,/var/tmp/virtnbdbackup.4071\/\fP)
 .TP
 \fB\-r\fR, \fB\-\-raw\fR
 Copy raw images as is during restore. (default: False)
@@ -68,7 +68,7 @@ User to authenticate against remote sshd: used for remote copy of files. (defaul
 Password to authenticate against libvirtd. (default: None)
 .TP
 \fB\-P\fR NBD_PORT, \fB\-\-nbd\-port\fR NBD_PORT
-Port used by remote NDB Service, should be unique for each started backup. (default: 10809)
+Port used by remote NBD Service, should be unique for each started backup. (default: 10809)
 .TP
 \fB\-I\fR NBD_IP, \fB\-\-nbd\-ip\fR NBD_IP
 IP used to bind remote NBD service on (default: hostname returned by libvirtd)
diff --git a/virtnbdbackup b/virtnbdbackup
index b8c963a1..e6053e96 100755
--- a/virtnbdbackup
+++ b/virtnbdbackup
@@ -450,9 +450,8 @@ def main() -> None:
             logging.error("Remote backup detected but ssh session setup failed")
             sys.exit(1)
         logging.info(
-            "Remote: NDB Endpoint socket: [%s:%s]",
+            "Remote NBD Endpoint host: [%s]",
             virtClient.remoteHost,
-            args.socketfile,
         )
         if args.offline is True:
             logging.info(
@@ -461,7 +460,7 @@ def main() -> None:
                 args.nbd_port + args.worker,
             )
     else:
-        logging.info("Local NDB Endpoint socket: [%s]", args.socketfile)
+        logging.info("Local NBD Endpoint socket: [%s]", args.socketfile)
 
     if args.offline is not True:
         logging.info("Temporary scratch file target directory: [%s]", args.scratchdir)
@@ -597,7 +596,7 @@ def startOfflineNBD(
     socket = f"{args.socketfile}.{disk.target}"
     if remoteHost != "":
         logging.info(
-            "Offline backup, starting remote NDB server, socket: [%s:%s], port: [%s]",
+            "Offline backup, starting remote NBD server, socket: [%s:%s], port: [%s]",
             remoteHost,
             socket,
             port,
@@ -605,14 +604,14 @@ def startOfflineNBD(
         nbdProc = qemu.util(disk.target).startRemoteBackupNbdServer(
             args, disk, bitMap, port
         )
-        logging.info("Remote NDB server started, PID: [%s].", nbdProc.pid)
+        logging.info("Remote NBD server started, PID: [%s].", nbdProc.pid)
         return nbdProc
 
-    logging.info("Offline backup, starting local NDB server, socket: [%s]", socket)
+    logging.info("Offline backup, starting local NBD server, socket: [%s]", socket)
     nbdProc = qemu.util(disk.target).startBackupNbdServer(
         disk.format, disk.path, socket, bitMap
     )
-    logging.info("Local NDB Service started, PID: [%s]", nbdProc.pid)
+    logging.info("Local NBD Service started, PID: [%s]", nbdProc.pid)
     return nbdProc