--- a/ExternalLibraryFunction.st	Mon Mar 04 09:41:45 2019 +0100
+++ b/ExternalLibraryFunction.st	Mon Mar 04 09:44:29 2019 +0100
@@ -880,7 +880,7 @@
     self hasCode ifFalse:[
         self prepareInvoke.
     ].
-    ^ self invokeFFIwithArguments:nil forCPPInstance:nil
+    ^ self invokeFFIwithArguments:nil forInstance:nil
 
     "Modified (comment): / 04-03-2019 / 09:41:20 / Claus Gittinger"
 !
@@ -891,7 +891,7 @@
     self hasCode ifFalse:[
         self prepareInvoke.
     ].
-    ^ self invokeFFIwithArguments:nil forCPPInstance:anInstance
+    ^ self invokeFFIwithArguments:nil forInstance:anInstance
 
     "Modified (comment): / 04-03-2019 / 09:39:27 / Claus Gittinger"
 !
@@ -904,7 +904,7 @@
     ].
     ^ self 
         invokeFFIwithArguments:(Array with:arg) 
-        forCPPInstance:anInstance
+        forInstance:anInstance
 
     "Modified (comment): / 04-03-2019 / 09:39:34 / Claus Gittinger"
 !
@@ -917,7 +917,7 @@
     ].
     ^ self 
         invokeFFIwithArguments:(Array with:arg1 with:arg2) 
-        forCPPInstance:anInstance
+        forInstance:anInstance
 
     "Modified (comment): / 04-03-2019 / 09:39:38 / Claus Gittinger"
 !
@@ -930,7 +930,7 @@
     ].
     ^ self 
         invokeFFIwithArguments:(Array with:arg1 with:arg2 with:arg3) 
-        forCPPInstance:anInstance
+        forInstance:anInstance
 
     "Modified (comment): / 04-03-2019 / 09:39:43 / Claus Gittinger"
 !
@@ -943,7 +943,7 @@
     ].
     ^ self 
         invokeFFIwithArguments:(Array with:arg1 with:arg2 with:arg3 with:arg4) 
-        forCPPInstance:anInstance
+        forInstance:anInstance
 
     "Modified (comment): / 04-03-2019 / 09:39:48 / Claus Gittinger"
 !
@@ -956,7 +956,7 @@
     ].
     ^ self 
         invokeFFIwithArguments:args 
-        forCPPInstance:anInstance
+        forInstance:anInstance
 
     "Modified (comment): / 04-03-2019 / 09:39:57 / Claus Gittinger"
 !
@@ -967,7 +967,7 @@
     self hasCode ifFalse:[
         self prepareObjCInvoke.
     ].
-    ^ self invokeFFIwithArguments:nil forCPPInstance:anInstance
+    ^ self invokeFFIwithArguments:nil forInstance:anInstance
 
     "Created: / 04-03-2019 / 09:12:12 / Claus Gittinger"
 !
@@ -978,7 +978,7 @@
     self hasCode ifFalse:[
         self prepareObjCInvoke.
     ].
-    ^ self invokeFFIwithArguments:args forCPPInstance:anInstance
+    ^ self invokeFFIwithArguments:args forInstance:anInstance
 
     "Created: / 04-03-2019 / 09:39:03 / Claus Gittinger"
 !
@@ -989,7 +989,7 @@
     self hasCode ifFalse:[
         self prepareInvoke.
     ].
-    ^ self invokeFFIwithArguments:(Array with:arg) forCPPInstance:nil
+    ^ self invokeFFIwithArguments:(Array with:arg) forInstance:nil
 
     "Modified (comment): / 04-03-2019 / 09:41:14 / Claus Gittinger"
 !
@@ -1000,7 +1000,7 @@
     self hasCode ifFalse:[
         self prepareInvoke.
     ].
-    ^ self invokeFFIwithArguments:(Array with:arg1 with:arg2) forCPPInstance:nil
+    ^ self invokeFFIwithArguments:(Array with:arg1 with:arg2) forInstance:nil
 
     "Modified (comment): / 04-03-2019 / 09:41:07 / Claus Gittinger"
 !
