Fixed some naming mistakes