Fixed some naming issues