diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog
index d211b101..726ef0dc 100644
--- a/urjtag/ChangeLog
+++ b/urjtag/ChangeLog
@@ -47,6 +47,10 @@
   * src/bus/generic_bus.c, src/bus/generic_bus.h (urj_bus_generic_attach_sig):
     Constify signal id name.
 
+  * data/analog/bf518/bf518, data/analog/bf548/bf548: Change ABE signal names
+    to match the style of all other Blackfin parts.
+  * src/bus/bf518f_ezbrd.c (bf518f_ezbrd_bus_new): Update signal names.
+
 2010-08-30  Mike Frysinger  <vapier@gentoo.org>
 
   * configure.ac: Clean up libusb detection to prefer 1.0 over 0.1, and accept
diff --git a/urjtag/data/analog/bf518/bf518 b/urjtag/data/analog/bf518/bf518
index ab750587..26f6cdcf 100644
--- a/urjtag/data/analog/bf518/bf518
+++ b/urjtag/data/analog/bf518/bf518
@@ -83,8 +83,8 @@ signal ADDR8
 signal ADDR9
 signal ARE_n
 signal SCAS_n
-signal ABE_n0
-signal ABE_n1
+signal ABE_B0
+signal ABE_B1
 signal SRAS_n
 signal SCKE
 signal ADDR10
@@ -385,8 +385,8 @@ bit 18 O 1 SRAS_n 28 0 Z
 bit 17 O 1 SCAS_n 28 0 Z
 bit 16 O 1 SWE_n 28 0 Z
 bit 15 O 1 SA10 28 0 Z
-bit 14 O 1 ABE_n0 7 0 Z
-bit 13 O 1 ABE_n1 7 0 Z
+bit 14 O 1 ABE_B0 7 0 Z
+bit 13 O 1 ABE_B1 7 0 Z
 bit 12 O 1 ADDR1 7 0 Z
 bit 11 O 1 ADDR2 7 0 Z
 bit 10 O 1 ADDR3 7 0 Z
diff --git a/urjtag/data/analog/bf548/bf548 b/urjtag/data/analog/bf548/bf548
index c7eead49..91b528b0 100644
--- a/urjtag/data/analog/bf548/bf548
+++ b/urjtag/data/analog/bf548/bf548
@@ -152,8 +152,8 @@ signal PJ11
 signal PJ12
 signal PJ13
 signal ATAPI_PDIAG
-signal ABE0B
-signal ABE1B
+signal ABE_B0
+signal ABE_B1
 signal CLKOUT
 signal DQ0
 signal DQ1
@@ -815,11 +815,11 @@ bit 268 C 0 *
 bit 267 O 1 DATA15 268 0 Z
 bit 266 I 1 DATA15
 bit 265 C 0 *
-bit 264 O 1 ABE1B 265 0 Z
-bit 263 I 1 ABE1B
+bit 264 O 1 ABE_B1 265 0 Z
+bit 263 I 1 ABE_B1
 bit 262 C 0 *
-bit 261 O 1 ABE0B 262 0 Z
-bit 260 I 1 ABE0B
+bit 261 O 1 ABE_B0 262 0 Z
+bit 260 I 1 ABE_B0
 bit 259 O 1 CK1
 bit 258 O 1 CK1_B
 bit 257 O 1 CK2
diff --git a/urjtag/src/bus/bf518f_ezbrd.c b/urjtag/src/bus/bf518f_ezbrd.c
index 370fa1a6..a9450a8c 100644
--- a/urjtag/src/bus/bf518f_ezbrd.c
+++ b/urjtag/src/bus/bf518f_ezbrd.c
@@ -102,9 +102,9 @@ bf518f_ezbrd_bus_new (urj_chain_t *chain, const urj_bus_driver_t *driver,
 
     failed |= urj_bus_generic_attach_sig (part, &(ARE), "ARE_n");
 
-    failed |= urj_bus_generic_attach_sig (part, &(ABE[0]), "ABE_n0");
+    failed |= urj_bus_generic_attach_sig (part, &(ABE[0]), "ABE_B0");
 
-    failed |= urj_bus_generic_attach_sig (part, &(ABE[1]), "ABE_n1");
+    failed |= urj_bus_generic_attach_sig (part, &(ABE[1]), "ABE_B1");
 
     failed |= urj_bus_generic_attach_sig (part, &(SRAS), "SRAS_n");