Index: kernel/arch/amd64/src/debugger.c
===================================================================
--- kernel/arch/amd64/src/debugger.c	(revision e2b762ec7955698a156a39c44cbaacd7211758b2)
+++ kernel/arch/amd64/src/debugger.c	(revision 5eb90cbf3afe6afd7b4236a6cc328c7c634b9ff6)
@@ -44,8 +44,5 @@
 #include <func.h>
 #include <smp/ipi.h>
-
-#ifdef CONFIG_SYMTAB
 #include <symtab.h>
-#endif
 
 typedef struct  {
@@ -234,10 +231,6 @@
 	}
 
-#ifdef CONFIG_SYMTAB
-	printf("Reached breakpoint %d:%lx(%s)\n", slot, getip(istate),
-	    get_symtab_entry(getip(istate)));
-#else
-	printf("Reached breakpoint %d:%lx\n", slot, getip(istate));
-#endif
+	printf("Reached breakpoint %d:%lx (%s)\n", slot, getip(istate),
+	    symtab_fmt_name_lookup(getip(istate)));
 
 #ifdef CONFIG_KCONSOLE
@@ -364,9 +357,6 @@
 	for (i = 0; i < BKPOINTS_MAX; i++)
 		if (breakpoints[i].address) {
-#ifdef CONFIG_SYMTAB
-			symbol = get_symtab_entry(breakpoints[i].address);
-#else
-			symbol = "n/a";
-#endif
+			symbol = symtab_fmt_name_lookup(
+			    breakpoints[i].address);
 
 #ifdef __32_BITS__
Index: kernel/arch/amd64/src/interrupt.c
===================================================================
--- kernel/arch/amd64/src/interrupt.c	(revision e2b762ec7955698a156a39c44cbaacd7211758b2)
+++ kernel/arch/amd64/src/interrupt.c	(revision 5eb90cbf3afe6afd7b4236a6cc328c7c634b9ff6)
@@ -52,8 +52,5 @@
 #include <interrupt.h>
 #include <ddi/irq.h>
-
-#ifdef CONFIG_SYMTAB
 #include <symtab.h>
-#endif
 
 /*
@@ -68,12 +65,6 @@
 {
 	char *symbol;
-/*	uint64_t *x = &istate->stack[0]; */
-
-#ifdef CONFIG_SYMTAB
-	if (!(symbol = get_symtab_entry(istate->rip)))
-		symbol = "";
-#else
-	symbol = "";
-#endif
+
+	symbol = symtab_fmt_name_lookup((istate->rip);
 
 	printf("-----EXCEPTION(%d) OCCURED----- ( %s )\n", n, __func__);