Tweaked a few identifiers.
Merge branch 'remote-storage-added'
Merge branch 'remote-storage-refactor'