Improve database naming consistency