update for scope/client store name changes