fixed some strange names