diff --git a/clocks/cricket/cricket.system.s b/clocks/cricket/cricket.system.s
index 92d5d93..186323f 100644
--- a/clocks/cricket/cricket.system.s
+++ b/clocks/cricket/cricket.system.s
@@ -35,9 +35,8 @@
 
         read_delay_hi = $3 * 3 ; ($300 iterations is normal * 3.6MHz)
 
-.ifndef JUMBO_CLOCK_DRIVER
+        .undef PRODUCT
         .define PRODUCT "Cricket Clock"
-.endif ; JUMBO_CLOCK_DRIVER
 
 ;;; ============================================================
 ;;; Ensure there is not a previous clock driver installed.
@@ -214,7 +213,6 @@ loop:   lda     driver,y
 
         lda     ROMIN2
 
-.ifndef JUMBO_CLOCK_DRIVER
         ;; Display success message
         jsr     log_message
         scrcode PRODUCT, " - "
@@ -222,7 +220,6 @@ loop:   lda     driver,y
 
         ;; Display the current date
         jsr     cout_date
-.endif ; JUMBO_CLOCK_DRIVER
 
         clc                     ; success
         rts                     ; done!
diff --git a/clocks/dclock/dclock.system.s b/clocks/dclock/dclock.system.s
index dffa715..4c36d56 100644
--- a/clocks/dclock/dclock.system.s
+++ b/clocks/dclock/dclock.system.s
@@ -56,9 +56,8 @@ DATA            := SLOT4IO+3                    ; Slinky data byte
 ;;;
 ;;; ============================================================
 
-.ifndef JUMBO_CLOCK_DRIVER
+        .undef PRODUCT
         .define PRODUCT "DClock"
-.endif ; JUMBO_CLOCK_DRIVER
 
 ;;; ============================================================
 ;;; Ensure there is not a previous clock driver installed.
@@ -138,7 +137,6 @@ loop:   lda     driver,y
 
         lda     ROMIN2
 
-.ifndef JUMBO_CLOCK_DRIVER
         ;; Display success message
         jsr     log_message
         scrcode PRODUCT, " - "
@@ -146,7 +144,6 @@ loop:   lda     driver,y
 
         ;; Display the current date
         jsr     cout_date
-.endif ; JUMBO_CLOCK_DRIVER
 
         clc                     ; success
         rts                     ; done!
diff --git a/clocks/fujinet/fn.clock.system.s b/clocks/fujinet/fn.clock.system.s
index d19ee56..ccf64db 100644
--- a/clocks/fujinet/fn.clock.system.s
+++ b/clocks/fujinet/fn.clock.system.s
@@ -32,9 +32,8 @@ FN_CLOCK_DEVICE_TYPE := $13 ; As defined on the Fujinet firmware
 ;;;
 ;;; ============================================================
 
-.ifndef JUMBO_CLOCK_DRIVER
+        .undef PRODUCT
         .define PRODUCT "Fujinet Clock"
-.endif ; JUMBO_CLOCK_DRIVER
 
 ;;; ============================================================
 ;;; Ensure there is not a previous clock driver installed.
@@ -178,7 +177,6 @@ loop:   lda     driver,y
 
         lda     ROMIN2
 
-.ifndef JUMBO_CLOCK_DRIVER
         ;; Display success message
         jsr     log_message
         scrcode PRODUCT, " - "
@@ -186,7 +184,6 @@ loop:   lda     driver,y
 
         ;; Display the current date
         jsr     cout_date
-.endif ; JUMBO_CLOCK_DRIVER
 
         clc                     ; success
         rts                     ; done!
diff --git a/clocks/jumbo/clock.system.s b/clocks/jumbo/clock.system.s
index a475927..ebfc36d 100644
--- a/clocks/jumbo/clock.system.s
+++ b/clocks/jumbo/clock.system.s
@@ -44,6 +44,7 @@
 ;;;
 ;;; ============================================================
 
+        .undef PRODUCT
         .define PRODUCT "Jumbo Clock Driver"
 
 .proc maybe_install_driver
diff --git a/clocks/ns.clock/ns.clock.system.s b/clocks/ns.clock/ns.clock.system.s
index b76a4af..8bbeb2e 100644
--- a/clocks/ns.clock/ns.clock.system.s
+++ b/clocks/ns.clock/ns.clock.system.s
@@ -31,9 +31,8 @@
 ;;;
 ;;; ============================================================
 
-.ifndef JUMBO_CLOCK_DRIVER
+        .undef PRODUCT
         .define PRODUCT "No-Slot Clock"
-.endif ; JUMBO_CLOCK_DRIVER
 
 ;;; ============================================================
 ;;; Ensure there is not a previous clock driver installed.
@@ -194,7 +193,6 @@ loop:   lda     driver,y
 
         lda     ROMIN2
 
-.ifndef JUMBO_CLOCK_DRIVER
         ;; Display success message
         jsr     log_message
         scrcode PRODUCT, " - "
@@ -202,7 +200,6 @@ loop:   lda     driver,y
 
         ;; Display the current date
         jsr     cout_date
-.endif ; JUMBO_CLOCK_DRIVER
 
         clc                     ; success
         rts                     ; done!
diff --git a/clocks/romx/romxrtc.system.s b/clocks/romx/romxrtc.system.s
index 5bdea6f..0cc1aa5 100644
--- a/clocks/romx/romxrtc.system.s
+++ b/clocks/romx/romxrtc.system.s
@@ -45,9 +45,8 @@ SEL_MBANK     :=  $F851       ; Select Main bank reg
 ;;;
 ;;; ============================================================
 
-.ifndef JUMBO_CLOCK_DRIVER
+        .undef PRODUCT
         .define PRODUCT "ROMX Clock"
-.endif ; JUMBO_CLOCK_DRIVER
 
 ;;; ============================================================
 ;;; Ensure there is not a previous clock driver installed.
@@ -157,7 +156,6 @@ loop:   lda     ClockDrv,y
 
         lda     ROMIN2
 
-.ifndef JUMBO_CLOCK_DRIVER
         ;; Display success message
         jsr     log_message
         scrcode PRODUCT, " - "
@@ -165,7 +163,6 @@ loop:   lda     ClockDrv,y
 
         ;; Display the current date
         jsr     cout_date
-.endif ; JUMBO_CLOCK_DRIVER
 
         clc                     ; success
         rts                     ; done!
diff --git a/inc/driver_preamble.inc b/inc/driver_preamble.inc
index 086c03a..9f89176 100644
--- a/inc/driver_preamble.inc
+++ b/inc/driver_preamble.inc
@@ -1,3 +1,5 @@
+.define PRODUCT "Unknown"
+
 ;;; ------------------------------------------------------------
 
         ;; SYS files load at $2000; relocates self to $1000
diff --git a/ram.drv/ram.drv.system.s b/ram.drv/ram.drv.system.s
index d17d8db..772c466 100644
--- a/ram.drv/ram.drv.system.s
+++ b/ram.drv/ram.drv.system.s
@@ -30,6 +30,7 @@
 ;;; ============================================================
 ;;; Configuration Parameters
 
+        .undef PRODUCT
         .define PRODUCT "RAMWorks RAM Disk"
 
 zp_sig_addr             := $06