There was a duplicate name problem with the new "Database" namespace so this was altered to "DB". All units in the namespace were renamed accordingly. All related test units were again renamed in line with their related "DB" units. Unit references etc were also adjusted.