Changed namespace
To prevent future name collisions.