Fix possible shenanigans on item rename...