Refactor database names