diff --git a/src/witness.c b/src/witness.c
index 24312031..23753f24 100644
--- a/src/witness.c
+++ b/src/witness.c
@@ -13,7 +13,7 @@ witness_init(witness_t *witness, const char *name, witness_rank_t rank,
 
 #ifdef JEMALLOC_JET
 #undef witness_lock_error
-#define	witness_lock_error JEMALLOC_N(witness_lock_error_impl)
+#define	witness_lock_error JEMALLOC_N(n_witness_lock_error)
 #endif
 void
 witness_lock_error(const witness_list_t *witnesses, const witness_t *witness)
@@ -30,12 +30,12 @@ witness_lock_error(const witness_list_t *witnesses, const witness_t *witness)
 #ifdef JEMALLOC_JET
 #undef witness_lock_error
 #define	witness_lock_error JEMALLOC_N(witness_lock_error)
-witness_lock_error_t *witness_lock_error = JEMALLOC_N(witness_lock_error_impl);
+witness_lock_error_t *witness_lock_error = JEMALLOC_N(n_witness_lock_error);
 #endif
 
 #ifdef JEMALLOC_JET
 #undef witness_owner_error
-#define	witness_owner_error JEMALLOC_N(witness_owner_error_impl)
+#define	witness_owner_error JEMALLOC_N(n_witness_owner_error)
 #endif
 void
 witness_owner_error(const witness_t *witness)
@@ -48,13 +48,12 @@ witness_owner_error(const witness_t *witness)
 #ifdef JEMALLOC_JET
 #undef witness_owner_error
 #define	witness_owner_error JEMALLOC_N(witness_owner_error)
-witness_owner_error_t *witness_owner_error =
-    JEMALLOC_N(witness_owner_error_impl);
+witness_owner_error_t *witness_owner_error = JEMALLOC_N(n_witness_owner_error);
 #endif
 
 #ifdef JEMALLOC_JET
 #undef witness_not_owner_error
-#define	witness_not_owner_error JEMALLOC_N(witness_not_owner_error_impl)
+#define	witness_not_owner_error JEMALLOC_N(n_witness_not_owner_error)
 #endif
 void
 witness_not_owner_error(const witness_t *witness)
@@ -68,12 +67,12 @@ witness_not_owner_error(const witness_t *witness)
 #undef witness_not_owner_error
 #define	witness_not_owner_error JEMALLOC_N(witness_not_owner_error)
 witness_not_owner_error_t *witness_not_owner_error =
-    JEMALLOC_N(witness_not_owner_error_impl);
+    JEMALLOC_N(n_witness_not_owner_error);
 #endif
 
 #ifdef JEMALLOC_JET
 #undef witness_lockless_error
-#define	witness_lockless_error JEMALLOC_N(witness_lockless_error_impl)
+#define	witness_lockless_error JEMALLOC_N(n_witness_lockless_error)
 #endif
 void
 witness_lockless_error(const witness_list_t *witnesses)
@@ -91,7 +90,7 @@ witness_lockless_error(const witness_list_t *witnesses)
 #undef witness_lockless_error
 #define	witness_lockless_error JEMALLOC_N(witness_lockless_error)
 witness_lockless_error_t *witness_lockless_error =
-    JEMALLOC_N(witness_lockless_error_impl);
+    JEMALLOC_N(n_witness_lockless_error);
 #endif
 
 void