Fixed some more name errors