Index: trunk/doc/design/07_devmap.html
===================================================================
--- trunk/doc/design/07_devmap.html	(revision 724)
+++ trunk/doc/design/07_devmap.html	(revision 725)
@@ -22,8 +22,8 @@
 <p><img src="07_diag.svg">
 
 <p>{des7:2}
-The default implementation of the device mapper is a plugin called <i>devmap</i>.
-<code>Devmap</code> has three major features: slotting name translation
+The default implementation of the device mapper is a plugin called <i>std_devmap</i>.
+<code>std_devmap</code> has three major features: slotting name translation
 (red), device mapping (green) and port mapping (blue). The slotting translation
 makes sure the resulting abstract component has the right amount of ports;
 the device mapper loads the device-specific port mapping and other
@@ -31,7 +31,7 @@
 a table (the table typically set up by the device mapper).
 
 <p>{des7:3}
-The device mapper is an optional mechanism implemented in a plugin. The
+The standard device mapper is an optional mechanism implemented in a plugin. The
 user may choose to use it or to:
 <ul>
 	<li> not include the device mapper in the view at all
@@ -51,7 +51,7 @@
 <h2> 7.1. Slot prefixing </h2>
 
 <p>{des7:5}
-<code>Devmap</code> registers for the <a href="02_data.html#des2:77">terminal-name-to-port-name
+<code>std_devmap</code> registers for the <a href="02_data.html#des2:77">terminal-name-to-port-name
 translation</a>.
 
 <p>{des7:6}