Improve shutdown and rename namespace