Fix renaming widgets