This mornings changes

o Also containing the global renaming of actor to component and
  purpose to task