Hopefully this fixes the namespace misery