Revert "Rename service -> cloudstore."

This reverts commit 8c464ac6fea42e188b4a112756875eee7645ab83.