Use ElementType consistently.

Fixes #173.

R=r, rsc, r1
https://golang.org/cl/154156
diff --git a/doc/go_spec.html b/doc/go_spec.html
index c533f0a..cba73ce 100644
--- a/doc/go_spec.html
+++ b/doc/go_spec.html
@@ -966,7 +966,7 @@
 
 <p>
 A map is an unordered group of elements of one type, called the
-value type, indexed by a set of unique <i>keys</i> of another type,
+element type, indexed by a set of unique <i>keys</i> of another type,
 called the key type.
 A map value may be <code>nil</code>.
 
@@ -975,7 +975,6 @@
 <pre class="ebnf">
 MapType     = "map" "[" KeyType "]" ElementType .
 KeyType     = Type .
-ValueType   = Type .
 </pre>
 
 <p>
@@ -1030,9 +1029,9 @@
 
 <pre class="ebnf">
 ChannelType   = Channel | SendChannel | RecvChannel .
-Channel       = "chan" ValueType .
-SendChannel   = "chan" "&lt;-" ValueType .
-RecvChannel   = "&lt;-" "chan" ValueType .
+Channel       = "chan" ElementType .
+SendChannel   = "chan" "&lt;-" ElementType .
+RecvChannel   = "&lt;-" "chan" ElementType .
 </pre>
 
 <p>