Merge "Start rename of DatabaseBase => Database"