Rename namespace
Rename namespace in tests