Fix NRE's when renaming component - some work needs to be done here though to handle renames gracefully