Rewrite examples according to the core changes