Fixed some naming