Fixed the extended database naming issue.