Several fixes regarding renaming

hint: for vim there is plugin Align which do it easily with visual and `:Align =>`