vcsh: Fix `vcsh rename`

Based on report and work by Alexander Skurikhin.

GitHub: fixes 54
Merge remote-tracking branch 'origin/fix--vcsh-rename'