fixed name bugs