diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html
index 06d17d486..a84608099 100644
--- a/Doc/Manual/Java.html
+++ b/Doc/Manual/Java.html
@@ -100,8 +100,8 @@
 <li><a href="#n67">Director-specific typemaps</a>
 <ul>
 <li><a href="#n68">%typemap(inv)</a>
-<li><a href="#n69">%typemap(directorin)</a>
-<li><a href="#n70">%typemap(directorout)</a>
+<li><a href="#n69">%typemap(javadirectorin)</a>
+<li><a href="#n70">%typemap(javadirectorout)</a>
 </ul>
 <li><a href="#n71">Director method recursion</a>
 </ul>
@@ -4160,8 +4160,8 @@ public class director_derived extends director_example
 <p>
 The Java directors feature requires the <a
 href="#java_directors_inv"><code>%typemap(inv)</code></a>, the <a
-href="#java_directors_din"><code>%typemap(directorin)</code></a> and the <a
-href="#java_directors_dout"><code>%typemap(directorout)</code></a> type maps in
+href="#java_directors_din"><code>%typemap(javadirectorin)</code></a> and the <a
+href="#java_directors_dout"><code>%typemap(javadirectorout)</code></a> type maps in
 order to work properly.
 </p>
 
@@ -4197,34 +4197,34 @@ order to work properly.
   Java will generate a "method not found" warning.
 </p>
 
-<a name="n69"></a><H4>15.9.2.2 %typemap(directorin)</H4>
+<a name="n69"></a><H4>15.9.2.2 %typemap(javadirectorin)</H4>
 
 
 <p>
   This typemap specifies argument conversion in the generated Java upcall code.
-  Normally, this typemap should be specified as: <pre>%typemap(directorin)
+  Normally, this typemap should be specified as: <pre>%typemap(javadirectorin)
   user_def_class_here "$jniinput"</pre> <code>$jniinput</code> is the variable
   name passed from JNI to the intermediate class method's upcall code. For the
   default typemaps provided by the Java module, nothing special is done. The
   default handling for pointers and references, such as the <code>SWIGTYPE
-  &amp;</code> directorin typemap, a temporary object is created to encapsulate
+  &amp;</code> javadirectorin typemap, a temporary object is created to encapsulate
   the corresponding C++ object.
 </p>
 
-<a name="n70"></a><H4>15.9.2.3 %typemap(directorout)</H4>
+<a name="n70"></a><H4>15.9.2.3 %typemap(javadirectorout)</H4>
 
 
 <p>
   This typemap specifies argument conversion from the generated Java
   upcall code. Normally, this typemap should be specified as:
   <br>
-  <pre>%typemap(directorout) user_def_class_here "$javacall"</pre>
+  <pre>%typemap(javadirectorout) user_def_class_here "$javacall"</pre>
   <br>
   $javacall is the SWIG-generated call to the derived class's
   method, which is about to be upcalled. For the default typemaps
   provided by the Java module, nothing special is done. The default
   handling for pointers and references, such as <code>SWIGTYPE &amp;</code>
-  directorout typemap, the pointer is extracted from the object returned
+  javadirectorout typemap, the pointer is extracted from the object returned
   by the derived class's method call and returned back to the C++ code.
 </p>
 
@@ -4446,4 +4446,4 @@ If your SWIG installation went well Unix users should be able to type <tt>make</
 For the benefit of Windows users, there are also Visual C++ project files in a couple of the <a href="Windows.html#examples">Windows Examples</a>.
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/Lib/java/arrays_java.i b/Lib/java/arrays_java.i
index 8fc303364..6e084aac7 100644
--- a/Lib/java/arrays_java.i
+++ b/Lib/java/arrays_java.i
@@ -182,34 +182,34 @@ JAVA_ARRAYS_IMPL(double, jdouble, Double, Double)     /* double[] */
 %typemap(jstype) float[ANY]              "float[]"
 %typemap(jstype) double[ANY]             "double[]"
 
-%typemap(directorin) bool[ANY],
-                     signed char[ANY],
-                     unsigned char[ANY],
-                     short[ANY],
-                     unsigned short[ANY],
-                     int[ANY],
-                     unsigned int[ANY],
-                     long[ANY],
-                     unsigned long[ANY],
-                     long long[ANY],
-                     /* unsigned long long[ANY], */
-                     float[ANY],
-                     double[ANY]
+%typemap(javadirectorin) bool[ANY],
+                         signed char[ANY],
+                         unsigned char[ANY],
+                         short[ANY],
+                         unsigned short[ANY],
+                         int[ANY],
+                         unsigned int[ANY],
+                         long[ANY],
+                         unsigned long[ANY],
+                         long long[ANY],
+                         /* unsigned long long[ANY], */
+                         float[ANY],
+                         double[ANY]
   "$jniinput"
 
