fixed up some name bugs