db name refactoring