Update to support to produce Component Name and & Component Name 2 protocol based...