fixed up some naming