--- a/String.st	Fri May 06 12:42:04 2016 +0200
+++ b/String.st	Fri May 06 12:54:42 2016 +0200
@@ -4104,19 +4104,19 @@
      && (__isSmallInteger(startIndex))
      && (__intVal(startIndex) > 0)
     ) {
-        unsigned char *_pSelf = __stringVal(self);
-        unsigned char *_substring = __stringVal(aSubString);
-        unsigned char *_pSelfI, *_pSelfMax;
-        int _lenSelf = __stringSize(self);
-        int _lenSubstring = __stringSize(aSubString);
-        int _idx0Max = _lenSelf - _lenSubstring;
-        unsigned char _first;
-        unsigned char _ucFirst;
-        unsigned char _lcFirst;
-        unsigned char _oppositeCaseFirst;
+        unsigned char *c_pSelf = __stringVal(self);
+        unsigned char *c_substring = __stringVal(aSubString);
+        unsigned char *c_pSelfI, *c_pSelfMax;
+        int c_lenSelf = __stringSize(self);
+        int c_lenSubstring = __stringSize(aSubString);
+        int c_idx0Max = c_lenSelf - c_lenSubstring;
+        unsigned char c_first;
+        unsigned char c_ucFirst;
+        unsigned char c_lcFirst;
+        unsigned char c_oppositeCaseFirst;
         int i;
         
-        if (_lenSubstring == 0) {
+        if (c_lenSubstring == 0) {
 #if 1
             /* empty string does not match */
             notFound = true;
@@ -4128,21 +4128,21 @@
         }
         
         // searched string's length > string
-        if (_idx0Max < 0) {
+        if (c_idx0Max < 0) {
             notFound = true;
             goto getOutOfHere;
         }
         
-        _first = _lcFirst = _substring[0];
-        if (((_first >= 'A') && (_first <= 'Z'))
-         || ((_first >= 0xC0) && (_first <= 0xDE))) {
-            _ucFirst = _first;
-            _lcFirst = _oppositeCaseFirst = _first - 'A' + 'a';
+        c_first = c_lcFirst = c_substring[0];
+        if (((c_first >= 'A') && (c_first <= 'Z'))
+         || ((c_first >= 0xC0) && (c_first <= 0xDE))) {
+            c_ucFirst = c_first;
+            c_lcFirst = c_oppositeCaseFirst = c_first - 'A' + 'a';
         } else {
-            if (((_first >= 'a') && (_first <= 'z'))
-             || ((_first >= 0xE0) && (_first <= 0xFE))) {
-                _lcFirst = _first;
-                _ucFirst = _oppositeCaseFirst = _first - 'a' + 'A';
+            if (((c_first >= 'a') && (c_first <= 'z'))
+             || ((c_first >= 0xE0) && (c_first <= 0xFE))) {
+                c_lcFirst = c_first;
+                c_ucFirst = c_oppositeCaseFirst = c_first - 'a' + 'A';
             }
         }
         
@@ -4154,18 +4154,18 @@
         //            - idx0Max = 7 (last legal startIndex)
         
         i = __intVal(startIndex) - 1;
-        _pSelfI = _pSelf + i;
-        _pSelfMax = _pSelf + _idx0Max;
+        c_pSelfI = c_pSelf + i;
+        c_pSelfMax = c_pSelf + c_idx0Max;
         
-        for (; _pSelfI <= _pSelfMax; _pSelfI++) {
+        for (; c_pSelfI <= c_pSelfMax; c_pSelfI++) {
             int j;
-            unsigned char _selfChar;
+            unsigned char c_selfChar;
             
             // find the first char
-            _selfChar = _pSelfI[0];
-            if (_selfChar != _first) {
+            c_selfChar = c_pSelfI[0];
+            if (c_selfChar != c_first) {
                 if (caseSensitive == true) continue;
-                if (_selfChar != _oppositeCaseFirst) {
+                if (c_selfChar != c_oppositeCaseFirst) {
 searchNext: ;
                     continue;
                 }    
@@ -4173,32 +4173,32 @@
             
             // first char matches
             // compare rest
-            for (j=1; j<_lenSubstring; j++) {
-                char _selfChar, _subChar, _lcSubChar, _ucSubChar;
+            for (j=1; j<c_lenSubstring; j++) {
+                char c_selfChar, c_subChar, c_lcSubChar, c_ucSubChar;
                 
-                _subChar = _substring[j];
-                _selfChar = _pSelfI[j];
+                c_subChar = c_substring[j];
+                c_selfChar = c_pSelfI[j];
                 
-                if (_selfChar == _subChar) continue;
+                if (c_selfChar == c_subChar) continue;
                 if (caseSensitive == true) goto searchNext;
 
-                _lcSubChar = _subChar;
-                if (((_lcSubChar >= 'A') && (_lcSubChar <= 'Z'))
-                 || ((_lcSubChar >= 0xC0) && (_lcSubChar <= 0xDE))) {
-                    _lcSubChar = _subChar - 'A' + 'a';
-                    if (_selfChar != _lcSubChar) goto searchNext;
+                c_lcSubChar = c_subChar;
+                if (((c_lcSubChar >= 'A') && (c_lcSubChar <= 'Z'))
+                 || ((c_lcSubChar >= 0xC0) && (c_lcSubChar <= 0xDE))) {
+                    c_lcSubChar = c_subChar - 'A' + 'a';
+                    if (c_selfChar != c_lcSubChar) goto searchNext;
                 } else {
-                    if (((_lcSubChar >= 'a') && (_lcSubChar <= 'z'))
-                     || ((_lcSubChar >= 0xE0) && (_lcSubChar <= 0xFE))) {
-                        _ucSubChar = _subChar - 'a' + 'A';
-                        if (_selfChar != _ucSubChar) goto searchNext;
+                    if (((c_lcSubChar >= 'a') && (c_lcSubChar <= 'z'))
+                     || ((c_lcSubChar >= 0xE0) && (c_lcSubChar <= 0xFE))) {
+                        c_ucSubChar = c_subChar - 'a' + 'A';
+                        if (c_selfChar != c_ucSubChar) goto searchNext;
                     } else {
                         goto searchNext;
                     }
                 }
             }
             // if we arrive here, we have a match at i
-            RETURN( __mkSmallInteger( _pSelfI - _pSelf + 1 ) );
+            RETURN( __mkSmallInteger( c_pSelfI - c_pSelf + 1 ) );
         }
         notFound = true;
     }