Edit to reflect database name changes