rename and redorder addresses