Fixing database names