Fixed namespace/class conflict