gustafn
committed
on 24 May 19
make renaming logic more clear