Updates the datastore names to be more consistent.
Merge branch 'master' of https://github.com/mohammedh123/Gambot into mohammedh123-master