Rename namespace on remaining places