@@ -1011,7 +1011,7 @@
     self hasCode ifFalse:[
         self prepareInvoke.
     ].
-    ^ self invokeFFIwithArguments:(Array with:arg1 with:arg2 with:arg3) forCPPInstance:nil
+    ^ self invokeFFIwithArguments:(Array with:arg1 with:arg2 with:arg3) forInstance:nil
 
     "Modified (comment): / 04-03-2019 / 09:41:01 / Claus Gittinger"
 !
@@ -1022,7 +1022,7 @@
     self hasCode ifFalse:[
         self prepareInvoke.
     ].
-    ^ self invokeFFIwithArguments:(Array with:arg1 with:arg2 with:arg3 with:arg4) forCPPInstance:nil
+    ^ self invokeFFIwithArguments:(Array with:arg1 with:arg2 with:arg3 with:arg4) forInstance:nil
 
     "Modified (comment): / 04-03-2019 / 09:40:56 / Claus Gittinger"
 !
@@ -1033,7 +1033,7 @@
     self hasCode ifFalse:[
         self prepareInvoke.
     ].
-    ^ self invokeFFIwithArguments:argArray forCPPInstance:nil
+    ^ self invokeFFIwithArguments:argArray forInstance:nil
 
     "Modified: / 01-08-2006 / 16:04:08 / cg"
     "Modified (comment): / 04-03-2019 / 09:40:48 / Claus Gittinger"
@@ -1302,18 +1302,18 @@
 !ExternalLibraryFunction methodsFor:'private-invoking'!
 
 invokeCPPVirtualFFIOn:instance withArguments:arguments
-    ^ self invokeFFIwithArguments:arguments forCPPInstance:instance
+    ^ self invokeFFIwithArguments:arguments forInstance:instance
 
     "Modified: / 01-08-2006 / 13:55:30 / cg"
 !
 
 invokeFFIWithArguments:arguments
-    ^ self invokeFFIwithArguments:arguments forCPPInstance:nil
+    ^ self invokeFFIwithArguments:arguments forInstance:nil
 
     "Modified: / 01-08-2006 / 13:55:35 / cg"
 !
 
-invokeFFIwithArguments:argumentsOrNilIn forCPPInstance:aReceiverOrNil
+invokeFFIwithArguments:argumentsOrNilIn forInstance:aReceiverOrNil
     "basic invoke mechanism. Calls the function represented by the receiver with argumentsOrNil.
      For cplusplus, aReceiverOrNil is required to be an externalStructure like object;
      for objectiveC, it must be an ObjectiveC object"
@@ -2869,7 +2869,7 @@
             ].
         ].
         (failureCode == #BadArgForAsyncCall) ifTrue:[
-            ^ self tryAgainWithAsyncSafeArguments:argumentsOrNil forCPPInstance:aReceiverOrNil
+            ^ self tryAgainWithAsyncSafeArguments:argumentsOrNil forInstance:aReceiverOrNil
         ].
         (failureCode == #FFINotSupported) ifTrue:[
             ^ self primitiveFailed:'FFI support missing in this build'.
@@ -2921,7 +2921,7 @@
     "Modified: / 01-03-2019 / 15:40:14 / Claus Gittinger"
 !
 
-tryAgainWithAsyncSafeArguments:argumentsOrNil forCPPInstance:aReceiverOrNil
+tryAgainWithAsyncSafeArguments:argumentsOrNil forInstance:aReceiverOrNil
     "invoked by the call primitive, iff GC-unsave arguments where passed to the call.
      Here, allocate non-movable blocks of memory and copy the arguments into them,
      then try the call again, copy changed values back, and release the memeory."
@@ -2965,7 +2965,7 @@
 	^ self primitiveFailed
     ].
 
-    result := self invokeFFIwithArguments:saveArguments forCPPInstance:aReceiverOrNil.
+    result := self invokeFFIwithArguments:saveArguments forInstance:aReceiverOrNil.
 
     "/ copy back !!
     originalToSaveArgMapping keysAndValuesDo:[:arg :saveArg |