Moved and deleted some names