Clean, renamed and rebuilded