--- a/JavaLookup.st	Sun Mar 27 00:41:25 2016 +0000
+++ b/JavaLookup.st	Tue Mar 22 22:34:35 2016 +0000
@@ -33,14 +33,14 @@
 	category:'Languages-Java-Interop'
 !
 
-Lookup subclass:#Java2Smalltalk
+Lookup subclass:#J2S
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:JavaLookup
 !
 
-Lookup subclass:#Smalltalk2Java
+Lookup subclass:#S2J
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
@@ -157,8 +157,8 @@
 initialize
     "Invoked when a new instance is created."
 
-    s2j := Smalltalk2Java new.
-    j2s := Java2Smalltalk new.
+    s2j := S2J new.
+    j2s := J2S new.
 
     "Modified: / 15-12-2011 / 23:06:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
@@ -276,7 +276,7 @@
     "Modified: / 20-01-2014 / 13:27:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-!JavaLookup::Java2Smalltalk methodsFor:'lookup'!
+!JavaLookup::J2S methodsFor:'lookup'!
 
 lookupMethodForSelector:selector directedTo:initialSearchClass for:receiver withArguments:argArrayOrNil from:sendingContext ilc: ilc
 
@@ -338,7 +338,7 @@
     "Created: / 16-12-2011 / 00:00:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-!JavaLookup::Java2Smalltalk methodsFor:'utilities'!
+!JavaLookup::J2S methodsFor:'utilities'!
 
 addSelector:selector withMethod:proxy toClass:class 
 
@@ -374,7 +374,7 @@
     "Modified: / 24-02-2012 / 20:36:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-!JavaLookup::Smalltalk2Java methodsFor:'lookup'!
+!JavaLookup::S2J methodsFor:'lookup'!
 
 lookupMethodForSelector: selector directedTo: initialSearchClass for: receiver withArguments: argArrayOrNil from: sendingContext ilc: ilc 
     "
@@ -558,7 +558,7 @@
     "Created: / 19-03-2014 / 16:24:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-!JavaLookup::Smalltalk2Java methodsFor:'lookup (old)'!
+!JavaLookup::S2J methodsFor:'lookup (old)'!
 
 old_lookupMethodForSelector:selector directedTo:initialSearchClass for:receiver withArguments:argArrayOrNil from:sendingContext ilc: ilc
     "
@@ -617,7 +617,7 @@
     "Modified: / 07-05-2013 / 11:19:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-!JavaLookup::Smalltalk2Java methodsFor:'matching'!
+!JavaLookup::S2J methodsFor:'matching'!
 
 descriptorForJavaSelector:arg
     ^ MessageDescription new 
@@ -700,7 +700,7 @@
     "Created: / 06-09-2011 / 22:20:34 / Jan Kurs <kursjan@fit.cvut.cz>"
 ! !
 
-!JavaLookup::Smalltalk2Java methodsFor:'trampolines'!
+!JavaLookup::S2J methodsFor:'trampolines'!
 
 ambiguousMessageSend
 
@@ -809,7 +809,7 @@
     "Created: / 19-08-2010 / 22:08:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-!JavaLookup::Smalltalk2Java methodsFor:'utilities'!
+!JavaLookup::S2J methodsFor:'utilities'!
 
 addSelector:selector withMethod:proxy toClass:class 
 
@@ -1044,7 +1044,7 @@
     "Modified: / 21-01-2014 / 14:42:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-!JavaLookup::Smalltalk2Java methodsFor:'utilities (old)'!
+!JavaLookup::S2J methodsFor:'utilities (old)'!
 
 old_compileProxyWithSelector: selector descriptor: descriptor in: class calling: callee