Index: kernel/arch/mips32/src/debugger.c
===================================================================
--- kernel/arch/mips32/src/debugger.c	(revision 656b789da2d7f7f9eb0de7c8dc55ec4fba5a0f9d)
+++ kernel/arch/mips32/src/debugger.c	(revision 692b30dc358f0a2b38f0772b48b4c4c82c8e7999)
@@ -43,8 +43,5 @@
 #include <arch/cp0.h>
 #include <func.h>
-
-#ifdef CONFIG_SYMTAB
 #include <symtab.h>
-#endif
 
 bpinfo_t breakpoints[BKPOINTS_MAX];
@@ -263,10 +260,7 @@
 	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);
+
 			printf("%-2u %-5d %#10zx %-6s %-7s %-8s %s\n", i,
 			    breakpoints[i].counter, breakpoints[i].address,
@@ -357,10 +351,6 @@
 		
 		if (!(cur->flags & BKPOINT_FUNCCALL)) {
-#ifdef CONFIG_SYMTAB
 			printf("***Breakpoint %d: %p in %s.\n", i, fireaddr,
-			    get_symtab_entry(istate->epc));
-#else
-			printf("***Breakpoint %d: %p.\n", i, fireaddr);
-#endif
+			    symtab_fmt_name_lookup(istate->epc));
 		}
 
@@ -376,10 +366,7 @@
 		cur->flags |= BKPOINT_INPROG;
 	} else {
-#ifdef CONFIG_SYMTAB
-		printf("***Breakpoint %p in %s.\n", fireaddr,
-		       get_symtab_entry(fireaddr));
-#else
-		printf("***Breakpoint %p.\n", fireaddr);	
-#endif
+		printf("***Breakpoint %d: %p in %s.\n", i, fireaddr,
+		    symtab_fmt_name_lookup(fireaddr));
+
 		/* Move on to next instruction */
 		istate->epc += 4;
Index: kernel/arch/mips32/src/exception.c
===================================================================
--- kernel/arch/mips32/src/exception.c	(revision 656b789da2d7f7f9eb0de7c8dc55ec4fba5a0f9d)
+++ kernel/arch/mips32/src/exception.c	(revision 692b30dc358f0a2b38f0772b48b4c4c82c8e7999)
@@ -47,8 +47,5 @@
 #include <ddi/irq.h>
 #include <arch/debugger.h>
-
-#ifdef CONFIG_SYMTAB
 #include <symtab.h>
-#endif
 
 static char * exctable[] = {
@@ -77,17 +74,11 @@
 static void print_regdump(istate_t *istate)
 {
-	char *pcsymbol = "";
-	char *rasymbol = "";
+	char *pcsymbol, *rasymbol;
 
-#ifdef CONFIG_SYMTAB
-	char *s = get_symtab_entry(istate->epc);
-	if (s)
-		pcsymbol = s;
-	s = get_symtab_entry(istate->ra);
-	if (s)
-		rasymbol = s;
-#endif
-	
-	printf("PC: %#x(%s) RA: %#x(%s), SP(%p)\n", istate->epc, pcsymbol, istate->ra, rasymbol, istate->sp);
+	pcsymbol = symtab_fmt_name_lookup(istate->epc);
+	rasymbol = symtab_fmt_name_lookup(istate->ra);
+
+	printf("PC: %#x(%s) RA: %#x(%s), SP(%p)\n", istate->epc, pcsymbol,
+	    istate->ra, rasymbol, istate->sp);
 }
 
Index: kernel/arch/mips32/src/mm/tlb.c
===================================================================
--- kernel/arch/mips32/src/mm/tlb.c	(revision 656b789da2d7f7f9eb0de7c8dc55ec4fba5a0f9d)
+++ kernel/arch/mips32/src/mm/tlb.c	(revision 692b30dc358f0a2b38f0772b48b4c4c82c8e7999)
@@ -46,8 +46,5 @@
 #include <align.h>
 #include <interrupt.h>
-
-#ifdef CONFIG_SYMTAB
 #include <symtab.h>
-#endif
 
 static void tlb_refill_fail(istate_t *);
@@ -324,19 +321,12 @@
 void tlb_refill_fail(istate_t *istate)
 {
-	char *symbol = "";
-	char *sym2 = "";
-
-#ifdef CONFIG_SYMTAB
-	char *s = get_symtab_entry(istate->epc);
-	if (s)
-		symbol = s;
-	s = get_symtab_entry(istate->ra);
-	if (s)
-		sym2 = s;
-#endif
-
+	char *symbol, *sym2;
+
+	symbol = symtab_fmt_name_lookup(istate->epc);
+	sym2 = symtab_fmt_name_lookup(istate->ra);
+	
 	fault_if_from_uspace(istate, "TLB Refill Exception on %p.",
 	    cp0_badvaddr_read());
-	panic("%x: TLB Refill Exception at %x(%s<-%s).", cp0_badvaddr_read(),
+	panic("%x: TLB Refill Exception at %x (%s<-%s).", cp0_badvaddr_read(),
 	    istate->epc, symbol, sym2);
 }
@@ -345,15 +335,11 @@
 void tlb_invalid_fail(istate_t *istate)
 {
-	char *symbol = "";
-
-#ifdef CONFIG_SYMTAB
-	char *s = get_symtab_entry(istate->epc);
-	if (s)
-		symbol = s;
-#endif
+	char *symbol;
+
+	symbol = symtab_fmt_name_lookup(istate->epc);
 
 	fault_if_from_uspace(istate, "TLB Invalid Exception on %p.",
 	    cp0_badvaddr_read());
-	panic("%x: TLB Invalid Exception at %x(%s).", cp0_badvaddr_read(),
+	panic("%x: TLB Invalid Exception at %x (%s).", cp0_badvaddr_read(),
 	    istate->epc, symbol);
 }
@@ -361,15 +347,11 @@
 void tlb_modified_fail(istate_t *istate)
 {
-	char *symbol = "";
-
-#ifdef CONFIG_SYMTAB
-	char *s = get_symtab_entry(istate->epc);
-	if (s)
-		symbol = s;
-#endif
+	char *symbol;
+
+	symbol = symtab_fmt_name_lookup(istate->epc);
 
 	fault_if_from_uspace(istate, "TLB Modified Exception on %p.",
 	    cp0_badvaddr_read());
-	panic("%x: TLB Modified Exception at %x(%s).", cp0_badvaddr_read(),
+	panic("%x: TLB Modified Exception at %x (%s).", cp0_badvaddr_read(),
 	    istate->epc, symbol);
 }