diff --git a/docs/_includes/sidenav.html b/docs/_includes/sidenav.html
index 37bba259a865b2e96d108ce56f1c04e9b88355a9..5bdbc0dc682244a624afb34794eab2e4550db331 100644
--- a/docs/_includes/sidenav.html
+++ b/docs/_includes/sidenav.html
@@ -40,7 +40,7 @@ under the License.
   <li><div class="sidenav-item"><a href="{{ site.baseurl }}/iterations.html">Iterations</a></div></li>
   <li><div class="sidenav-item"><a href="{{ site.baseurl }}/spargel_guide.html">Spargel Graph API</a></div></li>
   <li><div class="sidenav-item"><a href="{{ site.baseurl }}/gelly_guide.html">Gelly Graph API</a></div></li>
-  <li><div class="sidenav-item"><a href="{{ site.baseurl }}/linq.html">Language-Integrated Queries</a></div></li>
+  <li><div class="sidenav-item"><a href="{{ site.baseurl }}/table.html">Table API - Relational Queries</a></div></li>
   <li><div class="sidenav-item"><a href="{{ site.baseurl }}/hadoop_compatibility.html">Hadoop Compatibility</a></div></li>
     <li><div class="sidenav-item-bottom"><a href="{{ site.baseurl }}/flink_on_tez_guide.html">Running Flink on Tez</a></div></li>
 
diff --git a/docs/linq.md b/docs/table.md
similarity index 92%
rename from docs/linq.md
rename to docs/table.md
index e17fc0d73588f3c276a43fc17f44e9e16153ef92..55f989be03b5b498e92d7b35378b473ed6c14612 100644
--- a/docs/linq.md
+++ b/docs/table.md
@@ -1,5 +1,5 @@
 ---
-title: "Language-Integrated Queries (Table API)"
+title: "Table API - Relational Queries"
 ---
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,7 @@ under the License.
 * This will be replaced by the TOC
 {:toc}
 
-**Language-Integrated Queries are an experimental feature**
+**The Table API an experimental feature**
 
 Flink provides an API that allows specifying operations using SQL-like expressions. Instead of 
 manipulating `DataSet` or `DataStream` you work with `Table` on which relational operations can
@@ -67,7 +67,7 @@ This is another example that shows how you
 can join to Tables:
 
 {% highlight scala %}
-case class MyResult(a: String, b: Int)
+case class MyResult(a: String, d: Int)
 
 val input1 = env.fromElements(...).toTable('a, 'b)
 val input2 = env.fromElements(...).toTable('c, 'd)
@@ -87,6 +87,21 @@ When using Java, Tables can be converted to and from DataSet and DataStream usin
 This example is equivalent to the above Scala Example:
 
 {% highlight java %}
+
+public class WC {
+
+  public WC(String word, int count) {
+    this.word = word; this.count = count;
+  }
+
+  public WC() {} // empty constructor to satisfy POJO requirements
+
+  public String word;
+  public int count;
+}
+
+...
+
 ExecutionEnvironment env = ExecutionEnvironment.createCollectionsEnvironment();
 TableEnvironment tableEnv = new TableEnvironment();