Few leftower renaming residues removed