db name refactored