Updated db names, refactored db name usage.