fixed name bugs. (again -.-)