anchor.diff:  %%      Bucket, Key, whether it's a
   %%      manifest or regular object
   normal_retriever(ReplyPid, GetModule, Bucket, Key) ->
  -    {ok, RiakObject} = GetModule:get_object(Bucket, Key),
  +    {ok, RiakObject} = GetModule:get_object(riak_moss:to_bucket_name(objects, Bucket), Key),
       riak_object(ReplyPid, RiakObject).
   
  -blocks_retriever(Pid, GetModule, BlockKeys) ->
  +blocks_retriever(Pid, GetModule, BucketName, BlockKeys) ->
       Func = fun({ChunkSeq, ChunkName}) ->
  -        %% TODO:
  -        %% replace the chunk_bucket
  -        %% with a real bucket name
  -        {ok, Value} = GetModule:get_object(<<"filebucket">>, ChunkName),
  +        {ok, Value} = GetModule:get_object(riak_moss:to_bucket_name(blocks, BucketName), ChunkName),
           chunk(Pid, ChunkSeq, Value)
       end,
       lists:foreach(Func, BlockKeys).
  
positive.code:          continue/1,
           prepare/2,
           normal_retriever/4,
           blocks_retriever/3,
           waiting_value/2,
           waiting_chunk_command/2,
           waiting_chunks/2]).
  
negative.code: waiting_chunk_command(continue, #state{from=From,
                                              value_cache=CachedValue,
                                              manifest=Manifest,
                                              bucket=BucketName,
                                              get_module=GetModule}=State) ->
      case CachedValue of
          undefined ->
  