Renamed again the test packages.
Renamed some connection objects.