More adjustments of the rename process