diff --git a/examples/d/calc.y b/examples/d/calc.y
index a82778c7..9c1b11f3 100644
--- a/examples/d/calc.y
+++ b/examples/d/calc.y
@@ -1,5 +1,5 @@
 %language "D"
-%name-prefix "Calc"
+
 %define api.parser.class {Calc}
 %define public
 
diff --git a/examples/java/Calc.y b/examples/java/Calc.y
index 4de97583..c84f4507 100644
--- a/examples/java/Calc.y
+++ b/examples/java/Calc.y
@@ -1,9 +1,19 @@
 %language "Java"
-%name-prefix "Calc"
+
 %define api.parser.class {Calc}
 %define public
 
-%define parse.error verbose %locations
+%define parse.error verbose
+%locations
+
+%code imports {
+  import java.io.IOException;
+  import java.io.InputStream;
+  import java.io.InputStreamReader;
+  import java.io.Reader;
+  import java.io.StreamTokenizer;
+}
+
 %code {
   public static void main (String args[]) throws IOException
   {
@@ -13,14 +23,6 @@
   }
 }
 
-%code imports {
-  import java.io.StreamTokenizer;
-  import java.io.InputStream;
-  import java.io.InputStreamReader;
-  import java.io.Reader;
-  import java.io.IOException;
-}
-
 /* Bison Declarations */
 %token <Integer> NUM "number"
 %type  <Integer> exp