Fixed some minor name bugs