Rename components, add component refs for all the things.