Re-name object store modules. Also improve logic for dbref searching.