Preparing for 'Component' renaming