diff -r ebfddc82b8bb -r 439c4057517f compiler/tests/PPCTokenizingTest.st
--- a/compiler/tests/PPCTokenizingTest.st	Mon Aug 24 22:32:15 2015 +0100
+++ b/compiler/tests/PPCTokenizingTest.st	Mon Aug 24 23:42:53 2015 +0100
@@ -4,7 +4,7 @@
 
 PPAbstractParserTest subclass:#PPCTokenizingTest
 	instanceVariableNames:'parser result context node compiler id node2 id2 id1 node1 node3
-		arguments configuration'
+		options configuration'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'PetitCompiler-Tests-Core-Tokenizing'
@@ -22,12 +22,12 @@
 
 cleanClass
     | parserClass scannerClass |
-    parserClass := (Smalltalk at: arguments parserName ifAbsent: [nil]).
+    parserClass := (Smalltalk at: options parserName ifAbsent: [nil]).
     parserClass notNil ifTrue:[ 
         parserClass removeFromSystem
     ].
 
-    scannerClass := (Smalltalk at: arguments scannerName ifAbsent: [nil]).
+    scannerClass := (Smalltalk at: options scannerName ifAbsent: [nil]).
     scannerClass notNil ifTrue:[ 
         scannerClass removeFromSystem
     ].
@@ -44,15 +44,17 @@
 !
 
 setUp
-    arguments := PPCArguments default
+    options := PPCCompilationOptions default
         profile: true;
         yourself.
         
     configuration := PPCTokenizingConfiguration new
-        arguments: arguments;
+        options: options;
         yourself.
         
     self cleanClass.
+
+    "Modified: / 24-08-2015 / 23:40:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 tearDown
@@ -336,17 +338,17 @@
 !
 
 testCompileTokenComplex2
-    |  a b argumentsWith  |
+    |  a b optionsWith  |
     "based on the PPSmalltlakGrammar>>blockArgumentsWith"
     a := $| asParser smalltalkToken
         yourself.
     b := $] asParser smalltalkToken
         yourself.		
-    argumentsWith := (a / b and ==> [:t | ]) wrapped
-        name: 'argumentsWith'; 
+    optionsWith := (a / b and ==> [:t | ]) wrapped
+        name: 'optionsWith'; 
         yourself.
 
-    parser := argumentsWith compileWithConfiguration: configuration.
+    parser := optionsWith compileWithConfiguration: configuration.
     self assert: parser parse: '|'.
 
     self assert: parser parse: ']' end: 0.
@@ -481,7 +483,7 @@
 
 testWhitespace
     | token ws trimmingToken |
-    configuration arguments inline: false.
+    configuration options inline: false.
     
     token := 'foo' asParser token.
     ws := #blank asParser star name: 'consumeWhitespace'; yourself.
@@ -500,7 +502,7 @@
 
 testWhitespace2
     | token ws trimmingToken |
-    configuration arguments inline: false.
+    configuration options inline: false.
         
     token := 'foo' asParser token.
     ws := #blank asParser star name: 'consumeWhitespace'; yourself.
@@ -520,7 +522,7 @@
 
 testWhitespace3
     | token ws trimmingToken |
-    configuration arguments inline: false.
+    configuration options inline: false.
         
     token := 'foo' asParser token.
     ws := #blank asParser star name: 'consumeWhitespace'; yourself.