Fixed up some naming