-%typemap(directorout) bool[ANY],
-                      signed char[ANY],
-                      unsigned char[ANY],
-                      short[ANY],
-                      unsigned short[ANY],
-                      int[ANY],
-                      unsigned int[ANY],
-                      long[ANY],
-                      unsigned long[ANY],
-                      long long[ANY],
-                      /* unsigned long long[ANY], */
-                      float[ANY],
-                      double[ANY]
+%typemap(javadirectorout) bool[ANY],
+                          signed char[ANY],
+                          unsigned char[ANY],
+                          short[ANY],
+                          unsigned short[ANY],
+                          int[ANY],
+                          unsigned int[ANY],
+                          long[ANY],
+                          unsigned long[ANY],
+                          long long[ANY],
+                          /* unsigned long long[ANY], */
+                          float[ANY],
+                          double[ANY]
   "$javacall"
 
 /* Arrays of primitive types use the following macro. The array typemaps use support functions. */
diff --git a/Lib/java/director.swg b/Lib/java/director.swg
index dd20700d7..d4b9bbe1b 100644
--- a/Lib/java/director.swg
+++ b/Lib/java/director.swg
@@ -21,7 +21,7 @@ private:
 
 protected:
   /* pointer to the wrapped java object */
-  jobject	__self;
+  jobject __self;
   /* Acquire Java VM environment from Java VM */
   JNIEnv *__acquire_jenv() const {
     JNIEnv *env;
diff --git a/Lib/java/java.swg b/Lib/java/java.swg
index 03407d9fc..481ddd405 100644
--- a/Lib/java/java.swg
+++ b/Lib/java/java.swg
@@ -161,8 +161,8 @@
 %typemap(in) bool
 %{ $1 = $input ? true : false; %}
 
-%typemap(directorin) bool "$jniinput"
-%typemap(directorout) bool "$javacall"
+%typemap(javadirectorin) bool "$jniinput"
+%typemap(javadirectorout) bool "$javacall"
 
 %typemap(in) char, 
              signed char, 
@@ -194,7 +194,7 @@
 %typemap(inv, parse="D") double           "$input = (jdouble) $1;"
 %typemap(inv, parse="I") enum SWIGTYPE    "$input = (jint) $1;"
 
-%typemap(directorin) char, 
+%typemap(javadirectorin) char, 
              signed char, 
              unsigned char, 
              short, 
@@ -209,7 +209,7 @@
              enum SWIGTYPE
   "$jniinput"
 
-%typemap(directorout) char, 
+%typemap(javadirectorout) char, 
              signed char, 
              unsigned char, 
              short, 
@@ -310,8 +310,8 @@
   $input = bigint;
 }
 
-%typemap(directorin) unsigned long long "$jniinput"
-%typemap(directorout) unsigned long long "$javacall"
+%typemap(javadirectorin) unsigned long long "$jniinput"
+%typemap(javadirectorout) unsigned long long "$javacall"
 
 /* char * - treat as String */
 %typemap(in) char * { 
@@ -331,12 +331,12 @@
 }
 %typemap(freearg) char * { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, $1); }
 %typemap(out) char * { if($1) $result = JCALL1(NewStringUTF, jenv, $1); }
-%typemap(directorin) char * "$jniinput"
-%typemap(directorout) char * "$javacall"
+%typemap(javadirectorin) char * "$jniinput"
+%typemap(javadirectorout) char * "$javacall"
 
 %typemap(out) void ""
-%typemap(directorin) void "$jniinput"
-%typemap(directorout) void "$javacall"
+%typemap(javadirectorin) void "$jniinput"
+%typemap(javadirectorout) void "$javacall"
 %typemap(inv, parse="V") void ""
 
 /* primitive types by reference */
@@ -344,8 +344,8 @@
 %{ temp = $input ? true : false; 
    $1 = &temp; %}
 
-%typemap(directorin) const bool & "$jniinput"
-%typemap(directorout) const bool & "$javacall"
+%typemap(javadirectorin) const bool & "$jniinput"
+%typemap(javadirectorout) const bool & "$javacall"
 
 %typemap(in) const char & (char temp), 
              const signed char & (signed char temp), 
