Fixing DB names