Renamed fs-store to a generic store