--- a/JavaMirror.st	Wed Dec 18 12:03:32 2013 +0100
+++ b/JavaMirror.st	Wed Dec 18 14:52:11 2013 +0100
@@ -61,7 +61,7 @@
 
     Different classes may use different mirrors - for example,
     Smalltalk classes use a special mirror so non-Smalltalk classes
-    and instances could be introspected and manipulated by standard 
+    and instances could be introspected and manipulated by standard
     Java code.
 
     [author:]
@@ -123,7 +123,7 @@
 !
 
 getDeclaredConstructors: publicOnly
-    "Returns an java.lang.reflect.Constructor[] with all constructors 
+    "Returns an java.lang.reflect.Constructor[] with all constructors
      declared by this class. "
 
     ^self subclassResponsibility
@@ -132,7 +132,7 @@
 !
 
 getDeclaredFields: publicOnly
-    "Returns an java.lang.reflect.Field[] with all constructors 
+    "Returns an java.lang.reflect.Field[] with all constructors
      declared by this class."
 
     ^self subclassResponsibility
@@ -140,10 +140,10 @@
     "Created: / 22-08-2012 / 12:03:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-getDeclaredMethods:publicOnly 
-    "Returns an java.lang.reflect.Method[] with all methods 
+getDeclaredMethods:publicOnly
+    "Returns an java.lang.reflect.Method[] with all methods
      declared by this class."
-    
+
     ^ self subclassResponsibility
 
     "Created: / 01-08-2012 / 11:07:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -197,7 +197,7 @@
 
 !JavaMirror methodsFor:'instance creation-java.lang.reflect.*'!
 
-create: ctorOrMethodClass for: class method: method signature: signature modifiers: modifiers parameterTyoes: parameterClasses exceptionTypes: exceptionClasses annotations: annotations 
+create: ctorOrMethodClass for: class method: method signature: signature modifiers: modifiers parameterTyoes: parameterClasses exceptionTypes: exceptionClasses annotations: annotations
     "Creates a new java.lang.Constructor. Arguments:
 
         ctorOrMethodClass <java.lang.reflect.Constructor|java.lang.reflect.Method>
@@ -208,7 +208,7 @@
         parameterClasses <Collection of Class>
         exceptionClasses <Collection of Class>
         annotations <JavaAnnotationContainer>"
-    
+
     | ctorOrMethod |
     ctorOrMethod := ctorOrMethodClass new.
     ctorOrMethod
@@ -246,13 +246,13 @@
     "
 
     | ctor |
-    ctor := self create: java_lang_reflect_Constructor
+    ctor := self create: _java_lang_reflect_Constructor_CLASS
                     for: class
                  method: method
-              signature: signature 
-              modifiers: modifiers 
-         parameterTyoes: parameterClasses 
-         exceptionTypes: exceptionClasses 
+              signature: signature
+              modifiers: modifiers
+         parameterTyoes: parameterClasses
+         exceptionTypes: exceptionClasses
             annotations: annotations.
     ^ctor
 
@@ -260,7 +260,7 @@
     "Modified: / 18-05-2013 / 10:55:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-createFieldFor: javaField 
+createFieldFor: javaField
     "given a java field, return the corresponding java.lang.Field
      instance for it."
     "
@@ -282,7 +282,7 @@
     type := JavaVM javaClassObjectForClass:
                 ((JavaDescriptor fromString: javaField descriptor)  javaClassUsingClassLoader: javaField javaClass classLoader).
     modifiers := javaField accessFlags.
-    field := java_lang_reflect_Field new.
+    field := _java_lang_reflect_Field_CLASS new.
     field
         instVarNamed: #clazz put: clazz;
         instVarNamed: #name put: name;
@@ -290,7 +290,7 @@
         instVarNamed: #type put: type;
         instVarNamed: #modifiers put: modifiers;
         yourself.
-    javaField annotations 
+    javaField annotations
         ifNotNil: [
             field instVarNamed: #annotations
                 put: javaField annotations runtimeVisible rawAnnotations
@@ -316,13 +316,13 @@
     "
 
     | mthd |
-    mthd := self create: java_lang_reflect_Method
+    mthd := self create: _java_lang_reflect_Method_CLASS
                     for: class
                  method: method
-              signature: signature 
-              modifiers: modifiers 
-         parameterTyoes: parameterClasses 
-         exceptionTypes: exceptionClasses 
+              signature: signature
+              modifiers: modifiers
+         parameterTyoes: parameterClasses
+         exceptionTypes: exceptionClasses
             annotations: annotations.
 
     mthd