Add rename breakouts
Fix original-vs-new references