Merge "Replace DatabaseBase => Database in more places"