Eliminated a namespace-class conflict