[FIX] changes of String names