diff --git a/configure.ac b/configure.ac
index 8d87c98f..8efc8627 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,13 +187,13 @@ if test "x$HW_RADIOSHACK_DMM" = "xyes"; then
 	AC_DEFINE(HAVE_HW_RADIOSHACK_DMM, 1, [RadioShack DMM support])
 fi
 
-AC_ARG_ENABLE(tekpower-dmm, AC_HELP_STRING([--enable-tekpower-dmm],
-	      [enable TekPower DMM support [default=yes]]),
-	      [HW_TEKPOWER_DMM="$enableval"],
-	      [HW_TEKPOWER_DMM=yes])
-AM_CONDITIONAL(HW_TEKPOWER_DMM, test x$HW_TEKPOWER_DMM = xyes)
-if test "x$HW_TEKPOWER_DMM" = "xyes"; then
-	AC_DEFINE(HAVE_HW_TEKPOWER_DMM, 1, [TekPower DMM support])
+AC_ARG_ENABLE(serial-dmm, AC_HELP_STRING([--enable-serial-dmm],
+	      [enable serial DMM support [default=yes]]),
+	      [HW_SERIAL_DMM="$enableval"],
+	      [HW_SERIAL_DMM=yes])
+AM_CONDITIONAL(HW_SERIAL_DMM, test x$HW_SERIAL_DMM = xyes)
+if test "x$HW_SERIAL_DMM" = "xyes"; then
+	AC_DEFINE(HAVE_HW_SERIAL_DMM, 1, [Serial DMM support])
 fi
 
 AC_ARG_ENABLE(tondaj-sl-814, AC_HELP_STRING([--enable-tondaj-sl-814],
@@ -314,7 +314,7 @@ AM_CONDITIONAL(NEED_SERIAL, \
 	-o "x$LA_LINK_MSO19" != xno \
 	-o "x$LA_OLS" != xno \
 	-o "x$HW_RADIOSHACK_DMM" != xno \
-	-o "x$HW_TEKPOWER_DMM" != xno \
+	-o "x$HW_SERIAL_DMM" != xno \
 	-o "x$HW_TONDAJ_SL_814" != xno \
 )
 
@@ -370,7 +370,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
 		 hardware/link-mso19/Makefile
 		 hardware/openbench-logic-sniffer/Makefile
 		 hardware/radioshack-dmm/Makefile
-		 hardware/tekpower-dmm/Makefile
+		 hardware/serial-dmm/Makefile
 		 hardware/uni-t-dmm/Makefile
 		 hardware/zeroplus-logic-cube/Makefile
 		 input/Makefile
@@ -415,7 +415,7 @@ echo "  - Hantek DSO...................... $HW_HANTEK_DSO"
 echo "  - Link MSO-19..................... $LA_LINK_MSO19"
 echo "  - Openbench Logic Sniffer......... $LA_OLS"
 echo "  - Radioshack DMM.................. $HW_RADIOSHACK_DMM"
-echo "  - TekPower DMM.................... $HW_TEKPOWER_DMM"
+echo "  - Serial DMM...................... $HW_SERIAL_DMM"
 echo "  - Tondaj SL-814................... $HW_TONDAJ_SL_814"
 echo "  - UNI-T DMM....................... $HW_UNI_T_DMM"
 echo "  - victor-dmm...................... $HW_VICTOR_DMM"
diff --git a/hardware/Makefile.am b/hardware/Makefile.am
index 89da7bb0..89d46815 100644
--- a/hardware/Makefile.am
+++ b/hardware/Makefile.am
@@ -32,7 +32,7 @@ SUBDIRS = \
 	link-mso19 \
 	openbench-logic-sniffer \
 	radioshack-dmm \
-	tekpower-dmm \
+	serial-dmm \
 	tondaj-sl-814 \
 	uni-t-dmm \
 	victor-dmm \
@@ -93,8 +93,8 @@ if HW_RADIOSHACK_DMM
 libsigrokhardware_la_LIBADD += radioshack-dmm/libsigrokhwradioshackdmm.la
 endif
 
-if HW_TEKPOWER_DMM
-libsigrokhardware_la_LIBADD += tekpower-dmm/libsigrokhwtekpowerdmm.la
+if HW_SERIAL_DMM
+libsigrokhardware_la_LIBADD += serial-dmm/libsigrokhwserialdmm.la
 endif
 
 if HW_TONDAJ_SL_814
diff --git a/hardware/tekpower-dmm/Makefile.am b/hardware/serial-dmm/Makefile.am
similarity index 86%
rename from hardware/tekpower-dmm/Makefile.am
rename to hardware/serial-dmm/Makefile.am
index 5e7521b1..7fede239 100644
--- a/hardware/tekpower-dmm/Makefile.am
+++ b/hardware/serial-dmm/Makefile.am
@@ -17,17 +17,17 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-if HW_TEKPOWER_DMM
+if HW_SERIAL_DMM
 
 # Local lib, this is NOT meant to be installed!
-noinst_LTLIBRARIES = libsigrokhwtekpowerdmm.la
+noinst_LTLIBRARIES = libsigrokhwserialdmm.la
 
-libsigrokhwtekpowerdmm_la_SOURCES = \
+libsigrokhwserialdmm_la_SOURCES = \
 	api.c \
 	protocol.c \
 	protocol.h
 
-libsigrokhwtekpowerdmm_la_CFLAGS = \
+libsigrokhwserialdmm_la_CFLAGS = \
 	-I$(top_srcdir)
 
 endif
diff --git a/hardware/tekpower-dmm/api.c b/hardware/serial-dmm/api.c
similarity index 100%
rename from hardware/tekpower-dmm/api.c
rename to hardware/serial-dmm/api.c
diff --git a/hardware/tekpower-dmm/protocol.c b/hardware/serial-dmm/protocol.c
similarity index 100%
rename from hardware/tekpower-dmm/protocol.c
rename to hardware/serial-dmm/protocol.c
diff --git a/hardware/tekpower-dmm/protocol.h b/hardware/serial-dmm/protocol.h
similarity index 93%
rename from hardware/tekpower-dmm/protocol.h
rename to hardware/serial-dmm/protocol.h
index e3722483..ba5eaa5d 100644
--- a/hardware/tekpower-dmm/protocol.h
+++ b/hardware/serial-dmm/protocol.h
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBSIGROK_HARDWARE_TEKPOWER_DMM_PROTOCOL_H
-#define LIBSIGROK_HARDWARE_TEKPOWER_DMM_PROTOCOL_H
+#ifndef LIBSIGROK_HARDWARE_SERIAL_DMM_PROTOCOL_H
+#define LIBSIGROK_HARDWARE_SERIAL_DMM_PROTOCOL_H
 
 /* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "tekpower-dmm: "
+#define DRIVER_LOG_DOMAIN "serial-dmm: "
 #define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
 #define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
 #define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
diff --git a/hwdriver.c b/hwdriver.c
index 729edc96..c377b2d5 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -113,7 +113,7 @@ extern SR_PRIV struct sr_dev_driver flukedmm_driver_info;
 #ifdef HAVE_HW_RADIOSHACK_DMM
 extern SR_PRIV struct sr_dev_driver radioshackdmm_driver_info;
 #endif
-#ifdef HAVE_HW_TEKPOWER_DMM
+#ifdef HAVE_HW_SERIAL_DMM
 extern SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info;
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
@@ -168,7 +168,7 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_RADIOSHACK_DMM
 	&radioshackdmm_driver_info,
 #endif
-#ifdef HAVE_HW_TEKPOWER_DMM
+#ifdef HAVE_HW_SERIAL_DMM
 	&tekpower_tp4000zc_driver_info,
 #endif
 #ifdef HAVE_HW_UNI_T_DMM