Refactored names around multiple database support