--- ./jaxb-ri-base/runtime/src/com/sun/xml/bind/api/impl/NameConverter.java	2007-05-31 22:58:54.000000000 +0100
+++ ./jaxb-ri/runtime/src/com/sun/xml/bind/api/impl/NameConverter.java	2009-05-05 13:31:40.000000000 +0100
@@ -181,13 +181,14 @@ public interface NameConverter
                 // get the token and remove illegal chars
                 String token = tokens.get( i );
                 token = removeIllegalIdentifierChars( token );
+                token = token.toLowerCase();
 
                 // this will check for reserved keywords
                 if( !NameUtil.isJavaIdentifier( token ) ) {
                     token = '_' + token;
                 }
 
-                tokens.set( i, token.toLowerCase() );
+                tokens.set( i, token );
             }
 
             // concat all the pieces and return it