Improve editing of namespaces.

Change-Id: Ie90b5c4c2916ea79a0126b72747c5bbe7ea7474e