Adjusted database naming.