fixed up some little naming nuances