Rename namespace #26