Renamed poorly named vars - updated docs