Index: design/06_hierarchy.html
===================================================================
--- design/06_hierarchy.html	(revision 10029)
+++ design/06_hierarchy.html	(revision 10030)
@@ -11,7 +11,7 @@
 <p>{des6:1}
 In that flat abstract model, there is only one namespace for components
 and one namespace for networks. The component namespace consists of
-component names (and uids), and the network namespace consists of network
+component names (and uuids), and the network namespace consists of network
 names (and uids).
 
 <p>{des6:2}
@@ -154,7 +154,7 @@
 
 <table border=1 cellspacing=0>
 	<tr><th>attribute key                  <th> value syntax <th> meaning
-	<tr><td><code>cschem/child/uid</code>  <td> uid          <td> first the project then the hlibrary is searched for a sheet with matching uid
+	<tr><td><code>cschem/child/uuid</code> <td> uuid         <td> first the project then the hlibrary is searched for a sheet with matching uuid
 	<tr><td><code>cschem/child/name</code> <td> string       <td> first the project then the the hlibrary is searched for a sheet with matching file name; if contains any slash character, it's a path within the hlibrary relative to the current sheet's path within the hlibrary
 	<tr><td><code>cschem/child/path</code> <td> string       <td> path relative to the directory the current sheet is last saved in
 </table>
@@ -236,7 +236,7 @@
 "<code>refdes/refdes/refdes/netname</code>" where <code>refdes</code> is the hierarchy down-reference
 symbol's refdes attribute and <code>netname</code> is the netname attribute of the network
 with the scope prefix removed. If the user doesn't chose a plugin, the default
-behavior is to use the network's uid as abstract netname. Normally the
+behavior is to use the network's uuid as abstract netname. Normally the
 renaming does not affect global nets, only subtree-local and sheet-local nets.
 
 <p>{des6:28} <a id="des6:28">