Switch from tracking a sessionid to tracking a bucket

Removes the sessionId and replaces it with a bucket.  Ultimately this is exactly what the code used to do but it's naming implied something that it wasn't.