gustafn
committed
on 24 May
make renaming logic more clear