More renaming: 'plugin' to 'component'.