Add rename breakouts

(cherry picked from commit b85dfefdef77184a5fc74b8739173fa3365dddf9)
Fix original-vs-new references

(cherry picked from commit aea2169839c09a1a7429aaac29a6cd505fad4229)