Replaced EmbeddedComponent with TemplateComponent.
Updated remaining components.