Rename namespace to scope