Fixed some naming errors