remove everything
add everything again (with correct names)