Fixed some name errors