Rename workaround #2