more bugfixes with handle renaming