fixed names parsing