diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog
index 9ac82afb..e828939b 100644
--- a/urjtag/ChangeLog
+++ b/urjtag/ChangeLog
@@ -35,6 +35,10 @@
     Walle.  This covers the Spartan-3, Spartan-6, Virtex-4, System ACE,
     Platform flash, and XC9500XL families.
 
+  * src/bus/bf518f_ezbrd.c, src/bus/bf548_ezkit.c, data/analog/bf518/bf518,
+    data/analog/bf548/bf548: Change AMS signal names to match the style of all
+    other Blackfin parts.
+
 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 d11006cf..91bc8ade 100644
--- a/urjtag/data/analog/bf518/bf518
+++ b/urjtag/data/analog/bf518/bf518
@@ -98,8 +98,8 @@ signal ADDR16
 signal ADDR17
 signal ADDR18
 signal ADDR19
-signal AMS_n0
-signal AMS_n1
+signal AMS_B0
+signal AMS_B1
 signal RTXO
 signal ADDR1
 signal ADDR2
@@ -371,11 +371,11 @@ bit 30 I 1 NMI
 bit 29 I 1 RESET
 bit 28 C 0 *
 bit 27 O 1 CLKOUT 28 0 Z
-bit 26 O 1 AMS_n0 24 0 Z
+bit 26 O 1 AMS_B0 24 0 Z
 bit 25 O 1 AWE_n 24 0 Z
 bit 24 C 0 *
 bit 23 O 1 ARE_n 24 0 Z
-bit 22 O 1 AMS_n1 24 0 Z
+bit 22 O 1 AMS_B1 24 0 Z
 bit 21 O 1 SCKE 28 0 Z
 bit 20 O 1 SMS_n 28 0 Z
 bit 19 I 1 TEST
diff --git a/urjtag/data/analog/bf548/bf548 b/urjtag/data/analog/bf548/bf548
index 5f8fd10a..9f930839 100644
--- a/urjtag/data/analog/bf548/bf548
+++ b/urjtag/data/analog/bf548/bf548
@@ -221,10 +221,10 @@ signal AREB
 signal RESETB
 signal NMIB
 signal AOEB
-signal AMS3B
-signal AMS2B
-signal AMS1B
-signal AMS0B
+signal AMS_B3
+signal AMS_B2
+signal AMS_B1
+signal AMS_B0
 signal ADDR3
 signal ADDR2
 signal ADDR1
@@ -723,17 +723,17 @@ bit 339 C 0 *
 bit 338 O 1 PI15 339 0 Z
 bit 337 I 1 PI15
 bit 336 C 0 *
-bit 335 O 1 AMS0B 336 0 Z
-bit 334 I 1 AMS0B
+bit 335 O 1 AMS_B0 336 0 Z
+bit 334 I 1 AMS_B0
 bit 333 C 0 *
-bit 332 O 1 AMS1B 333 0 Z
-bit 331 I 1 AMS1B
+bit 332 O 1 AMS_B1 333 0 Z
+bit 331 I 1 AMS_B1
 bit 330 C 0 *
-bit 329 O 1 AMS2B 330 0 Z
-bit 328 I 1 AMS2B
+bit 329 O 1 AMS_B2 330 0 Z
+bit 328 I 1 AMS_B2
 bit 327 C 0 *
-bit 326 O 1 AMS3B 327 0 Z
-bit 325 I 1 AMS3B
+bit 326 O 1 AMS_B3 327 0 Z
+bit 325 I 1 AMS_B3
 bit 324 C 0 *
 bit 323 O 1 AOEB 324 0 Z
 bit 322 I 1 AOEB
diff --git a/urjtag/src/bus/bf518f_ezbrd.c b/urjtag/src/bus/bf518f_ezbrd.c
index 6cb027bd..370fa1a6 100644
--- a/urjtag/src/bus/bf518f_ezbrd.c
+++ b/urjtag/src/bus/bf518f_ezbrd.c
@@ -82,7 +82,7 @@ bf518f_ezbrd_bus_new (urj_chain_t *chain, const urj_bus_driver_t *driver,
 
     for (i = 0; i < 2; i++)
     {
-        sprintf (buff, "AMS_n%d", i);
+        sprintf (buff, "AMS_B%d", i);
         failed |= urj_bus_generic_attach_sig (part, &(AMS[i]), buff);
     }
 
diff --git a/urjtag/src/bus/bf548_ezkit.c b/urjtag/src/bus/bf548_ezkit.c
index b8daaf05..044f0344 100644
--- a/urjtag/src/bus/bf548_ezkit.c
+++ b/urjtag/src/bus/bf548_ezkit.c
@@ -78,7 +78,7 @@ bf548_ezkit_bus_new (urj_chain_t *chain, const urj_bus_driver_t *driver,
 
     for (i = 0; i < 4; i++)
     {
-        sprintf (buff, "AMS%dB", i);
+        sprintf (buff, "AMS_B%d", i);
         failed |= urj_bus_generic_attach_sig (part, &(AMS[i]), buff);
     }