Reorganized db namespace.