Renaming doesn't work, so let's remove and re-add