Removing namespace collision