updated database names and schema