[SR-Dev] git:janakj/flatstore: further changes after the db name change