--- a/website/src/manual.html.luan	Fri May 22 16:08:23 2015 -0600
+++ b/website/src/manual.html.luan	Sun May 24 12:05:00 2015 -0600
@@ -129,7 +129,7 @@
 <p>
 There are eight basic types in Luan:
 <i>nil</i>, <i>boolean</i>, <i>number</i>,
-<i>string</i>, <i>binary</i>, <i>function</i>, <i>userdata</i>,
+<i>string</i>, <i>binary</i>, <i>function</i>, <i>java</i>,
 and <i>table</i>.
 <i>Nil</i> is the type of the value <b>nil</b>,
 whose main property is to be different from any other value;
@@ -153,12 +153,12 @@
 
 
 <p>
-The type <i>userdata</i> is provided to allow arbitrary Java objects to
+The type <i>java</i> is provided to allow arbitrary Java objects to
 be stored in Luan variables.
-A userdata value is a Java object that isn't one of the standard Luan types.
-Userdata has no predefined operations in Luan,
+A <i>java</i> value is a Java object that isn't one of the standard Luan types.
+Java values have no predefined operations in Luan,
 except assignment and identity test.
-Userdata is useful then Java access is enabled in Luan
+Java values are useful when Java access is enabled in Luan
 
 
 
@@ -1267,7 +1267,7 @@
 by using the "eq" metamethod (see <a href="#meta">Metatables and Metamethods</a>).
 
 <p>
-Userdata are Java objects.  They are compared for equality with the Java <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html#equals(java.lang.Object)"><tt>equals</tt></a> method.
+Java values are compared for equality with the Java <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html#equals(java.lang.Object)"><tt>equals</tt></a> method.
 
 <p>
 Equality comparisons do not convert strings to numbers
@@ -2260,7 +2260,7 @@
 "<tt>boolean</tt>",
 "<tt>table</tt>",
 "<tt>function</tt>",
-and "<tt>userdata</tt>".
+and "<tt>java</tt>".
 
 
 <h4 <%=heading_options%> ><a name="Luan.values"><tt>Luan.values (&middot;&middot;&middot;)</tt></a></h4>