Corrected renamer's behaviour