fixing up some naming