Tightened up some naming/terminology