Fix name collision properly this time
Fixing most of the tests - only a few failing left!