@@ -376,7 +376,7 @@
 %typemap(inv, parse="F") const float &          "$input = (jfloat)$1_name;"
 %typemap(inv, parse="D") const double &         "$input = (jdouble)$1_name;"
 
-%typemap(directorin) const char & (char temp), 
+%typemap(javadirectorin) const char & (char temp), 
              const signed char & (signed char temp), 
              const unsigned char & (unsigned char temp), 
              const short & (short temp), 
@@ -390,7 +390,7 @@
              const double & (double temp)
   "$jniinput"
 
-%typemap(directorout) const char & (char temp), 
+%typemap(javadirectorout) const char & (char temp), 
              const signed char & (signed char temp), 
              const unsigned char & (unsigned char temp), 
              const short & (short temp), 
@@ -471,8 +471,8 @@
   $result = bigint;
 }
 
-%typemap(directorin) const unsigned long long & "$jniinput"
-%typemap(directorout) const unsigned long long & "$javacall"
+%typemap(javadirectorin) const unsigned long long & "$jniinput"
+%typemap(javadirectorout) const unsigned long long & "$javacall"
 
 /* Default handling. Object passed by value. Convert to a pointer */
 %typemap(in) SWIGTYPE ($&1_type argp)
@@ -495,8 +495,8 @@
 #endif
 
 %typemap(inv,parse="L$packagepath/$javaclassname;") SWIGTYPE "*(($&1_type)&$input) = &$1;"
-%typemap(directorin) SWIGTYPE "new $javaclassname($jniinput, false)"
-%typemap(directorout) SWIGTYPE "$javaclassname.getCPtr($javacall)"
+%typemap(javadirectorin) SWIGTYPE "new $javaclassname($jniinput, false)"
+%typemap(javadirectorout) SWIGTYPE "$javaclassname.getCPtr($javacall)"
 
 /* Generic pointers and references */
 %typemap(in) SWIGTYPE *, SWIGTYPE (CLASS::*) %{ $1 = *($&1_ltype)&$input; %}
@@ -516,8 +516,8 @@
 %typemap(inv,parse="L$packagepath/$javaclassname;") SWIGTYPE &
 %{ *($&1_ltype)&$input = ($1_ltype) &$1; %}
 
-%typemap(directorin) SWIGTYPE *, SWIGTYPE (CLASS::*), SWIGTYPE &, const SWIGTYPE & "new $javaclassname($jniinput, false)"
-%typemap(directorout) SWIGTYPE *, SWIGTYPE (CLASS::*), SWIGTYPE &, const SWIGTYPE & "$javaclassname.getCPtr($javacall)"
+%typemap(javadirectorin) SWIGTYPE *, SWIGTYPE (CLASS::*), SWIGTYPE &, const SWIGTYPE & "new $javaclassname($jniinput, false)"
+%typemap(javadirectorout) SWIGTYPE *, SWIGTYPE (CLASS::*), SWIGTYPE &, const SWIGTYPE & "$javaclassname.getCPtr($javacall)"
 
 /* Default array handling */
 %typemap(in) SWIGTYPE [] %{ $1 = *($&1_ltype)&$input; %}
@@ -537,8 +537,8 @@
 %typemap(argout) char[ANY] ""
 %typemap(freearg) char[ANY] { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, $1); }
 %typemap(out) char[ANY] { if($1) $result = JCALL1(NewStringUTF, jenv, $1); }
-%typemap(directorin) char[ANY] "$jniinput"
-%typemap(directorout) char[ANY] "$javacall"
+%typemap(javadirectorin) char[ANY] "$jniinput"
+%typemap(javadirectorout) char[ANY] "$javacall"
 
 /* JNI types */
 %typemap(in) jboolean,
@@ -603,7 +603,7 @@
 %typemap(inv,parse="[D")  jdoubleArray  "$input = $1;"
 %typemap(inv,parse="[Ljava/lang/Object;")  jobjectArray  "$input = $1;"
 
-%typemap(directorin) jboolean,
+%typemap(javadirectorin) jboolean,
               jchar,
               jbyte,
               jshort,
@@ -624,7 +624,7 @@
               jobjectArray
   "$jniinput"
 
-%typemap(directorout) jboolean,
+%typemap(javadirectorout) jboolean,
               jchar,
               jbyte,
               jshort,
