rename WorkerSpaceCounter to SpaceCounter

resubmitted, fix conflicts.