Fixed more name bugs