Changed database name definitions.