diff --git a/Lib/java/std_string.i b/Lib/java/std_string.i
index 9fe839fd0..77ed86a19 100644
--- a/Lib/java/std_string.i
+++ b/Lib/java/std_string.i
@@ -28,8 +28,8 @@ class string;
 %typemap(jni) string "jstring"
 %typemap(jtype) string "String"
 %typemap(jstype) string "String"
-%typemap(directorin) string "$jniinput"
-%typemap(directorout) string "$javacall"
+%typemap(javadirectorin) string "$jniinput"
+%typemap(javadirectorout) string "$javacall"
 
 %typemap(in) string 
 %{if($input) {
@@ -61,8 +61,8 @@ class string;
 %typemap(jni) const string & "jstring"
 %typemap(jtype) const string & "String"
 %typemap(jstype) const string & "String"
-%typemap(directorin) const string & "$jniinput"
-%typemap(directorout) const string & "$javacall"
+%typemap(javadirectorin) const string & "$jniinput"
+%typemap(javadirectorout) const string & "$javacall"
 
 %typemap(in) const string & 
 %{$1 = NULL;
@@ -119,8 +119,8 @@ class wstring;
 %typemap(jni) wstring "jstring"
 %typemap(jtype) wstring "String"
 %typemap(jstype) wstring "String"
-%typemap(directorin) wstring "$jniinput"
-%typemap(directorout) wstring "$javacall"
+%typemap(javadirectorin) wstring "$jniinput"
+%typemap(javadirectorout) wstring "$javacall"
 
 %typemap(in) wstring
 %{if($input) {
@@ -170,8 +170,8 @@ class wstring;
 %typemap(jni) const wstring & "jstring"
 %typemap(jtype) const wstring & "String"
 %typemap(jstype) const wstring & "String"
-%typemap(directorin) const wstring & "$jniinput"
-%typemap(directorout) const wstring & "$javacall"
+%typemap(javadirectorin) const wstring & "$jniinput"
+%typemap(javadirectorout) const wstring & "$javacall"
 
 %typemap(in) const wstring & 
 %{$1 = NULL;
diff --git a/Lib/java/typemaps.i b/Lib/java/typemaps.i
index 340f1facb..81bcf837f 100644
--- a/Lib/java/typemaps.i
+++ b/Lib/java/typemaps.i
@@ -63,15 +63,15 @@ In Java you could then use it like this:
 %typemap(jtype) CTYPE *INPUT "JTYPE"
 %typemap(jstype) CTYPE *INPUT "JTYPE"
 %typemap(javain) CTYPE *INPUT "$javainput"
-%typemap(directorin) CTYPE *INPUT "$jninput"
-%typemap(directorout) CTYPE *INPUT "$javacall"
+%typemap(javadirectorin) CTYPE *INPUT "$jniinput"
+%typemap(javadirectorout) CTYPE *INPUT "$javacall"
 
 %typemap(jni) CTYPE &INPUT "JNITYPE"
 %typemap(jtype) CTYPE &INPUT "JTYPE"
 %typemap(jstype) CTYPE &INPUT "JTYPE"
 %typemap(javain) CTYPE &INPUT "$javainput"
-%typemap(directorin) CTYPE *INPUT "$jniinput"
-%typemap(directorout) CTYPE *INPUT "$javacall"
+%typemap(javadirectorin) CTYPE *INPUT "$jniinput"
+%typemap(javadirectorout) CTYPE *INPUT "$javacall"
 
 %typemap(in) CTYPE *INPUT, CTYPE &INPUT
 %{ $1 = ($1_ltype)&$input; %}
@@ -197,15 +197,15 @@ value in the single element array. In Java you would use it like this:
 %typemap(jtype) CTYPE *OUTPUT "JTYPE[]"
 %typemap(jstype) CTYPE *OUTPUT "JTYPE[]"
 %typemap(javain) CTYPE *OUTPUT "$javainput"
-%typemap(directorin) CTYPE *OUTPUT "$jniinput"
-%typemap(directorout) CTYPE *OUTPUT "$javacall"
+%typemap(javadirectorin) CTYPE *OUTPUT "$jniinput"
+%typemap(javadirectorout) CTYPE *OUTPUT "$javacall"
 
 %typemap(jni) CTYPE &OUTPUT %{JNITYPE##Array%}
 %typemap(jtype) CTYPE &OUTPUT "JTYPE[]"
 %typemap(jstype) CTYPE &OUTPUT "JTYPE[]"
 %typemap(javain) CTYPE &OUTPUT "$javainput"
-%typemap(directorin) CTYPE &OUTPUT "$jniinput"
-%typemap(directorout) CTYPE &OUTPUT "$javacall"
+%typemap(javadirectorin) CTYPE &OUTPUT "$jniinput"
+%typemap(javadirectorout) CTYPE &OUTPUT "$javacall"
 
 %typemap(in) CTYPE *OUTPUT($*1_ltype temp), CTYPE &OUTPUT($*1_ltype temp)
 {
@@ -332,15 +332,15 @@ of the function return value. This difference is due to Java being a typed langu
 %typemap(jtype) CTYPE *INOUT "JTYPE[]"
 %typemap(jstype) CTYPE *INOUT "JTYPE[]"
 %typemap(javain) CTYPE *INOUT "$javainput"
-%typemap(directorin) CTYPE *INOUT "$jniinput"
-%typemap(directorout) CTYPE *INOUT "$javacall"
+%typemap(javadirectorin) CTYPE *INOUT "$jniinput"
+%typemap(javadirectorout) CTYPE *INOUT "$javacall"
 
 %typemap(jni) CTYPE &INOUT %{JNITYPE##Array%}
 %typemap(jtype) CTYPE &INOUT "JTYPE[]"
 %typemap(jstype) CTYPE &INOUT "JTYPE[]"
 %typemap(javain) CTYPE &INOUT "$javainput"
-%typemap(directorin) CTYPE &INOUT "$jniinput"
-%typemap(directorout) CTYPE &INOUT "$javacall"
+%typemap(javadirectorin) CTYPE &INOUT "$jniinput"
+%typemap(javadirectorout) CTYPE &INOUT "$javacall"
 
 %typemap(in) CTYPE *INOUT, CTYPE &INOUT {
   if (!$input) {
diff --git a/Lib/java/various.i b/Lib/java/various.i
index e35e31789..bb3a374eb 100644
--- a/Lib/java/various.i
+++ b/Lib/java/various.i
@@ -8,8 +8,8 @@
 %typemap(jni) char **STRING_IN "jobjectArray"
 %typemap(jtype) char **STRING_IN "String[]"
 %typemap(jstype) char **STRING_IN "String[]"
-%typemap(directorin) char **STRING_IN "$jniinput"
-%typemap(directorout) char **STRING_IN "$javacall"
+%typemap(javadirectorin) char **STRING_IN "$jniinput"
+%typemap(javadirectorout) char **STRING_IN "$javacall"
 %typemap(in) char **STRING_IN {
   int i;
   jsize sz = JCALL1(GetArrayLength, jenv, $input);
@@ -37,8 +37,8 @@
 %typemap(jni) char **STRING_OUT "jobjectArray"
 %typemap(jtype) char **STRING_OUT "String[]"
 %typemap(jstype) char **STRING_OUT "String[]"
-%typemap(directorin) char **STRING_OUT "$jniinput"
-%typemap(directorout) char **STRING_OUT "$javacall"
+%typemap(javadirectorin) char **STRING_OUT "$jniinput"
+%typemap(javadirectorout) char **STRING_OUT "$javacall"
 %typemap(in) char **STRING_OUT (char *s) 
 %{ $1 = &s; %}
 %typemap(argout) char **STRING_OUT {
@@ -54,8 +54,8 @@
 %typemap(jni) char **STRING_RET "jarray"
 %typemap(jtype) char **STRING_RET "String[]"
 %typemap(jstype) char **STRING_RET "String[]"
-%typemap(directorin) char **STRING_RET "$jniinput"
-%typemap(directorout) char **STRING_RET "$javacall"
+%typemap(javadirectorin) char **STRING_RET "$jniinput"
+%typemap(javadirectorout) char **STRING_RET "$javacall"
 %typemap(out) char **STRING_RET {
   if($1 != NULL) {
     char **p = $1;
@@ -82,8 +82,8 @@
 %typemap(jni) float *FLOAT_ARRAY_RETURN "jfloatArray"
 %typemap(jtype) float *FLOAT_ARRAY_RETURN "float[]"
 %typemap(jstype) float *FLOAT_ARRAY_RETURN "float[]"
-%typemap(directorin) float *FLOAT_ARRAY_RETURN "$jniinput"
-%typemap(directorout) float *FLOAT_ARRAY_RETURN "$javacall"
+%typemap(javadirectorin) float *FLOAT_ARRAY_RETURN "$jniinput"
+%typemap(javadirectorout) float *FLOAT_ARRAY_RETURN "$javacall"
 %typemap(out) float *FLOAT_ARRAY_RETURN {
   if($1) {
      float *fp = $1;
@@ -115,8 +115,8 @@
 %typemap(jni) char *BYTE "jbyteArray"
 %typemap(jtype) char *BYTE "byte[]"
 %typemap(jstype) char *BYTE "byte[]"
-%typemap(directorin) char *BYTE "$jniinput"
-%typemap(directorout) char *BYTE "$javacall"
+%typemap(javadirectorin) char *BYTE "$jniinput"
+%typemap(javadirectorout) char *BYTE "$javacall"
 %typemap(in) char *BYTE {
     $1 = (char *) JCALL2(GetByteArrayElements, jenv, $input, 0); 
 }
diff --git a/Source/Include/swigwarn.h b/Source/Include/swigwarn.h
index cd11c0426..6a6cd19fd 100644
--- a/Source/Include/swigwarn.h
+++ b/Source/Include/swigwarn.h
@@ -176,8 +176,8 @@
 #define WARN_JAVA_TYPEMAP_PTRCONSTMOD_UNDEF   816
 #define WARN_JAVA_TYPEMAP_JAVAOUT_UNDEF       817
 #define WARN_JAVA_TYPEMAP_JAVAIN_UNDEF        818
-#define WARN_JAVA_TYPEMAP_DIRECTORIN_UNDEF    819
-#define WARN_JAVA_TYPEMAP_DIRECTOROUT_UNDEF   820
+#define WARN_JAVA_TYPEMAP_JAVADIRECTORIN_UNDEF    819
+#define WARN_JAVA_TYPEMAP_JAVADIRECTOROUT_UNDEF   820
 #define WARN_JAVA_TYPEMAP_NODIRECTOR_CODE     821
 
 /* please leave 810-829 free for Java */
diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx
index a8cec497f..4c201d660 100644
--- a/Source/Modules/java.cxx
+++ b/Source/Modules/java.cxx
@@ -782,7 +782,7 @@ class JAVA : public Language {
     Swig_typemap_attach_parms("jtype", l, f);
     if (director_method) {
       Setattr(n, "tmap:inv", Swig_typemap_lookup_new("inv", n, "", 0));
-      Swig_typemap_attach_parms("directorin", l, 0);
+      Swig_typemap_attach_parms("javadirectorin", l, 0);
     }
 
     /* Get return types */
@@ -2691,7 +2691,7 @@ class JAVA : public Language {
     Swig_typemap_attach_parms("jni", l, w);
     Swig_typemap_attach_parms("jtype", l, w);
     Swig_typemap_attach_parms("inv", l, 0);
-    Swig_typemap_attach_parms("directorin", l, 0);
+    Swig_typemap_attach_parms("javadirectorin", l, 0);
 
     /* Get the JNI field descriptor for this return type */
 
@@ -2887,7 +2887,7 @@ class JAVA : public Language {
             if ((tm = Getattr(p, "tmap:jtype")) != NULL) {
               String         *din;
 
-              if ((din = Copy(Getattr(p, "tmap:directorin"))) != NULL) {
+              if ((din = Copy(Getattr(p, "tmap:javadirectorin"))) != NULL) {
                 String *darg = NewStringf("d%s", ln);
                 String *darg_init = NULL;
                 Node *canon_type = canonicalizeType(n, pt);
@@ -2915,8 +2915,8 @@ class JAVA : public Language {
                 if (darg_init)
                   Delete(darg_init);
               } else {
-                Swig_warning(WARN_JAVA_TYPEMAP_DIRECTORIN_UNDEF, input_file, line_number, 
-                             "No directorin typemap defined for %s\n", SwigType_str(pt,0));
+                Swig_warning(WARN_JAVA_TYPEMAP_JAVADIRECTORIN_UNDEF, input_file, line_number, 
+                             "No javadirectorin typemap defined for %s\n", SwigType_str(pt,0));
                 output_director = false;
               }
             } else {
@@ -2980,7 +2980,7 @@ class JAVA : public Language {
     if (!is_void) {
       Parm   *tp = NewParm(return_type, empty_str);
 
-      tm = Swig_typemap_lookup_new("directorout", tp, "", 0);
+      tm = Swig_typemap_lookup_new("javadirectorout", tp, "", 0);
       if (tm != NULL) {
         Node *canon_type = canonicalizeType(n, return_type);
         String *canon_name = Getattr(canon_type, "sym:name");