Several fixes regarding renaming

This looks like a tricky change. And we already have `test/edit_nic_name_test.rb`. We should extend it to test this change.