Fixes a critical namespace collision