diff --git a/template/.polarion/icons/Actor.gif b/template/.polarion/icons/Actor.gif
deleted file mode 100644
index 3128bf9..0000000
Binary files a/template/.polarion/icons/Actor.gif and /dev/null differ
diff --git a/template/.polarion/icons/ActorPhysicalFunction.gif b/template/.polarion/icons/ActorPhysicalFunction.gif
deleted file mode 100644
index c28e8c9..0000000
Binary files a/template/.polarion/icons/ActorPhysicalFunction.gif and /dev/null differ
diff --git a/template/.polarion/icons/CapabilityRealizationUseCase.gif b/template/.polarion/icons/CapabilityRealizationUseCase.gif
deleted file mode 100644
index 6bae6b8..0000000
Binary files a/template/.polarion/icons/CapabilityRealizationUseCase.gif and /dev/null differ
diff --git a/template/.polarion/icons/CapabilityUseCase.gif b/template/.polarion/icons/CapabilityUseCase.gif
deleted file mode 100644
index 04be148..0000000
Binary files a/template/.polarion/icons/CapabilityUseCase.gif and /dev/null differ
diff --git a/template/.polarion/icons/AbstractCapabilityExtend.gif b/template/.polarion/icons/Capella_AbstractCapabilityExtend.gif
similarity index 100%
rename from template/.polarion/icons/AbstractCapabilityExtend.gif
rename to template/.polarion/icons/Capella_AbstractCapabilityExtend.gif
diff --git a/template/.polarion/icons/AbstractCapabilityExtensionPoint.gif b/template/.polarion/icons/Capella_AbstractCapabilityExtensionPoint.gif
similarity index 100%
rename from template/.polarion/icons/AbstractCapabilityExtensionPoint.gif
rename to template/.polarion/icons/Capella_AbstractCapabilityExtensionPoint.gif
diff --git a/template/.polarion/icons/AbstractCapabilityGeneralization.gif b/template/.polarion/icons/Capella_AbstractCapabilityGeneralization.gif
similarity index 100%
rename from template/.polarion/icons/AbstractCapabilityGeneralization.gif
rename to template/.polarion/icons/Capella_AbstractCapabilityGeneralization.gif
diff --git a/template/.polarion/icons/AbstractCapabilityInclude.gif b/template/.polarion/icons/Capella_AbstractCapabilityInclude.gif
similarity index 100%
rename from template/.polarion/icons/AbstractCapabilityInclude.gif
rename to template/.polarion/icons/Capella_AbstractCapabilityInclude.gif
diff --git a/template/.polarion/icons/AbstractParameter.gif b/template/.polarion/icons/Capella_AbstractParameter.gif
similarity index 100%
rename from template/.polarion/icons/AbstractParameter.gif
rename to template/.polarion/icons/Capella_AbstractParameter.gif
diff --git a/template/.polarion/icons/AbstractTimeEvent.gif b/template/.polarion/icons/Capella_AbstractTimeEvent.gif
similarity index 100%
rename from template/.polarion/icons/AbstractTimeEvent.gif
rename to template/.polarion/icons/Capella_AbstractTimeEvent.gif
diff --git a/template/.polarion/icons/Action.gif b/template/.polarion/icons/Capella_Action.gif
similarity index 100%
rename from template/.polarion/icons/Action.gif
rename to template/.polarion/icons/Capella_Action.gif
diff --git a/template/.polarion/icons/ActivityAllocation.gif b/template/.polarion/icons/Capella_ActivityAllocation.gif
similarity index 100%
rename from template/.polarion/icons/ActivityAllocation.gif
rename to template/.polarion/icons/Capella_ActivityAllocation.gif
diff --git a/template/.polarion/icons/ActivityComposition.gif b/template/.polarion/icons/Capella_ActivityComposition.gif
similarity index 100%
rename from template/.polarion/icons/ActivityComposition.gif
rename to template/.polarion/icons/Capella_ActivityComposition.gif
diff --git a/template/.polarion/icons/ActivityFinalNode.gif b/template/.polarion/icons/Capella_ActivityFinalNode.gif
similarity index 100%
rename from template/.polarion/icons/ActivityFinalNode.gif
rename to template/.polarion/icons/Capella_ActivityFinalNode.gif
diff --git a/template/.polarion/icons/ActivityModelFile.gif b/template/.polarion/icons/Capella_ActivityModelFile.gif
similarity index 100%
rename from template/.polarion/icons/ActivityModelFile.gif
rename to template/.polarion/icons/Capella_ActivityModelFile.gif
diff --git a/template/.polarion/icons/ActivityParameterNode.gif b/template/.polarion/icons/Capella_ActivityParameterNode.gif
similarity index 100%
rename from template/.polarion/icons/ActivityParameterNode.gif
rename to template/.polarion/icons/Capella_ActivityParameterNode.gif
diff --git a/template/.polarion/icons/ActivityPkg.gif b/template/.polarion/icons/Capella_ActivityPkg.gif
similarity index 100%
rename from template/.polarion/icons/ActivityPkg.gif
rename to template/.polarion/icons/Capella_ActivityPkg.gif
diff --git a/template/.polarion/icons/ActivityToCapabilityMappings.gif b/template/.polarion/icons/Capella_ActivityToCapabilityMappings.gif
similarity index 100%
rename from template/.polarion/icons/ActivityToCapabilityMappings.gif
rename to template/.polarion/icons/Capella_ActivityToCapabilityMappings.gif
diff --git a/template/.polarion/icons/Capella_Actor.gif b/template/.polarion/icons/Capella_Actor.gif
index 500ef17..3128bf9 100644
Binary files a/template/.polarion/icons/Capella_Actor.gif and b/template/.polarion/icons/Capella_Actor.gif differ
diff --git a/template/.polarion/icons/ActorCapabilityInvolvement.gif b/template/.polarion/icons/Capella_ActorCapabilityInvolvement.gif
similarity index 100%
rename from template/.polarion/icons/ActorCapabilityInvolvement.gif
rename to template/.polarion/icons/Capella_ActorCapabilityInvolvement.gif
diff --git a/template/.polarion/icons/ActorCapabilityInvolvment.gif b/template/.polarion/icons/Capella_ActorCapabilityInvolvment.gif
similarity index 100%
rename from template/.polarion/icons/ActorCapabilityInvolvment.gif
rename to template/.polarion/icons/Capella_ActorCapabilityInvolvment.gif
diff --git a/template/.polarion/icons/ActorCapabilityRealizationInvolvement.gif b/template/.polarion/icons/Capella_ActorCapabilityRealizationInvolvement.gif
similarity index 100%
rename from template/.polarion/icons/ActorCapabilityRealizationInvolvement.gif
rename to template/.polarion/icons/Capella_ActorCapabilityRealizationInvolvement.gif
diff --git a/template/.polarion/icons/ActorCapabilityRealizationInvolvment.gif b/template/.polarion/icons/Capella_ActorCapabilityRealizationInvolvment.gif
similarity index 100%
rename from template/.polarion/icons/ActorCapabilityRealizationInvolvment.gif
rename to template/.polarion/icons/Capella_ActorCapabilityRealizationInvolvment.gif
diff --git a/template/.polarion/icons/ActorFunction.gif b/template/.polarion/icons/Capella_ActorFunction.gif
similarity index 100%
rename from template/.polarion/icons/ActorFunction.gif
rename to template/.polarion/icons/Capella_ActorFunction.gif
diff --git a/template/.polarion/icons/ActorGeneralization.gif b/template/.polarion/icons/Capella_ActorGeneralization.gif
similarity index 100%
rename from template/.polarion/icons/ActorGeneralization.gif
rename to template/.polarion/icons/Capella_ActorGeneralization.gif
diff --git a/template/.polarion/icons/ActorImplementation.gif b/template/.polarion/icons/Capella_ActorImplementation.gif
similarity index 100%
rename from template/.polarion/icons/ActorImplementation.gif
rename to template/.polarion/icons/Capella_ActorImplementation.gif
diff --git a/template/.polarion/icons/ActorInterfaceDiagram.gif b/template/.polarion/icons/Capella_ActorInterfaceDiagram.gif
similarity index 100%
rename from template/.polarion/icons/ActorInterfaceDiagram.gif
rename to template/.polarion/icons/Capella_ActorInterfaceDiagram.gif
diff --git a/template/.polarion/icons/ActorLogicalFunction.gif b/template/.polarion/icons/Capella_ActorLogicalFunction.gif
similarity index 100%
rename from template/.polarion/icons/ActorLogicalFunction.gif
rename to template/.polarion/icons/Capella_ActorLogicalFunction.gif
diff --git a/template/.polarion/icons/ActorMissionInvolvement.gif b/template/.polarion/icons/Capella_ActorMissionInvolvement.gif
similarity index 100%
rename from template/.polarion/icons/ActorMissionInvolvement.gif
rename to template/.polarion/icons/Capella_ActorMissionInvolvement.gif
diff --git a/template/.polarion/icons/ActorMissionInvolvment.gif b/template/.polarion/icons/Capella_ActorMissionInvolvment.gif
similarity index 100%
rename from template/.polarion/icons/ActorMissionInvolvment.gif
rename to template/.polarion/icons/Capella_ActorMissionInvolvment.gif
diff --git a/template/.polarion/icons/ActorRealisation.gif b/template/.polarion/icons/Capella_ActorRealisation.gif
similarity index 100%
rename from template/.polarion/icons/ActorRealisation.gif
rename to template/.polarion/icons/Capella_ActorRealisation.gif
diff --git a/template/.polarion/icons/ActorRealization.gif b/template/.polarion/icons/Capella_ActorRealization.gif
similarity index 100%
rename from template/.polarion/icons/ActorRealization.gif
rename to template/.polarion/icons/Capella_ActorRealization.gif
diff --git a/template/.polarion/icons/ActorSystemFunction.gif b/template/.polarion/icons/Capella_ActorSystemFunction.gif
similarity index 100%
rename from template/.polarion/icons/ActorSystemFunction.gif
rename to template/.polarion/icons/Capella_ActorSystemFunction.gif
diff --git a/template/.polarion/icons/Actor_WB.gif b/template/.polarion/icons/Capella_Actor_WB.gif
similarity index 100%
rename from template/.polarion/icons/Actor_WB.gif
rename to template/.polarion/icons/Capella_Actor_WB.gif
diff --git a/template/.polarion/icons/ActorsDiagram.gif b/template/.polarion/icons/Capella_ActorsDiagram.gif
similarity index 100%
rename from template/.polarion/icons/ActorsDiagram.gif
rename to template/.polarion/icons/Capella_ActorsDiagram.gif
diff --git a/template/.polarion/icons/AddInstanceRole.gif b/template/.polarion/icons/Capella_AddInstanceRole.gif
similarity index 100%
rename from template/.polarion/icons/AddInstanceRole.gif
rename to template/.polarion/icons/Capella_AddInstanceRole.gif
diff --git a/template/.polarion/icons/AspectPkg.gif b/template/.polarion/icons/Capella_AspectPkg.gif
similarity index 100%
rename from template/.polarion/icons/AspectPkg.gif
rename to template/.polarion/icons/Capella_AspectPkg.gif
diff --git a/template/.polarion/icons/Association.gif b/template/.polarion/icons/Capella_Association.gif
similarity index 100%
rename from template/.polarion/icons/Association.gif
rename to template/.polarion/icons/Capella_Association.gif
diff --git a/template/.polarion/icons/AsyncSequenceMessage.gif b/template/.polarion/icons/Capella_AsyncSequenceMessage.gif
similarity index 100%
rename from template/.polarion/icons/AsyncSequenceMessage.gif
rename to template/.polarion/icons/Capella_AsyncSequenceMessage.gif
diff --git a/template/.polarion/icons/BehaviorModelFile.gif b/template/.polarion/icons/Capella_BehaviorModelFile.gif
similarity index 100%
rename from template/.polarion/icons/BehaviorModelFile.gif
rename to template/.polarion/icons/Capella_BehaviorModelFile.gif
diff --git a/template/.polarion/icons/BinaryExpression.gif b/template/.polarion/icons/Capella_BinaryExpression.gif
similarity index 100%
rename from template/.polarion/icons/BinaryExpression.gif
rename to template/.polarion/icons/Capella_BinaryExpression.gif
diff --git a/template/.polarion/icons/Blank.gif b/template/.polarion/icons/Capella_Blank.gif
similarity index 100%
rename from template/.polarion/icons/Blank.gif
rename to template/.polarion/icons/Capella_Blank.gif
diff --git a/template/.polarion/icons/BooleanExpression.gif b/template/.polarion/icons/Capella_BooleanExpression.gif
similarity index 100%
rename from template/.polarion/icons/BooleanExpression.gif
rename to template/.polarion/icons/Capella_BooleanExpression.gif
diff --git a/template/.polarion/icons/BooleanReference.gif b/template/.polarion/icons/Capella_BooleanReference.gif
similarity index 100%
rename from template/.polarion/icons/BooleanReference.gif
rename to template/.polarion/icons/Capella_BooleanReference.gif
diff --git a/template/.polarion/icons/BooleanSymbolicValue.gif b/template/.polarion/icons/Capella_BooleanSymbolicValue.gif
similarity index 100%
rename from template/.polarion/icons/BooleanSymbolicValue.gif
rename to template/.polarion/icons/Capella_BooleanSymbolicValue.gif
diff --git a/template/.polarion/icons/BooleanType.gif b/template/.polarion/icons/Capella_BooleanType.gif
similarity index 100%
rename from template/.polarion/icons/BooleanType.gif
rename to template/.polarion/icons/Capella_BooleanType.gif
diff --git a/template/.polarion/icons/BooleanValueReferenceLink.gif b/template/.polarion/icons/Capella_BooleanValueReferenceLink.gif
similarity index 100%
rename from template/.polarion/icons/BooleanValueReferenceLink.gif
rename to template/.polarion/icons/Capella_BooleanValueReferenceLink.gif
diff --git a/template/.polarion/icons/BracketEdgeStyle.gif b/template/.polarion/icons/Capella_BracketEdgeStyle.gif
similarity index 100%
rename from template/.polarion/icons/BracketEdgeStyle.gif
rename to template/.polarion/icons/Capella_BracketEdgeStyle.gif
diff --git a/template/.polarion/icons/COTSCI.gif b/template/.polarion/icons/Capella_COTSCI.gif
similarity index 100%
rename from template/.polarion/icons/COTSCI.gif
rename to template/.polarion/icons/Capella_COTSCI.gif
diff --git a/template/.polarion/icons/CSCI.gif b/template/.polarion/icons/Capella_CSCI.gif
similarity index 100%
rename from template/.polarion/icons/CSCI.gif
rename to template/.polarion/icons/Capella_CSCI.gif
diff --git a/template/.polarion/icons/CallAction.gif b/template/.polarion/icons/Capella_CallAction.gif
similarity index 100%
rename from template/.polarion/icons/CallAction.gif
rename to template/.polarion/icons/Capella_CallAction.gif
diff --git a/template/.polarion/icons/CapabilityAspect.gif b/template/.polarion/icons/Capella_CapabilityAspect.gif
similarity index 100%
rename from template/.polarion/icons/CapabilityAspect.gif
rename to template/.polarion/icons/Capella_CapabilityAspect.gif
diff --git a/template/.polarion/icons/CapabilityConfiguration.gif b/template/.polarion/icons/Capella_CapabilityConfiguration.gif
similarity index 100%
rename from template/.polarion/icons/CapabilityConfiguration.gif
rename to template/.polarion/icons/Capella_CapabilityConfiguration.gif
diff --git a/template/.polarion/icons/CapabilityExploitation.gif b/template/.polarion/icons/Capella_CapabilityExploitation.gif
similarity index 100%
rename from template/.polarion/icons/CapabilityExploitation.gif
rename to template/.polarion/icons/Capella_CapabilityExploitation.gif
diff --git a/template/.polarion/icons/CapabilityRealizationAspect.gif b/template/.polarion/icons/Capella_CapabilityRealizationAspect.gif
similarity index 100%
rename from template/.polarion/icons/CapabilityRealizationAspect.gif
rename to template/.polarion/icons/Capella_CapabilityRealizationAspect.gif
diff --git a/template/.polarion/icons/CapabilityRealizationPkg.gif b/template/.polarion/icons/Capella_CapabilityRealizationPkg.gif
similarity index 100%
rename from template/.polarion/icons/CapabilityRealizationPkg.gif
rename to template/.polarion/icons/Capella_CapabilityRealizationPkg.gif
diff --git a/template/.polarion/icons/CapabilityRealization.gif b/template/.polarion/icons/Capella_CapabilityRealizationUseCase.gif
similarity index 100%
rename from template/.polarion/icons/CapabilityRealization.gif
rename to template/.polarion/icons/Capella_CapabilityRealizationUseCase.gif
diff --git a/template/.polarion/icons/CapabilitySupplierLink.gif b/template/.polarion/icons/Capella_CapabilitySupplierLink.gif
similarity index 100%
rename from template/.polarion/icons/CapabilitySupplierLink.gif
rename to template/.polarion/icons/Capella_CapabilitySupplierLink.gif
diff --git a/template/.polarion/icons/Capability.gif b/template/.polarion/icons/Capella_CapabilityUseCase.gif
similarity index 100%
rename from template/.polarion/icons/Capability.gif
rename to template/.polarion/icons/Capella_CapabilityUseCase.gif
diff --git a/template/.polarion/icons/CapellacommonModelFile.gif b/template/.polarion/icons/Capella_CapellacommonModelFile.gif
similarity index 100%
rename from template/.polarion/icons/CapellacommonModelFile.gif
rename to template/.polarion/icons/Capella_CapellacommonModelFile.gif
diff --git a/template/.polarion/icons/CapellacoreModelFile.gif b/template/.polarion/icons/Capella_CapellacoreModelFile.gif
similarity index 100%
rename from template/.polarion/icons/CapellacoreModelFile.gif
rename to template/.polarion/icons/Capella_CapellacoreModelFile.gif
diff --git a/template/.polarion/icons/CapelladiagramsModelFile.gif b/template/.polarion/icons/Capella_CapelladiagramsModelFile.gif
similarity index 100%
rename from template/.polarion/icons/CapelladiagramsModelFile.gif
rename to template/.polarion/icons/Capella_CapelladiagramsModelFile.gif
diff --git a/template/.polarion/icons/CapellamodellerModelFile.gif b/template/.polarion/icons/Capella_CapellamodellerModelFile.gif
similarity index 100%
rename from template/.polarion/icons/CapellamodellerModelFile.gif
rename to template/.polarion/icons/Capella_CapellamodellerModelFile.gif
diff --git a/template/.polarion/icons/Category.gif b/template/.polarion/icons/Capella_Category.gif
similarity index 100%
rename from template/.polarion/icons/Category.gif
rename to template/.polarion/icons/Capella_Category.gif
diff --git a/template/.polarion/icons/ChoicePseudoState.gif b/template/.polarion/icons/Capella_ChoicePseudoState.gif
similarity index 100%
rename from template/.polarion/icons/ChoicePseudoState.gif
rename to template/.polarion/icons/Capella_ChoicePseudoState.gif
diff --git a/template/.polarion/icons/ClassAggregation.gif b/template/.polarion/icons/Capella_ClassAggregation.gif
similarity index 100%
rename from template/.polarion/icons/ClassAggregation.gif
rename to template/.polarion/icons/Capella_ClassAggregation.gif
diff --git a/template/.polarion/icons/ClassAssociation.gif b/template/.polarion/icons/Capella_ClassAssociation.gif
similarity index 100%
rename from template/.polarion/icons/ClassAssociation.gif
rename to template/.polarion/icons/Capella_ClassAssociation.gif
diff --git a/template/.polarion/icons/ClassCarries.gif b/template/.polarion/icons/Capella_ClassCarries.gif
similarity index 100%
rename from template/.polarion/icons/ClassCarries.gif
rename to template/.polarion/icons/Capella_ClassCarries.gif
diff --git a/template/.polarion/icons/ClassComposition.gif b/template/.polarion/icons/Capella_ClassComposition.gif
similarity index 100%
rename from template/.polarion/icons/ClassComposition.gif
rename to template/.polarion/icons/Capella_ClassComposition.gif
diff --git a/template/.polarion/icons/ClassDiagram.gif b/template/.polarion/icons/Capella_ClassDiagram.gif
similarity index 100%
rename from template/.polarion/icons/ClassDiagram.gif
rename to template/.polarion/icons/Capella_ClassDiagram.gif
diff --git a/template/.polarion/icons/ClassImplementation.gif b/template/.polarion/icons/Capella_ClassImplementation.gif
similarity index 100%
rename from template/.polarion/icons/ClassImplementation.gif
rename to template/.polarion/icons/Capella_ClassImplementation.gif
diff --git a/template/.polarion/icons/ClassPkg.gif b/template/.polarion/icons/Capella_ClassPkg.gif
similarity index 100%
rename from template/.polarion/icons/ClassPkg.gif
rename to template/.polarion/icons/Capella_ClassPkg.gif
diff --git a/template/.polarion/icons/ClassesDiagram.gif b/template/.polarion/icons/Capella_ClassesDiagram.gif
similarity index 100%
rename from template/.polarion/icons/ClassesDiagram.gif
rename to template/.polarion/icons/Capella_ClassesDiagram.gif
diff --git a/template/.polarion/icons/Collection.gif b/template/.polarion/icons/Capella_Collection.gif
similarity index 100%
rename from template/.polarion/icons/Collection.gif
rename to template/.polarion/icons/Capella_Collection.gif
diff --git a/template/.polarion/icons/CollectionMaxCardReference.gif b/template/.polarion/icons/Capella_CollectionMaxCardReference.gif
similarity index 100%
rename from template/.polarion/icons/CollectionMaxCardReference.gif
rename to template/.polarion/icons/Capella_CollectionMaxCardReference.gif
diff --git a/template/.polarion/icons/CollectionMinCardReference.gif b/template/.polarion/icons/Capella_CollectionMinCardReference.gif
similarity index 100%
rename from template/.polarion/icons/CollectionMinCardReference.gif
rename to template/.polarion/icons/Capella_CollectionMinCardReference.gif
diff --git a/template/.polarion/icons/CombinedFragment.gif b/template/.polarion/icons/Capella_CombinedFragment.gif
similarity index 100%
rename from template/.polarion/icons/CombinedFragment.gif
rename to template/.polarion/icons/Capella_CombinedFragment.gif
diff --git a/template/.polarion/icons/CommunicationInterfaceImplementation.gif b/template/.polarion/icons/Capella_CommunicationInterfaceImplementation.gif
similarity index 100%
rename from template/.polarion/icons/CommunicationInterfaceImplementation.gif
rename to template/.polarion/icons/Capella_CommunicationInterfaceImplementation.gif
diff --git a/template/.polarion/icons/CommunicationInterfaceUse.gif b/template/.polarion/icons/Capella_CommunicationInterfaceUse.gif
similarity index 100%
rename from template/.polarion/icons/CommunicationInterfaceUse.gif
rename to template/.polarion/icons/Capella_CommunicationInterfaceUse.gif
diff --git a/template/.polarion/icons/CommunicationLink.gif b/template/.polarion/icons/Capella_CommunicationLink.gif
similarity index 100%
rename from template/.polarion/icons/CommunicationLink.gif
rename to template/.polarion/icons/Capella_CommunicationLink.gif
diff --git a/template/.polarion/icons/CommunicationLinkAccess.gif b/template/.polarion/icons/Capella_CommunicationLinkAccess.gif
similarity index 100%
rename from template/.polarion/icons/CommunicationLinkAccess.gif
rename to template/.polarion/icons/Capella_CommunicationLinkAccess.gif
diff --git a/template/.polarion/icons/CommunicationLinkAcquire.gif b/template/.polarion/icons/Capella_CommunicationLinkAcquire.gif
similarity index 100%
rename from template/.polarion/icons/CommunicationLinkAcquire.gif
rename to template/.polarion/icons/Capella_CommunicationLinkAcquire.gif
diff --git a/template/.polarion/icons/CommunicationLinkAllocation.gif b/template/.polarion/icons/Capella_CommunicationLinkAllocation.gif
similarity index 100%
rename from template/.polarion/icons/CommunicationLinkAllocation.gif
rename to template/.polarion/icons/Capella_CommunicationLinkAllocation.gif
diff --git a/template/.polarion/icons/CommunicationLinkCall.gif b/template/.polarion/icons/Capella_CommunicationLinkCall.gif
similarity index 100%
rename from template/.polarion/icons/CommunicationLinkCall.gif
rename to template/.polarion/icons/Capella_CommunicationLinkCall.gif
diff --git a/template/.polarion/icons/CommunicationLinkConsume.gif b/template/.polarion/icons/Capella_CommunicationLinkConsume.gif
similarity index 100%
rename from template/.polarion/icons/CommunicationLinkConsume.gif
rename to template/.polarion/icons/Capella_CommunicationLinkConsume.gif
diff --git a/template/.polarion/icons/CommunicationLinkExecute.gif b/template/.polarion/icons/Capella_CommunicationLinkExecute.gif
similarity index 100%
rename from template/.polarion/icons/CommunicationLinkExecute.gif
rename to template/.polarion/icons/Capella_CommunicationLinkExecute.gif
diff --git a/template/.polarion/icons/CommunicationLinkProduce.gif b/template/.polarion/icons/Capella_CommunicationLinkProduce.gif
similarity index 100%
rename from template/.polarion/icons/CommunicationLinkProduce.gif
rename to template/.polarion/icons/Capella_CommunicationLinkProduce.gif
diff --git a/template/.polarion/icons/CommunicationLinkReceive.gif b/template/.polarion/icons/Capella_CommunicationLinkReceive.gif
similarity index 100%
rename from template/.polarion/icons/CommunicationLinkReceive.gif
rename to template/.polarion/icons/Capella_CommunicationLinkReceive.gif
diff --git a/template/.polarion/icons/CommunicationLinkSend.gif b/template/.polarion/icons/Capella_CommunicationLinkSend.gif
similarity index 100%
rename from template/.polarion/icons/CommunicationLinkSend.gif
rename to template/.polarion/icons/Capella_CommunicationLinkSend.gif
diff --git a/template/.polarion/icons/CommunicationLinkTransmit.gif b/template/.polarion/icons/Capella_CommunicationLinkTransmit.gif
similarity index 100%
rename from template/.polarion/icons/CommunicationLinkTransmit.gif
rename to template/.polarion/icons/Capella_CommunicationLinkTransmit.gif
diff --git a/template/.polarion/icons/CommunicationLinkWrite.gif b/template/.polarion/icons/Capella_CommunicationLinkWrite.gif
similarity index 100%
rename from template/.polarion/icons/CommunicationLinkWrite.gif
rename to template/.polarion/icons/Capella_CommunicationLinkWrite.gif
diff --git a/template/.polarion/icons/CommunicationModelFile.gif b/template/.polarion/icons/Capella_CommunicationModelFile.gif
similarity index 100%
rename from template/.polarion/icons/CommunicationModelFile.gif
rename to template/.polarion/icons/Capella_CommunicationModelFile.gif
diff --git a/template/.polarion/icons/CommunityOfInterest.gif b/template/.polarion/icons/Capella_CommunityOfInterest.gif
similarity index 100%
rename from template/.polarion/icons/CommunityOfInterest.gif
rename to template/.polarion/icons/Capella_CommunityOfInterest.gif
diff --git a/template/.polarion/icons/CommunityOfInterestComposition.gif b/template/.polarion/icons/Capella_CommunityOfInterestComposition.gif
similarity index 100%
rename from template/.polarion/icons/CommunityOfInterestComposition.gif
rename to template/.polarion/icons/Capella_CommunityOfInterestComposition.gif
diff --git a/template/.polarion/icons/ComplexValue.gif b/template/.polarion/icons/Capella_ComplexValue.gif
similarity index 100%
rename from template/.polarion/icons/ComplexValue.gif
rename to template/.polarion/icons/Capella_ComplexValue.gif
diff --git a/template/.polarion/icons/ComplexValueReference.gif b/template/.polarion/icons/Capella_ComplexValueReference.gif
similarity index 100%
rename from template/.polarion/icons/ComplexValueReference.gif
rename to template/.polarion/icons/Capella_ComplexValueReference.gif
diff --git a/template/.polarion/icons/ComponentAllocation.gif b/template/.polarion/icons/Capella_ComponentAllocation.gif
similarity index 100%
rename from template/.polarion/icons/ComponentAllocation.gif
rename to template/.polarion/icons/Capella_ComponentAllocation.gif
diff --git a/template/.polarion/icons/ComponentArchitectureDiagram.gif b/template/.polarion/icons/Capella_ComponentArchitectureDiagram.gif
similarity index 100%
rename from template/.polarion/icons/ComponentArchitectureDiagram.gif
rename to template/.polarion/icons/Capella_ComponentArchitectureDiagram.gif
diff --git a/template/.polarion/icons/ComponentExchangeRealisation.gif b/template/.polarion/icons/Capella_ComponentExchangeRealisation.gif
similarity index 100%
rename from template/.polarion/icons/ComponentExchangeRealisation.gif
rename to template/.polarion/icons/Capella_ComponentExchangeRealisation.gif
diff --git a/template/.polarion/icons/ComponentFunctionalAllocation.gif b/template/.polarion/icons/Capella_ComponentFunctionalAllocation.gif
similarity index 100%
rename from template/.polarion/icons/ComponentFunctionalAllocation.gif
rename to template/.polarion/icons/Capella_ComponentFunctionalAllocation.gif
diff --git a/template/.polarion/icons/ComponentInstance.gif b/template/.polarion/icons/Capella_ComponentInstance.gif
similarity index 100%
rename from template/.polarion/icons/ComponentInstance.gif
rename to template/.polarion/icons/Capella_ComponentInstance.gif
diff --git a/template/.polarion/icons/ComponentInstanceNodePC.gif b/template/.polarion/icons/Capella_ComponentInstanceNodePC.gif
similarity index 100%
rename from template/.polarion/icons/ComponentInstanceNodePC.gif
rename to template/.polarion/icons/Capella_ComponentInstanceNodePC.gif
diff --git a/template/.polarion/icons/ComponentInstancePkg.gif b/template/.polarion/icons/Capella_ComponentInstancePkg.gif
similarity index 100%
rename from template/.polarion/icons/ComponentInstancePkg.gif
rename to template/.polarion/icons/Capella_ComponentInstancePkg.gif
diff --git a/template/.polarion/icons/ComponentPort_WB.gif b/template/.polarion/icons/Capella_ComponentPort_WB.gif
similarity index 100%
rename from template/.polarion/icons/ComponentPort_WB.gif
rename to template/.polarion/icons/Capella_ComponentPort_WB.gif
diff --git a/template/.polarion/icons/Concept.gif b/template/.polarion/icons/Capella_Concept.gif
similarity index 100%
rename from template/.polarion/icons/Concept.gif
rename to template/.polarion/icons/Capella_Concept.gif
diff --git a/template/.polarion/icons/ConceptCompliance.gif b/template/.polarion/icons/Capella_ConceptCompliance.gif
similarity index 100%
rename from template/.polarion/icons/ConceptCompliance.gif
rename to template/.polarion/icons/Capella_ConceptCompliance.gif
diff --git a/template/.polarion/icons/ConceptPkg.gif b/template/.polarion/icons/Capella_ConceptPkg.gif
similarity index 100%
rename from template/.polarion/icons/ConceptPkg.gif
rename to template/.polarion/icons/Capella_ConceptPkg.gif
diff --git a/template/.polarion/icons/ConfigurationItemPkg.gif b/template/.polarion/icons/Capella_ConfigurationItemPkg.gif
similarity index 100%
rename from template/.polarion/icons/ConfigurationItemPkg.gif
rename to template/.polarion/icons/Capella_ConfigurationItemPkg.gif
diff --git a/template/.polarion/icons/CommunicationMean.gif b/template/.polarion/icons/Capella_Connection.gif
similarity index 100%
rename from template/.polarion/icons/CommunicationMean.gif
rename to template/.polarion/icons/Capella_Connection.gif
diff --git a/template/.polarion/icons/Connector.gif b/template/.polarion/icons/Capella_Connector.gif
similarity index 100%
rename from template/.polarion/icons/Connector.gif
rename to template/.polarion/icons/Capella_Connector.gif
diff --git a/template/.polarion/icons/ConnectorEnd.gif b/template/.polarion/icons/Capella_ConnectorEnd.gif
similarity index 100%
rename from template/.polarion/icons/ConnectorEnd.gif
rename to template/.polarion/icons/Capella_ConnectorEnd.gif
diff --git a/template/.polarion/icons/ConstraintDuration.gif b/template/.polarion/icons/Capella_ConstraintDuration.gif
similarity index 100%
rename from template/.polarion/icons/ConstraintDuration.gif
rename to template/.polarion/icons/Capella_ConstraintDuration.gif
diff --git a/template/.polarion/icons/ContextArchitecture.gif b/template/.polarion/icons/Capella_ContextArchitecture.gif
similarity index 100%
rename from template/.polarion/icons/ContextArchitecture.gif
rename to template/.polarion/icons/Capella_ContextArchitecture.gif
diff --git a/template/.polarion/icons/ContextArchitectureRealisation.gif b/template/.polarion/icons/Capella_ContextArchitectureRealisation.gif
similarity index 100%
rename from template/.polarion/icons/ContextArchitectureRealisation.gif
rename to template/.polarion/icons/Capella_ContextArchitectureRealisation.gif
diff --git a/template/.polarion/icons/ContextInterfaceRealisation.gif b/template/.polarion/icons/Capella_ContextInterfaceRealisation.gif
similarity index 100%
rename from template/.polarion/icons/ContextInterfaceRealisation.gif
rename to template/.polarion/icons/Capella_ContextInterfaceRealisation.gif
diff --git a/template/.polarion/icons/ControlFlow.gif b/template/.polarion/icons/Capella_ControlFlow.gif
similarity index 100%
rename from template/.polarion/icons/ControlFlow.gif
rename to template/.polarion/icons/Capella_ControlFlow.gif
diff --git a/template/.polarion/icons/ControlNode.gif b/template/.polarion/icons/Capella_ControlNode.gif
similarity index 100%
rename from template/.polarion/icons/ControlNode.gif
rename to template/.polarion/icons/Capella_ControlNode.gif
diff --git a/template/.polarion/icons/ControlNode_And.gif b/template/.polarion/icons/Capella_ControlNode_And.gif
similarity index 100%
rename from template/.polarion/icons/ControlNode_And.gif
rename to template/.polarion/icons/Capella_ControlNode_And.gif
diff --git a/template/.polarion/icons/ControlNode_Iterate.gif b/template/.polarion/icons/Capella_ControlNode_Iterate.gif
similarity index 100%
rename from template/.polarion/icons/ControlNode_Iterate.gif
rename to template/.polarion/icons/Capella_ControlNode_Iterate.gif
diff --git a/template/.polarion/icons/ControlNode_Or.gif b/template/.polarion/icons/Capella_ControlNode_Or.gif
similarity index 100%
rename from template/.polarion/icons/ControlNode_Or.gif
rename to template/.polarion/icons/Capella_ControlNode_Or.gif
diff --git a/template/.polarion/icons/CreateSequenceMessage.gif b/template/.polarion/icons/Capella_CreateSequenceMessage.gif
similarity index 100%
rename from template/.polarion/icons/CreateSequenceMessage.gif
rename to template/.polarion/icons/Capella_CreateSequenceMessage.gif
diff --git a/template/.polarion/icons/CreationEvent.gif b/template/.polarion/icons/Capella_CreationEvent.gif
similarity index 100%
rename from template/.polarion/icons/CreationEvent.gif
rename to template/.polarion/icons/Capella_CreationEvent.gif
diff --git a/template/.polarion/icons/CsModelFile.gif b/template/.polarion/icons/Capella_CsModelFile.gif
similarity index 100%
rename from template/.polarion/icons/CsModelFile.gif
rename to template/.polarion/icons/Capella_CsModelFile.gif
diff --git a/template/.polarion/icons/CtxModelFile.gif b/template/.polarion/icons/Capella_CtxModelFile.gif
similarity index 100%
rename from template/.polarion/icons/CtxModelFile.gif
rename to template/.polarion/icons/Capella_CtxModelFile.gif
diff --git a/template/.polarion/icons/DAnalysis.png b/template/.polarion/icons/Capella_DAnalysis.png
similarity index 100%
rename from template/.polarion/icons/DAnalysis.png
rename to template/.polarion/icons/Capella_DAnalysis.png
diff --git a/template/.polarion/icons/DBS_AbstractType_Entity.gif b/template/.polarion/icons/Capella_DBS_AbstractType_Entity.gif
similarity index 100%
rename from template/.polarion/icons/DBS_AbstractType_Entity.gif
rename to template/.polarion/icons/Capella_DBS_AbstractType_Entity.gif
diff --git a/template/.polarion/icons/DBS_GlossarAZ.gif b/template/.polarion/icons/Capella_DBS_GlossarAZ.gif
similarity index 100%
rename from template/.polarion/icons/DBS_GlossarAZ.gif
rename to template/.polarion/icons/Capella_DBS_GlossarAZ.gif
diff --git a/template/.polarion/icons/DataAllocation.gif b/template/.polarion/icons/Capella_DataAllocation.gif
similarity index 100%
rename from template/.polarion/icons/DataAllocation.gif
rename to template/.polarion/icons/Capella_DataAllocation.gif
diff --git a/template/.polarion/icons/DataContext.gif b/template/.polarion/icons/Capella_DataContext.gif
similarity index 100%
rename from template/.polarion/icons/DataContext.gif
rename to template/.polarion/icons/Capella_DataContext.gif
diff --git a/template/.polarion/icons/DataDefinition.gif b/template/.polarion/icons/Capella_DataDefinition.gif
similarity index 100%
rename from template/.polarion/icons/DataDefinition.gif
rename to template/.polarion/icons/Capella_DataDefinition.gif
diff --git a/template/.polarion/icons/DataImplementation.gif b/template/.polarion/icons/Capella_DataImplementation.gif
similarity index 100%
rename from template/.polarion/icons/DataImplementation.gif
rename to template/.polarion/icons/Capella_DataImplementation.gif
diff --git a/template/.polarion/icons/DataServiceProviderInterface.gif b/template/.polarion/icons/Capella_DataServiceProviderInterface.gif
similarity index 100%
rename from template/.polarion/icons/DataServiceProviderInterface.gif
rename to template/.polarion/icons/Capella_DataServiceProviderInterface.gif
diff --git a/template/.polarion/icons/DataSignalReceiverInterface.gif b/template/.polarion/icons/Capella_DataSignalReceiverInterface.gif
similarity index 100%
rename from template/.polarion/icons/DataSignalReceiverInterface.gif
rename to template/.polarion/icons/Capella_DataSignalReceiverInterface.gif
diff --git a/template/.polarion/icons/DataTypePkg.gif b/template/.polarion/icons/Capella_DataTypePkg.gif
similarity index 100%
rename from template/.polarion/icons/DataTypePkg.gif
rename to template/.polarion/icons/Capella_DataTypePkg.gif
diff --git a/template/.polarion/icons/DataValueReferenceLink.gif b/template/.polarion/icons/Capella_DataValueReferenceLink.gif
similarity index 100%
rename from template/.polarion/icons/DataValueReferenceLink.gif
rename to template/.polarion/icons/Capella_DataValueReferenceLink.gif
diff --git a/template/.polarion/icons/DatatypeModelFile.gif b/template/.polarion/icons/Capella_DatatypeModelFile.gif
similarity index 100%
rename from template/.polarion/icons/DatatypeModelFile.gif
rename to template/.polarion/icons/Capella_DatatypeModelFile.gif
diff --git a/template/.polarion/icons/DatavalueModelFile.gif b/template/.polarion/icons/Capella_DatavalueModelFile.gif
similarity index 100%
rename from template/.polarion/icons/DatavalueModelFile.gif
rename to template/.polarion/icons/Capella_DatavalueModelFile.gif
diff --git a/template/.polarion/icons/DecisionNode.gif b/template/.polarion/icons/Capella_DecisionNode.gif
similarity index 100%
rename from template/.polarion/icons/DecisionNode.gif
rename to template/.polarion/icons/Capella_DecisionNode.gif
diff --git a/template/.polarion/icons/DeleteSequenceMessage.gif b/template/.polarion/icons/Capella_DeleteSequenceMessage.gif
similarity index 100%
rename from template/.polarion/icons/DeleteSequenceMessage.gif
rename to template/.polarion/icons/Capella_DeleteSequenceMessage.gif
diff --git a/template/.polarion/icons/DeploymentAspect.gif b/template/.polarion/icons/Capella_DeploymentAspect.gif
similarity index 100%
rename from template/.polarion/icons/DeploymentAspect.gif
rename to template/.polarion/icons/Capella_DeploymentAspect.gif
diff --git a/template/.polarion/icons/DeploymentComponent.gif b/template/.polarion/icons/Capella_DeploymentComponent.gif
similarity index 100%
rename from template/.polarion/icons/DeploymentComponent.gif
rename to template/.polarion/icons/Capella_DeploymentComponent.gif
diff --git a/template/.polarion/icons/DeploymentComponentRepresentationLink.gif b/template/.polarion/icons/Capella_DeploymentComponentRepresentationLink.gif
similarity index 100%
rename from template/.polarion/icons/DeploymentComponentRepresentationLink.gif
rename to template/.polarion/icons/Capella_DeploymentComponentRepresentationLink.gif
diff --git a/template/.polarion/icons/DeploymentConfLink.gif b/template/.polarion/icons/Capella_DeploymentConfLink.gif
similarity index 100%
rename from template/.polarion/icons/DeploymentConfLink.gif
rename to template/.polarion/icons/Capella_DeploymentConfLink.gif
diff --git a/template/.polarion/icons/DeploymentConfiguration.gif b/template/.polarion/icons/Capella_DeploymentConfiguration.gif
similarity index 100%
rename from template/.polarion/icons/DeploymentConfiguration.gif
rename to template/.polarion/icons/Capella_DeploymentConfiguration.gif
diff --git a/template/.polarion/icons/DeploymentDiagram.gif b/template/.polarion/icons/Capella_DeploymentDiagram.gif
similarity index 100%
rename from template/.polarion/icons/DeploymentDiagram.gif
rename to template/.polarion/icons/Capella_DeploymentDiagram.gif
diff --git a/template/.polarion/icons/DeploymentElementDependency.gif b/template/.polarion/icons/Capella_DeploymentElementDependency.gif
similarity index 100%
rename from template/.polarion/icons/DeploymentElementDependency.gif
rename to template/.polarion/icons/Capella_DeploymentElementDependency.gif
diff --git a/template/.polarion/icons/DeploymentLink.gif b/template/.polarion/icons/Capella_DeploymentLink.gif
similarity index 100%
rename from template/.polarion/icons/DeploymentLink.gif
rename to template/.polarion/icons/Capella_DeploymentLink.gif
diff --git a/template/.polarion/icons/DeploymentNode.gif b/template/.polarion/icons/Capella_DeploymentNode.gif
similarity index 100%
rename from template/.polarion/icons/DeploymentNode.gif
rename to template/.polarion/icons/Capella_DeploymentNode.gif
diff --git a/template/.polarion/icons/DeploymentNodeRepresentationLink.gif b/template/.polarion/icons/Capella_DeploymentNodeRepresentationLink.gif
similarity index 100%
rename from template/.polarion/icons/DeploymentNodeRepresentationLink.gif
rename to template/.polarion/icons/Capella_DeploymentNodeRepresentationLink.gif
diff --git a/template/.polarion/icons/DeploymentType.gif b/template/.polarion/icons/Capella_DeploymentType.gif
similarity index 100%
rename from template/.polarion/icons/DeploymentType.gif
rename to template/.polarion/icons/Capella_DeploymentType.gif
diff --git a/template/.polarion/icons/Description.gif b/template/.polarion/icons/Capella_Description.gif
similarity index 100%
rename from template/.polarion/icons/Description.gif
rename to template/.polarion/icons/Capella_Description.gif
diff --git a/template/.polarion/icons/DescriptionSummary.gif b/template/.polarion/icons/Capella_DescriptionSummary.gif
similarity index 100%
rename from template/.polarion/icons/DescriptionSummary.gif
rename to template/.polarion/icons/Capella_DescriptionSummary.gif
diff --git a/template/.polarion/icons/DestructionEvent.gif b/template/.polarion/icons/Capella_DestructionEvent.gif
similarity index 100%
rename from template/.polarion/icons/DestructionEvent.gif
rename to template/.polarion/icons/Capella_DestructionEvent.gif
diff --git a/template/.polarion/icons/Diagram.gif b/template/.polarion/icons/Capella_Diagram.gif
similarity index 100%
rename from template/.polarion/icons/Diagram.gif
rename to template/.polarion/icons/Capella_Diagram.gif
diff --git a/template/.polarion/icons/Discriminant.gif b/template/.polarion/icons/Capella_Discriminant.gif
similarity index 100%
rename from template/.polarion/icons/Discriminant.gif
rename to template/.polarion/icons/Capella_Discriminant.gif
diff --git a/template/.polarion/icons/DoccapellaModelFile.gif b/template/.polarion/icons/Capella_DoccapellaModelFile.gif
similarity index 100%
rename from template/.polarion/icons/DoccapellaModelFile.gif
rename to template/.polarion/icons/Capella_DoccapellaModelFile.gif
diff --git a/template/.polarion/icons/DocmelodyModelFile.gif b/template/.polarion/icons/Capella_DocmelodyModelFile.gif
similarity index 100%
rename from template/.polarion/icons/DocmelodyModelFile.gif
rename to template/.polarion/icons/Capella_DocmelodyModelFile.gif
diff --git a/template/.polarion/icons/DocumentationRoot.gif b/template/.polarion/icons/Capella_DocumentationRoot.gif
similarity index 100%
rename from template/.polarion/icons/DocumentationRoot.gif
rename to template/.polarion/icons/Capella_DocumentationRoot.gif
diff --git a/template/.polarion/icons/DomainElement.gif b/template/.polarion/icons/Capella_DomainElement.gif
similarity index 100%
rename from template/.polarion/icons/DomainElement.gif
rename to template/.polarion/icons/Capella_DomainElement.gif
diff --git a/template/.polarion/icons/Dslhelper.gif b/template/.polarion/icons/Capella_Dslhelper.gif
similarity index 100%
rename from template/.polarion/icons/Dslhelper.gif
rename to template/.polarion/icons/Capella_Dslhelper.gif
diff --git a/template/.polarion/icons/EPBSArchitecture.gif b/template/.polarion/icons/Capella_EPBSArchitecture.gif
similarity index 100%
rename from template/.polarion/icons/EPBSArchitecture.gif
rename to template/.polarion/icons/Capella_EPBSArchitecture.gif
diff --git a/template/.polarion/icons/EPBSArchitecturePkg.gif b/template/.polarion/icons/Capella_EPBSArchitecturePkg.gif
similarity index 100%
rename from template/.polarion/icons/EPBSArchitecturePkg.gif
rename to template/.polarion/icons/Capella_EPBSArchitecturePkg.gif
diff --git a/template/.polarion/icons/EPBSComponentInterfaceDiagram.gif b/template/.polarion/icons/Capella_EPBSComponentInterfaceDiagram.gif
similarity index 100%
rename from template/.polarion/icons/EPBSComponentInterfaceDiagram.gif
rename to template/.polarion/icons/Capella_EPBSComponentInterfaceDiagram.gif
diff --git a/template/.polarion/icons/EPBSGlobalArchitectureDiagram.gif b/template/.polarion/icons/Capella_EPBSGlobalArchitectureDiagram.gif
similarity index 100%
rename from template/.polarion/icons/EPBSGlobalArchitectureDiagram.gif
rename to template/.polarion/icons/Capella_EPBSGlobalArchitectureDiagram.gif
diff --git a/template/.polarion/icons/EPBSLocalArchitectureDiagram.gif b/template/.polarion/icons/Capella_EPBSLocalArchitectureDiagram.gif
similarity index 100%
rename from template/.polarion/icons/EPBSLocalArchitectureDiagram.gif
rename to template/.polarion/icons/Capella_EPBSLocalArchitectureDiagram.gif
diff --git a/template/.polarion/icons/EPBSPortAndInterfaceDiagram.gif b/template/.polarion/icons/Capella_EPBSPortAndInterfaceDiagram.gif
similarity index 100%
rename from template/.polarion/icons/EPBSPortAndInterfaceDiagram.gif
rename to template/.polarion/icons/Capella_EPBSPortAndInterfaceDiagram.gif
diff --git a/template/.polarion/icons/EPBSRealizationDiagram.gif b/template/.polarion/icons/Capella_EPBSRealizationDiagram.gif
similarity index 100%
rename from template/.polarion/icons/EPBSRealizationDiagram.gif
rename to template/.polarion/icons/Capella_EPBSRealizationDiagram.gif
diff --git a/template/.polarion/icons/ElementExchange.gif b/template/.polarion/icons/Capella_ElementExchange.gif
similarity index 100%
rename from template/.polarion/icons/ElementExchange.gif
rename to template/.polarion/icons/Capella_ElementExchange.gif
diff --git a/template/.polarion/icons/EntityAssemblyUsage.gif b/template/.polarion/icons/Capella_EntityAssemblyUsage.gif
similarity index 100%
rename from template/.polarion/icons/EntityAssemblyUsage.gif
rename to template/.polarion/icons/Capella_EntityAssemblyUsage.gif
diff --git a/template/.polarion/icons/EntityBehavior.gif b/template/.polarion/icons/Capella_EntityBehavior.gif
similarity index 100%
rename from template/.polarion/icons/EntityBehavior.gif
rename to template/.polarion/icons/Capella_EntityBehavior.gif
diff --git a/template/.polarion/icons/EntityExchange.gif b/template/.polarion/icons/Capella_EntityExchange.gif
similarity index 100%
rename from template/.polarion/icons/EntityExchange.gif
rename to template/.polarion/icons/Capella_EntityExchange.gif
diff --git a/template/.polarion/icons/EntityPkg.gif b/template/.polarion/icons/Capella_EntityPkg.gif
similarity index 100%
rename from template/.polarion/icons/EntityPkg.gif
rename to template/.polarion/icons/Capella_EntityPkg.gif
diff --git a/template/.polarion/icons/Enumeration.gif b/template/.polarion/icons/Capella_Enumeration.gif
similarity index 100%
rename from template/.polarion/icons/Enumeration.gif
rename to template/.polarion/icons/Capella_Enumeration.gif
diff --git a/template/.polarion/icons/EnumerationLiteral.gif b/template/.polarion/icons/Capella_EnumerationLiteral.gif
similarity index 100%
rename from template/.polarion/icons/EnumerationLiteral.gif
rename to template/.polarion/icons/Capella_EnumerationLiteral.gif
diff --git a/template/.polarion/icons/EnumerationLiteralReferenceLink.gif b/template/.polarion/icons/Capella_EnumerationLiteralReferenceLink.gif
similarity index 100%
rename from template/.polarion/icons/EnumerationLiteralReferenceLink.gif
rename to template/.polarion/icons/Capella_EnumerationLiteralReferenceLink.gif
diff --git a/template/.polarion/icons/EnumerationReference.gif b/template/.polarion/icons/Capella_EnumerationReference.gif
similarity index 100%
rename from template/.polarion/icons/EnumerationReference.gif
rename to template/.polarion/icons/Capella_EnumerationReference.gif
diff --git a/template/.polarion/icons/EnumerationValue.gif b/template/.polarion/icons/Capella_EnumerationValue.gif
similarity index 100%
rename from template/.polarion/icons/EnumerationValue.gif
rename to template/.polarion/icons/Capella_EnumerationValue.gif
diff --git a/template/.polarion/icons/EpbsModelFile.gif b/template/.polarion/icons/Capella_EpbsModelFile.gif
similarity index 100%
rename from template/.polarion/icons/EpbsModelFile.gif
rename to template/.polarion/icons/Capella_EpbsModelFile.gif
diff --git a/template/.polarion/icons/EventReceiptOperation.gif b/template/.polarion/icons/Capella_EventReceiptOperation.gif
similarity index 100%
rename from template/.polarion/icons/EventReceiptOperation.gif
rename to template/.polarion/icons/Capella_EventReceiptOperation.gif
diff --git a/template/.polarion/icons/EventSentOperation.gif b/template/.polarion/icons/Capella_EventSentOperation.gif
similarity index 100%
rename from template/.polarion/icons/EventSentOperation.gif
rename to template/.polarion/icons/Capella_EventSentOperation.gif
diff --git a/template/.polarion/icons/Exception.gif b/template/.polarion/icons/Capella_Exception.gif
similarity index 100%
rename from template/.polarion/icons/Exception.gif
rename to template/.polarion/icons/Capella_Exception.gif
diff --git a/template/.polarion/icons/ExceptionDiagram.gif b/template/.polarion/icons/Capella_ExceptionDiagram.gif
similarity index 100%
rename from template/.polarion/icons/ExceptionDiagram.gif
rename to template/.polarion/icons/Capella_ExceptionDiagram.gif
diff --git a/template/.polarion/icons/ExceptionHandler.gif b/template/.polarion/icons/Capella_ExceptionHandler.gif
similarity index 100%
rename from template/.polarion/icons/ExceptionHandler.gif
rename to template/.polarion/icons/Capella_ExceptionHandler.gif
diff --git a/template/.polarion/icons/ExceptionPkg.gif b/template/.polarion/icons/Capella_ExceptionPkg.gif
similarity index 100%
rename from template/.polarion/icons/ExceptionPkg.gif
rename to template/.polarion/icons/Capella_ExceptionPkg.gif
diff --git a/template/.polarion/icons/ExceptionsDiagram.gif b/template/.polarion/icons/Capella_ExceptionsDiagram.gif
similarity index 100%
rename from template/.polarion/icons/ExceptionsDiagram.gif
rename to template/.polarion/icons/Capella_ExceptionsDiagram.gif
diff --git a/template/.polarion/icons/Exchange.gif b/template/.polarion/icons/Capella_Exchange.gif
similarity index 100%
rename from template/.polarion/icons/Exchange.gif
rename to template/.polarion/icons/Capella_Exchange.gif
diff --git a/template/.polarion/icons/ExchangeCategory.gif b/template/.polarion/icons/Capella_ExchangeCategory.gif
similarity index 100%
rename from template/.polarion/icons/ExchangeCategory.gif
rename to template/.polarion/icons/Capella_ExchangeCategory.gif
diff --git a/template/.polarion/icons/ExchangeContainment.gif b/template/.polarion/icons/Capella_ExchangeContainment.gif
similarity index 100%
rename from template/.polarion/icons/ExchangeContainment.gif
rename to template/.polarion/icons/Capella_ExchangeContainment.gif
diff --git a/template/.polarion/icons/ExchangeDataLink.gif b/template/.polarion/icons/Capella_ExchangeDataLink.gif
similarity index 100%
rename from template/.polarion/icons/ExchangeDataLink.gif
rename to template/.polarion/icons/Capella_ExchangeDataLink.gif
diff --git a/template/.polarion/icons/ExchangeItemAllocation.gif b/template/.polarion/icons/Capella_ExchangeItemAllocation.gif
similarity index 100%
rename from template/.polarion/icons/ExchangeItemAllocation.gif
rename to template/.polarion/icons/Capella_ExchangeItemAllocation.gif
diff --git a/template/.polarion/icons/ExchangeItemData.gif b/template/.polarion/icons/Capella_ExchangeItemData.gif
similarity index 100%
rename from template/.polarion/icons/ExchangeItemData.gif
rename to template/.polarion/icons/Capella_ExchangeItemData.gif
diff --git a/template/.polarion/icons/ExchangeItemElement.gif b/template/.polarion/icons/Capella_ExchangeItemElement.gif
similarity index 100%
rename from template/.polarion/icons/ExchangeItemElement.gif
rename to template/.polarion/icons/Capella_ExchangeItemElement.gif
diff --git a/template/.polarion/icons/ExchangeItemEvent.gif b/template/.polarion/icons/Capella_ExchangeItemEvent.gif
similarity index 100%
rename from template/.polarion/icons/ExchangeItemEvent.gif
rename to template/.polarion/icons/Capella_ExchangeItemEvent.gif
diff --git a/template/.polarion/icons/ExchangeItemFlow.gif b/template/.polarion/icons/Capella_ExchangeItemFlow.gif
similarity index 100%
rename from template/.polarion/icons/ExchangeItemFlow.gif
rename to template/.polarion/icons/Capella_ExchangeItemFlow.gif
diff --git a/template/.polarion/icons/ExchangeItemOperation.gif b/template/.polarion/icons/Capella_ExchangeItemOperation.gif
similarity index 100%
rename from template/.polarion/icons/ExchangeItemOperation.gif
rename to template/.polarion/icons/Capella_ExchangeItemOperation.gif
diff --git a/template/.polarion/icons/ExchangeItemRealization.gif b/template/.polarion/icons/Capella_ExchangeItemRealization.gif
similarity index 100%
rename from template/.polarion/icons/ExchangeItemRealization.gif
rename to template/.polarion/icons/Capella_ExchangeItemRealization.gif
diff --git a/template/.polarion/icons/ExchangeLink.gif b/template/.polarion/icons/Capella_ExchangeLink.gif
similarity index 100%
rename from template/.polarion/icons/ExchangeLink.gif
rename to template/.polarion/icons/Capella_ExchangeLink.gif
diff --git a/template/.polarion/icons/ExchangePkg.gif b/template/.polarion/icons/Capella_ExchangePkg.gif
similarity index 100%
rename from template/.polarion/icons/ExchangePkg.gif
rename to template/.polarion/icons/Capella_ExchangePkg.gif
diff --git a/template/.polarion/icons/ExchangeTransitionAllocation.gif b/template/.polarion/icons/Capella_ExchangeTransitionAllocation.gif
similarity index 100%
rename from template/.polarion/icons/ExchangeTransitionAllocation.gif
rename to template/.polarion/icons/Capella_ExchangeTransitionAllocation.gif
diff --git a/template/.polarion/icons/ExchangedElement.gif b/template/.polarion/icons/Capella_ExchangedElement.gif
similarity index 100%
rename from template/.polarion/icons/ExchangedElement.gif
rename to template/.polarion/icons/Capella_ExchangedElement.gif
diff --git a/template/.polarion/icons/Execution.gif b/template/.polarion/icons/Capella_Execution.gif
similarity index 100%
rename from template/.polarion/icons/Execution.gif
rename to template/.polarion/icons/Capella_Execution.gif
diff --git a/template/.polarion/icons/ExecutionEnd.gif b/template/.polarion/icons/Capella_ExecutionEnd.gif
similarity index 100%
rename from template/.polarion/icons/ExecutionEnd.gif
rename to template/.polarion/icons/Capella_ExecutionEnd.gif
diff --git a/template/.polarion/icons/ExecutionEvent.gif b/template/.polarion/icons/Capella_ExecutionEvent.gif
similarity index 100%
rename from template/.polarion/icons/ExecutionEvent.gif
rename to template/.polarion/icons/Capella_ExecutionEvent.gif
diff --git a/template/.polarion/icons/Extend.gif b/template/.polarion/icons/Capella_Extend.gif
similarity index 100%
rename from template/.polarion/icons/Extend.gif
rename to template/.polarion/icons/Capella_Extend.gif
diff --git a/template/.polarion/icons/FaModelFile.gif b/template/.polarion/icons/Capella_FaModelFile.gif
similarity index 100%
rename from template/.polarion/icons/FaModelFile.gif
rename to template/.polarion/icons/Capella_FaModelFile.gif
diff --git a/template/.polarion/icons/FinalNode.gif b/template/.polarion/icons/Capella_FinalNode.gif
similarity index 100%
rename from template/.polarion/icons/FinalNode.gif
rename to template/.polarion/icons/Capella_FinalNode.gif
diff --git a/template/.polarion/icons/FinalState.gif b/template/.polarion/icons/Capella_FinalState.gif
similarity index 100%
rename from template/.polarion/icons/FinalState.gif
rename to template/.polarion/icons/Capella_FinalState.gif
diff --git a/template/.polarion/icons/FlowFinalNode.gif b/template/.polarion/icons/Capella_FlowFinalNode.gif
similarity index 100%
rename from template/.polarion/icons/FlowFinalNode.gif
rename to template/.polarion/icons/Capella_FlowFinalNode.gif
diff --git a/template/.polarion/icons/FlowPort.gif b/template/.polarion/icons/Capella_FlowPort.gif
similarity index 100%
rename from template/.polarion/icons/FlowPort.gif
rename to template/.polarion/icons/Capella_FlowPort.gif
diff --git a/template/.polarion/icons/FlowPortIn.gif b/template/.polarion/icons/Capella_FlowPortIn.gif
similarity index 100%
rename from template/.polarion/icons/FlowPortIn.gif
rename to template/.polarion/icons/Capella_FlowPortIn.gif
diff --git a/template/.polarion/icons/FlowPortOut.gif b/template/.polarion/icons/Capella_FlowPortOut.gif
similarity index 100%
rename from template/.polarion/icons/FlowPortOut.gif
rename to template/.polarion/icons/Capella_FlowPortOut.gif
diff --git a/template/.polarion/icons/FlowSpecification.gif b/template/.polarion/icons/Capella_FlowSpecification.gif
similarity index 100%
rename from template/.polarion/icons/FlowSpecification.gif
rename to template/.polarion/icons/Capella_FlowSpecification.gif
diff --git a/template/.polarion/icons/Folder.gif b/template/.polarion/icons/Capella_Folder.gif
similarity index 100%
rename from template/.polarion/icons/Folder.gif
rename to template/.polarion/icons/Capella_Folder.gif
diff --git a/template/.polarion/icons/ForkNode.gif b/template/.polarion/icons/Capella_ForkNode.gif
similarity index 100%
rename from template/.polarion/icons/ForkNode.gif
rename to template/.polarion/icons/Capella_ForkNode.gif
diff --git a/template/.polarion/icons/ForkPseudoState.gif b/template/.polarion/icons/Capella_ForkPseudoState.gif
similarity index 100%
rename from template/.polarion/icons/ForkPseudoState.gif
rename to template/.polarion/icons/Capella_ForkPseudoState.gif
diff --git a/template/.polarion/icons/FoundMessage.gif b/template/.polarion/icons/Capella_FoundMessage.gif
similarity index 100%
rename from template/.polarion/icons/FoundMessage.gif
rename to template/.polarion/icons/Capella_FoundMessage.gif
diff --git a/template/.polarion/icons/Function.gif b/template/.polarion/icons/Capella_Function.gif
similarity index 100%
rename from template/.polarion/icons/Function.gif
rename to template/.polarion/icons/Capella_Function.gif
diff --git a/template/.polarion/icons/FunctionActionAllocation.gif b/template/.polarion/icons/Capella_FunctionActionAllocation.gif
similarity index 100%
rename from template/.polarion/icons/FunctionActionAllocation.gif
rename to template/.polarion/icons/Capella_FunctionActionAllocation.gif
diff --git a/template/.polarion/icons/FunctionAllocation.gif b/template/.polarion/icons/Capella_FunctionAllocation.gif
similarity index 100%
rename from template/.polarion/icons/FunctionAllocation.gif
rename to template/.polarion/icons/Capella_FunctionAllocation.gif
diff --git a/template/.polarion/icons/FunctionKind_Duplicate.gif b/template/.polarion/icons/Capella_FunctionKind_Duplicate.gif
similarity index 100%
rename from template/.polarion/icons/FunctionKind_Duplicate.gif
rename to template/.polarion/icons/Capella_FunctionKind_Duplicate.gif
diff --git a/template/.polarion/icons/FunctionKind_Gather.gif b/template/.polarion/icons/Capella_FunctionKind_Gather.gif
similarity index 100%
rename from template/.polarion/icons/FunctionKind_Gather.gif
rename to template/.polarion/icons/Capella_FunctionKind_Gather.gif
diff --git a/template/.polarion/icons/FunctionKind_Route.gif b/template/.polarion/icons/Capella_FunctionKind_Route.gif
similarity index 100%
rename from template/.polarion/icons/FunctionKind_Route.gif
rename to template/.polarion/icons/Capella_FunctionKind_Route.gif
diff --git a/template/.polarion/icons/FunctionKind_Select.gif b/template/.polarion/icons/Capella_FunctionKind_Select.gif
similarity index 100%
rename from template/.polarion/icons/FunctionKind_Select.gif
rename to template/.polarion/icons/Capella_FunctionKind_Select.gif
diff --git a/template/.polarion/icons/FunctionKind_Split.gif b/template/.polarion/icons/Capella_FunctionKind_Split.gif
similarity index 100%
rename from template/.polarion/icons/FunctionKind_Split.gif
rename to template/.polarion/icons/Capella_FunctionKind_Split.gif
diff --git a/template/.polarion/icons/FunctionPkg.gif b/template/.polarion/icons/Capella_FunctionPkg.gif
similarity index 100%
rename from template/.polarion/icons/FunctionPkg.gif
rename to template/.polarion/icons/Capella_FunctionPkg.gif
diff --git a/template/.polarion/icons/FunctionRealisation.gif b/template/.polarion/icons/Capella_FunctionRealisation.gif
similarity index 100%
rename from template/.polarion/icons/FunctionRealisation.gif
rename to template/.polarion/icons/Capella_FunctionRealisation.gif
diff --git a/template/.polarion/icons/FunctionReference.gif b/template/.polarion/icons/Capella_FunctionReference.gif
similarity index 100%
rename from template/.polarion/icons/FunctionReference.gif
rename to template/.polarion/icons/Capella_FunctionReference.gif
diff --git a/template/.polarion/icons/FunctionShortcut.gif b/template/.polarion/icons/Capella_FunctionShortcut.gif
similarity index 100%
rename from template/.polarion/icons/FunctionShortcut.gif
rename to template/.polarion/icons/Capella_FunctionShortcut.gif
diff --git a/template/.polarion/icons/FunctionalAction.gif b/template/.polarion/icons/Capella_FunctionalAction.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalAction.gif
rename to template/.polarion/icons/Capella_FunctionalAction.gif
diff --git a/template/.polarion/icons/FunctionalActionInputPin.gif b/template/.polarion/icons/Capella_FunctionalActionInputPin.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalActionInputPin.gif
rename to template/.polarion/icons/Capella_FunctionalActionInputPin.gif
diff --git a/template/.polarion/icons/FunctionalActionOutputPin.gif b/template/.polarion/icons/Capella_FunctionalActionOutputPin.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalActionOutputPin.gif
rename to template/.polarion/icons/Capella_FunctionalActionOutputPin.gif
diff --git a/template/.polarion/icons/FunctionalAspect.gif b/template/.polarion/icons/Capella_FunctionalAspect.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalAspect.gif
rename to template/.polarion/icons/Capella_FunctionalAspect.gif
diff --git a/template/.polarion/icons/FunctionalCapabilitiesDiagram.gif b/template/.polarion/icons/Capella_FunctionalCapabilitiesDiagram.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalCapabilitiesDiagram.gif
rename to template/.polarion/icons/Capella_FunctionalCapabilitiesDiagram.gif
diff --git a/template/.polarion/icons/FunctionalCapabilityDiagram.gif b/template/.polarion/icons/Capella_FunctionalCapabilityDiagram.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalCapabilityDiagram.gif
rename to template/.polarion/icons/Capella_FunctionalCapabilityDiagram.gif
diff --git a/template/.polarion/icons/FunctionalChainInvolvement.gif b/template/.polarion/icons/Capella_FunctionalChainInvolvement.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalChainInvolvement.gif
rename to template/.polarion/icons/Capella_FunctionalChainInvolvement.gif
diff --git a/template/.polarion/icons/FunctionalChainInvolvementFunction.gif b/template/.polarion/icons/Capella_FunctionalChainInvolvementFunction.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalChainInvolvementFunction.gif
rename to template/.polarion/icons/Capella_FunctionalChainInvolvementFunction.gif
diff --git a/template/.polarion/icons/FunctionalChainInvolvementFunction_OA.gif b/template/.polarion/icons/Capella_FunctionalChainInvolvementFunction_OA.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalChainInvolvementFunction_OA.gif
rename to template/.polarion/icons/Capella_FunctionalChainInvolvementFunction_OA.gif
diff --git a/template/.polarion/icons/FunctionalChainInvolvementLinkOA_AndFunction.gif b/template/.polarion/icons/Capella_FunctionalChainInvolvementLinkOA_AndFunction.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalChainInvolvementLinkOA_AndFunction.gif
rename to template/.polarion/icons/Capella_FunctionalChainInvolvementLinkOA_AndFunction.gif
diff --git a/template/.polarion/icons/FunctionalChainInvolvementLinkOA_ToExchange.gif b/template/.polarion/icons/Capella_FunctionalChainInvolvementLinkOA_ToExchange.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalChainInvolvementLinkOA_ToExchange.gif
rename to template/.polarion/icons/Capella_FunctionalChainInvolvementLinkOA_ToExchange.gif
diff --git a/template/.polarion/icons/FunctionalChainInvolvementLinkOA_ToFunction.gif b/template/.polarion/icons/Capella_FunctionalChainInvolvementLinkOA_ToFunction.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalChainInvolvementLinkOA_ToFunction.gif
rename to template/.polarion/icons/Capella_FunctionalChainInvolvementLinkOA_ToFunction.gif
diff --git a/template/.polarion/icons/FunctionalChainInvolvementLink_AndFunction.gif b/template/.polarion/icons/Capella_FunctionalChainInvolvementLink_AndFunction.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalChainInvolvementLink_AndFunction.gif
rename to template/.polarion/icons/Capella_FunctionalChainInvolvementLink_AndFunction.gif
diff --git a/template/.polarion/icons/FunctionalChainInvolvementLink_ToExchange.gif b/template/.polarion/icons/Capella_FunctionalChainInvolvementLink_ToExchange.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalChainInvolvementLink_ToExchange.gif
rename to template/.polarion/icons/Capella_FunctionalChainInvolvementLink_ToExchange.gif
diff --git a/template/.polarion/icons/FunctionalChainInvolvementLink_ToFunction.gif b/template/.polarion/icons/Capella_FunctionalChainInvolvementLink_ToFunction.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalChainInvolvementLink_ToFunction.gif
rename to template/.polarion/icons/Capella_FunctionalChainInvolvementLink_ToFunction.gif
diff --git a/template/.polarion/icons/FunctionalChainPkg.gif b/template/.polarion/icons/Capella_FunctionalChainPkg.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalChainPkg.gif
rename to template/.polarion/icons/Capella_FunctionalChainPkg.gif
diff --git a/template/.polarion/icons/FunctionalChainReference.gif b/template/.polarion/icons/Capella_FunctionalChainReference.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalChainReference.gif
rename to template/.polarion/icons/Capella_FunctionalChainReference.gif
diff --git a/template/.polarion/icons/FunctionalChainReference_OA.gif b/template/.polarion/icons/Capella_FunctionalChainReference_OA.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalChainReference_OA.gif
rename to template/.polarion/icons/Capella_FunctionalChainReference_OA.gif
diff --git a/template/.polarion/icons/FunctionalChain_WB.gif b/template/.polarion/icons/Capella_FunctionalChain_WB.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalChain_WB.gif
rename to template/.polarion/icons/Capella_FunctionalChain_WB.gif
diff --git a/template/.polarion/icons/FunctionalDestination.gif b/template/.polarion/icons/Capella_FunctionalDestination.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalDestination.gif
rename to template/.polarion/icons/Capella_FunctionalDestination.gif
diff --git a/template/.polarion/icons/FunctionalExchangeRealisation.gif b/template/.polarion/icons/Capella_FunctionalExchangeRealisation.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalExchangeRealisation.gif
rename to template/.polarion/icons/Capella_FunctionalExchangeRealisation.gif
diff --git a/template/.polarion/icons/FunctionalExchange_WB.gif b/template/.polarion/icons/Capella_FunctionalExchange_WB.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalExchange_WB.gif
rename to template/.polarion/icons/Capella_FunctionalExchange_WB.gif
diff --git a/template/.polarion/icons/FunctionalLink.gif b/template/.polarion/icons/Capella_FunctionalLink.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalLink.gif
rename to template/.polarion/icons/Capella_FunctionalLink.gif
diff --git a/template/.polarion/icons/FunctionalMissionDiagram.gif b/template/.polarion/icons/Capella_FunctionalMissionDiagram.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalMissionDiagram.gif
rename to template/.polarion/icons/Capella_FunctionalMissionDiagram.gif
diff --git a/template/.polarion/icons/FunctionalMissionsDiagram.gif b/template/.polarion/icons/Capella_FunctionalMissionsDiagram.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalMissionsDiagram.gif
rename to template/.polarion/icons/Capella_FunctionalMissionsDiagram.gif
diff --git a/template/.polarion/icons/FunctionalSource.gif b/template/.polarion/icons/Capella_FunctionalSource.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalSource.gif
rename to template/.polarion/icons/Capella_FunctionalSource.gif
diff --git a/template/.polarion/icons/FunctionalanalysisModelFile.gif b/template/.polarion/icons/Capella_FunctionalanalysisModelFile.gif
similarity index 100%
rename from template/.polarion/icons/FunctionalanalysisModelFile.gif
rename to template/.polarion/icons/Capella_FunctionalanalysisModelFile.gif
diff --git a/template/.polarion/icons/Generalization.gif b/template/.polarion/icons/Capella_Generalization.gif
similarity index 100%
rename from template/.polarion/icons/Generalization.gif
rename to template/.polarion/icons/Capella_Generalization.gif
diff --git a/template/.polarion/icons/GenericPkg.gif b/template/.polarion/icons/Capella_GenericPkg.gif
similarity index 100%
rename from template/.polarion/icons/GenericPkg.gif
rename to template/.polarion/icons/Capella_GenericPkg.gif
diff --git a/template/.polarion/icons/GenericTrace.gif b/template/.polarion/icons/Capella_GenericTrace.gif
similarity index 100%
rename from template/.polarion/icons/GenericTrace.gif
rename to template/.polarion/icons/Capella_GenericTrace.gif
diff --git a/template/.polarion/icons/GlobalLogicalComponentAllocationDiagram.gif b/template/.polarion/icons/Capella_GlobalLogicalComponentAllocationDiagram.gif
similarity index 100%
rename from template/.polarion/icons/GlobalLogicalComponentAllocationDiagram.gif
rename to template/.polarion/icons/Capella_GlobalLogicalComponentAllocationDiagram.gif
diff --git a/template/.polarion/icons/GlobalPhysicalComponentAllocationDiagram.gif b/template/.polarion/icons/Capella_GlobalPhysicalComponentAllocationDiagram.gif
similarity index 100%
rename from template/.polarion/icons/GlobalPhysicalComponentAllocationDiagram.gif
rename to template/.polarion/icons/Capella_GlobalPhysicalComponentAllocationDiagram.gif
diff --git a/template/.polarion/icons/GraphBox.gif b/template/.polarion/icons/Capella_GraphBox.gif
similarity index 100%
rename from template/.polarion/icons/GraphBox.gif
rename to template/.polarion/icons/Capella_GraphBox.gif
diff --git a/template/.polarion/icons/GraphConnector.gif b/template/.polarion/icons/Capella_GraphConnector.gif
similarity index 100%
rename from template/.polarion/icons/GraphConnector.gif
rename to template/.polarion/icons/Capella_GraphConnector.gif
diff --git a/template/.polarion/icons/HWCI.gif b/template/.polarion/icons/Capella_HWCI.gif
similarity index 100%
rename from template/.polarion/icons/HWCI.gif
rename to template/.polarion/icons/Capella_HWCI.gif
diff --git a/template/.polarion/icons/HelperAction.gif b/template/.polarion/icons/Capella_HelperAction.gif
similarity index 100%
rename from template/.polarion/icons/HelperAction.gif
rename to template/.polarion/icons/Capella_HelperAction.gif
diff --git a/template/.polarion/icons/HelperNavigation.gif b/template/.polarion/icons/Capella_HelperNavigation.gif
similarity index 100%
rename from template/.polarion/icons/HelperNavigation.gif
rename to template/.polarion/icons/Capella_HelperNavigation.gif
diff --git a/template/.polarion/icons/HelperReference.gif b/template/.polarion/icons/Capella_HelperReference.gif
similarity index 100%
rename from template/.polarion/icons/HelperReference.gif
rename to template/.polarion/icons/Capella_HelperReference.gif
diff --git a/template/.polarion/icons/HelperRoot.gif b/template/.polarion/icons/Capella_HelperRoot.gif
similarity index 100%
rename from template/.polarion/icons/HelperRoot.gif
rename to template/.polarion/icons/Capella_HelperRoot.gif
diff --git a/template/.polarion/icons/Implement.gif b/template/.polarion/icons/Capella_Implement.gif
similarity index 100%
rename from template/.polarion/icons/Implement.gif
rename to template/.polarion/icons/Capella_Implement.gif
diff --git a/template/.polarion/icons/InFlowPort.gif b/template/.polarion/icons/Capella_InFlowPort.gif
similarity index 100%
rename from template/.polarion/icons/InFlowPort.gif
rename to template/.polarion/icons/Capella_InFlowPort.gif
diff --git a/template/.polarion/icons/Include.gif b/template/.polarion/icons/Capella_Include.gif
similarity index 100%
rename from template/.polarion/icons/Include.gif
rename to template/.polarion/icons/Capella_Include.gif
diff --git a/template/.polarion/icons/ExchangeItem.gif b/template/.polarion/icons/Capella_InformationItem.gif
similarity index 100%
rename from template/.polarion/icons/ExchangeItem.gif
rename to template/.polarion/icons/Capella_InformationItem.gif
diff --git a/template/.polarion/icons/InformationModelFile.gif b/template/.polarion/icons/Capella_InformationModelFile.gif
similarity index 100%
rename from template/.polarion/icons/InformationModelFile.gif
rename to template/.polarion/icons/Capella_InformationModelFile.gif
diff --git a/template/.polarion/icons/InitialNode.gif b/template/.polarion/icons/Capella_InitialNode.gif
similarity index 100%
rename from template/.polarion/icons/InitialNode.gif
rename to template/.polarion/icons/Capella_InitialNode.gif
diff --git a/template/.polarion/icons/InitialPseudoState.gif b/template/.polarion/icons/Capella_InitialPseudoState.gif
similarity index 100%
rename from template/.polarion/icons/InitialPseudoState.gif
rename to template/.polarion/icons/Capella_InitialPseudoState.gif
diff --git a/template/.polarion/icons/InputPin.gif b/template/.polarion/icons/Capella_InputPin.gif
similarity index 100%
rename from template/.polarion/icons/InputPin.gif
rename to template/.polarion/icons/Capella_InputPin.gif
diff --git a/template/.polarion/icons/Insert.gif b/template/.polarion/icons/Capella_Insert.gif
similarity index 100%
rename from template/.polarion/icons/Insert.gif
rename to template/.polarion/icons/Capella_Insert.gif
diff --git a/template/.polarion/icons/InstanceDeploymentLink.gif b/template/.polarion/icons/Capella_InstanceDeploymentLink.gif
similarity index 100%
rename from template/.polarion/icons/InstanceDeploymentLink.gif
rename to template/.polarion/icons/Capella_InstanceDeploymentLink.gif
diff --git a/template/.polarion/icons/InstanceRole.gif b/template/.polarion/icons/Capella_InstanceRole.gif
similarity index 100%
rename from template/.polarion/icons/InstanceRole.gif
rename to template/.polarion/icons/Capella_InstanceRole.gif
diff --git a/template/.polarion/icons/InteractionAspect.gif b/template/.polarion/icons/Capella_InteractionAspect.gif
similarity index 100%
rename from template/.polarion/icons/InteractionAspect.gif
rename to template/.polarion/icons/Capella_InteractionAspect.gif
diff --git a/template/.polarion/icons/InteractionModelFile.gif b/template/.polarion/icons/Capella_InteractionModelFile.gif
similarity index 100%
rename from template/.polarion/icons/InteractionModelFile.gif
rename to template/.polarion/icons/Capella_InteractionModelFile.gif
diff --git a/template/.polarion/icons/InteractionOperand.gif b/template/.polarion/icons/Capella_InteractionOperand.gif
similarity index 100%
rename from template/.polarion/icons/InteractionOperand.gif
rename to template/.polarion/icons/Capella_InteractionOperand.gif
diff --git a/template/.polarion/icons/InteractionUse.gif b/template/.polarion/icons/Capella_InteractionUse.gif
similarity index 100%
rename from template/.polarion/icons/InteractionUse.gif
rename to template/.polarion/icons/Capella_InteractionUse.gif
diff --git a/template/.polarion/icons/InterfaceAllocation.gif b/template/.polarion/icons/Capella_InterfaceAllocation.gif
similarity index 100%
rename from template/.polarion/icons/InterfaceAllocation.gif
rename to template/.polarion/icons/Capella_InterfaceAllocation.gif
diff --git a/template/.polarion/icons/InterfaceCI.gif b/template/.polarion/icons/Capella_InterfaceCI.gif
similarity index 100%
rename from template/.polarion/icons/InterfaceCI.gif
rename to template/.polarion/icons/Capella_InterfaceCI.gif
diff --git a/template/.polarion/icons/InterfaceImplementation.gif b/template/.polarion/icons/Capella_InterfaceImplementation.gif
similarity index 100%
rename from template/.polarion/icons/InterfaceImplementation.gif
rename to template/.polarion/icons/Capella_InterfaceImplementation.gif
diff --git a/template/.polarion/icons/InterfaceRealization.gif b/template/.polarion/icons/Capella_InterfaceRealization.gif
similarity index 100%
rename from template/.polarion/icons/InterfaceRealization.gif
rename to template/.polarion/icons/Capella_InterfaceRealization.gif
diff --git a/template/.polarion/icons/InterfaceUse.gif b/template/.polarion/icons/Capella_InterfaceUse.gif
similarity index 100%
rename from template/.polarion/icons/InterfaceUse.gif
rename to template/.polarion/icons/Capella_InterfaceUse.gif
diff --git a/template/.polarion/icons/Interface_Technical.gif b/template/.polarion/icons/Capella_Interface_Technical.gif
similarity index 100%
rename from template/.polarion/icons/Interface_Technical.gif
rename to template/.polarion/icons/Capella_Interface_Technical.gif
diff --git a/template/.polarion/icons/InterruptibleActivityRegion.gif b/template/.polarion/icons/Capella_InterruptibleActivityRegion.gif
similarity index 100%
rename from template/.polarion/icons/InterruptibleActivityRegion.gif
rename to template/.polarion/icons/Capella_InterruptibleActivityRegion.gif
diff --git a/template/.polarion/icons/ItemInConcept.gif b/template/.polarion/icons/Capella_ItemInConcept.gif
similarity index 100%
rename from template/.polarion/icons/ItemInConcept.gif
rename to template/.polarion/icons/Capella_ItemInConcept.gif
diff --git a/template/.polarion/icons/JoinNode.gif b/template/.polarion/icons/Capella_JoinNode.gif
similarity index 100%
rename from template/.polarion/icons/JoinNode.gif
rename to template/.polarion/icons/Capella_JoinNode.gif
diff --git a/template/.polarion/icons/JoinPseudoState.gif b/template/.polarion/icons/Capella_JoinPseudoState.gif
similarity index 100%
rename from template/.polarion/icons/JoinPseudoState.gif
rename to template/.polarion/icons/Capella_JoinPseudoState.gif
diff --git a/template/.polarion/icons/KeyPart.gif b/template/.polarion/icons/Capella_KeyPart.gif
similarity index 100%
rename from template/.polarion/icons/KeyPart.gif
rename to template/.polarion/icons/Capella_KeyPart.gif
diff --git a/template/.polarion/icons/KeyValue.gif b/template/.polarion/icons/Capella_KeyValue.gif
similarity index 100%
rename from template/.polarion/icons/KeyValue.gif
rename to template/.polarion/icons/Capella_KeyValue.gif
diff --git a/template/.polarion/icons/LCInterfaceImpl.gif b/template/.polarion/icons/Capella_LCInterfaceImpl.gif
similarity index 100%
rename from template/.polarion/icons/LCInterfaceImpl.gif
rename to template/.polarion/icons/Capella_LCInterfaceImpl.gif
diff --git a/template/.polarion/icons/LCInterfaceUse.gif b/template/.polarion/icons/Capella_LCInterfaceUse.gif
similarity index 100%
rename from template/.polarion/icons/LCInterfaceUse.gif
rename to template/.polarion/icons/Capella_LCInterfaceUse.gif
diff --git a/template/.polarion/icons/LaModelFile.gif b/template/.polarion/icons/Capella_LaModelFile.gif
similarity index 100%
rename from template/.polarion/icons/LaModelFile.gif
rename to template/.polarion/icons/Capella_LaModelFile.gif
diff --git a/template/.polarion/icons/LiteralBooleanValue.gif b/template/.polarion/icons/Capella_LiteralBooleanValue.gif
similarity index 100%
rename from template/.polarion/icons/LiteralBooleanValue.gif
rename to template/.polarion/icons/Capella_LiteralBooleanValue.gif
diff --git a/template/.polarion/icons/LiteralNumericValue.gif b/template/.polarion/icons/Capella_LiteralNumericValue.gif
similarity index 100%
rename from template/.polarion/icons/LiteralNumericValue.gif
rename to template/.polarion/icons/Capella_LiteralNumericValue.gif
diff --git a/template/.polarion/icons/LiteralPhysicalValue.gif b/template/.polarion/icons/Capella_LiteralPhysicalValue.gif
similarity index 100%
rename from template/.polarion/icons/LiteralPhysicalValue.gif
rename to template/.polarion/icons/Capella_LiteralPhysicalValue.gif
diff --git a/template/.polarion/icons/LiteralStringValue.gif b/template/.polarion/icons/Capella_LiteralStringValue.gif
similarity index 100%
rename from template/.polarion/icons/LiteralStringValue.gif
rename to template/.polarion/icons/Capella_LiteralStringValue.gif
diff --git a/template/.polarion/icons/LiteralUnlimitedNaturalValue.gif b/template/.polarion/icons/Capella_LiteralUnlimitedNaturalValue.gif
similarity index 100%
rename from template/.polarion/icons/LiteralUnlimitedNaturalValue.gif
rename to template/.polarion/icons/Capella_LiteralUnlimitedNaturalValue.gif
diff --git a/template/.polarion/icons/Location.gif b/template/.polarion/icons/Capella_Location.gif
similarity index 100%
rename from template/.polarion/icons/Location.gif
rename to template/.polarion/icons/Capella_Location.gif
diff --git a/template/.polarion/icons/LogicalActor.gif b/template/.polarion/icons/Capella_LogicalActor.gif
similarity index 100%
rename from template/.polarion/icons/LogicalActor.gif
rename to template/.polarion/icons/Capella_LogicalActor.gif
diff --git a/template/.polarion/icons/LogicalArchitecture.gif b/template/.polarion/icons/Capella_LogicalArchitecture.gif
similarity index 100%
rename from template/.polarion/icons/LogicalArchitecture.gif
rename to template/.polarion/icons/Capella_LogicalArchitecture.gif
diff --git a/template/.polarion/icons/LogicalArchitectureAllocation.gif b/template/.polarion/icons/Capella_LogicalArchitectureAllocation.gif
similarity index 100%
rename from template/.polarion/icons/LogicalArchitectureAllocation.gif
rename to template/.polarion/icons/Capella_LogicalArchitectureAllocation.gif
diff --git a/template/.polarion/icons/LogicalArchitectureImplementation.gif b/template/.polarion/icons/Capella_LogicalArchitectureImplementation.gif
similarity index 100%
rename from template/.polarion/icons/LogicalArchitectureImplementation.gif
rename to template/.polarion/icons/Capella_LogicalArchitectureImplementation.gif
diff --git a/template/.polarion/icons/LogicalArchitecturePkg.gif b/template/.polarion/icons/Capella_LogicalArchitecturePkg.gif
similarity index 100%
rename from template/.polarion/icons/LogicalArchitecturePkg.gif
rename to template/.polarion/icons/Capella_LogicalArchitecturePkg.gif
diff --git a/template/.polarion/icons/LogicalArchitectureRealisation.gif b/template/.polarion/icons/Capella_LogicalArchitectureRealisation.gif
similarity index 100%
rename from template/.polarion/icons/LogicalArchitectureRealisation.gif
rename to template/.polarion/icons/Capella_LogicalArchitectureRealisation.gif
diff --git a/template/.polarion/icons/LogicalComponentAllocationDiagram.gif b/template/.polarion/icons/Capella_LogicalComponentAllocationDiagram.gif
similarity index 100%
rename from template/.polarion/icons/LogicalComponentAllocationDiagram.gif
rename to template/.polarion/icons/Capella_LogicalComponentAllocationDiagram.gif
diff --git a/template/.polarion/icons/LogicalComponentImplementation.gif b/template/.polarion/icons/Capella_LogicalComponentImplementation.gif
similarity index 100%
rename from template/.polarion/icons/LogicalComponentImplementation.gif
rename to template/.polarion/icons/Capella_LogicalComponentImplementation.gif
diff --git a/template/.polarion/icons/LogicalComponentInterfaceDiagram.gif b/template/.polarion/icons/Capella_LogicalComponentInterfaceDiagram.gif
similarity index 100%
rename from template/.polarion/icons/LogicalComponentInterfaceDiagram.gif
rename to template/.polarion/icons/Capella_LogicalComponentInterfaceDiagram.gif
diff --git a/template/.polarion/icons/LogicalComponentPkg.gif b/template/.polarion/icons/Capella_LogicalComponentPkg.gif
similarity index 100%
rename from template/.polarion/icons/LogicalComponentPkg.gif
rename to template/.polarion/icons/Capella_LogicalComponentPkg.gif
diff --git a/template/.polarion/icons/LogicalComponentRealisation.gif b/template/.polarion/icons/Capella_LogicalComponentRealisation.gif
similarity index 100%
rename from template/.polarion/icons/LogicalComponentRealisation.gif
rename to template/.polarion/icons/Capella_LogicalComponentRealisation.gif
diff --git a/template/.polarion/icons/LogicalComponentReference.gif b/template/.polarion/icons/Capella_LogicalComponentReference.gif
similarity index 100%
rename from template/.polarion/icons/LogicalComponentReference.gif
rename to template/.polarion/icons/Capella_LogicalComponentReference.gif
diff --git a/template/.polarion/icons/LogicalComponentShortcut.gif b/template/.polarion/icons/Capella_LogicalComponentShortcut.gif
similarity index 100%
rename from template/.polarion/icons/LogicalComponentShortcut.gif
rename to template/.polarion/icons/Capella_LogicalComponentShortcut.gif
diff --git a/template/.polarion/icons/LogicalComponent_WB.gif b/template/.polarion/icons/Capella_LogicalComponent_WB.gif
similarity index 100%
rename from template/.polarion/icons/LogicalComponent_WB.gif
rename to template/.polarion/icons/Capella_LogicalComponent_WB.gif
diff --git a/template/.polarion/icons/LogicalFunctionPkg.gif b/template/.polarion/icons/Capella_LogicalFunctionPkg.gif
similarity index 100%
rename from template/.polarion/icons/LogicalFunctionPkg.gif
rename to template/.polarion/icons/Capella_LogicalFunctionPkg.gif
diff --git a/template/.polarion/icons/LogicalGlobalArchitectureDiagram.gif b/template/.polarion/icons/Capella_LogicalGlobalArchitectureDiagram.gif
similarity index 100%
rename from template/.polarion/icons/LogicalGlobalArchitectureDiagram.gif
rename to template/.polarion/icons/Capella_LogicalGlobalArchitectureDiagram.gif
diff --git a/template/.polarion/icons/LogicalInterfaceRealisation.gif b/template/.polarion/icons/Capella_LogicalInterfaceRealisation.gif
similarity index 100%
rename from template/.polarion/icons/LogicalInterfaceRealisation.gif
rename to template/.polarion/icons/Capella_LogicalInterfaceRealisation.gif
diff --git a/template/.polarion/icons/LogicalInternalRealizationDiagram.gif b/template/.polarion/icons/Capella_LogicalInternalRealizationDiagram.gif
similarity index 100%
rename from template/.polarion/icons/LogicalInternalRealizationDiagram.gif
rename to template/.polarion/icons/Capella_LogicalInternalRealizationDiagram.gif
diff --git a/template/.polarion/icons/LogicalLocalArchitectureDiagram.gif b/template/.polarion/icons/Capella_LogicalLocalArchitectureDiagram.gif
similarity index 100%
rename from template/.polarion/icons/LogicalLocalArchitectureDiagram.gif
rename to template/.polarion/icons/Capella_LogicalLocalArchitectureDiagram.gif
diff --git a/template/.polarion/icons/LogicalRealizationDiagram.gif b/template/.polarion/icons/Capella_LogicalRealizationDiagram.gif
similarity index 100%
rename from template/.polarion/icons/LogicalRealizationDiagram.gif
rename to template/.polarion/icons/Capella_LogicalRealizationDiagram.gif
diff --git a/template/.polarion/icons/LostMessage.gif b/template/.polarion/icons/Capella_LostMessage.gif
similarity index 100%
rename from template/.polarion/icons/LostMessage.gif
rename to template/.polarion/icons/Capella_LostMessage.gif
diff --git a/template/.polarion/icons/Manage.gif b/template/.polarion/icons/Capella_Manage.gif
similarity index 100%
rename from template/.polarion/icons/Manage.gif
rename to template/.polarion/icons/Capella_Manage.gif
diff --git a/template/.polarion/icons/ManagedDataLink.gif b/template/.polarion/icons/Capella_ManagedDataLink.gif
similarity index 100%
rename from template/.polarion/icons/ManagedDataLink.gif
rename to template/.polarion/icons/Capella_ManagedDataLink.gif
diff --git a/template/.polarion/icons/MaskLink.gif b/template/.polarion/icons/Capella_MaskLink.gif
similarity index 100%
rename from template/.polarion/icons/MaskLink.gif
rename to template/.polarion/icons/Capella_MaskLink.gif
diff --git a/template/.polarion/icons/MaxCard.gif b/template/.polarion/icons/Capella_MaxCard.gif
similarity index 100%
rename from template/.polarion/icons/MaxCard.gif
rename to template/.polarion/icons/Capella_MaxCard.gif
diff --git a/template/.polarion/icons/MelodycommonModelFile.gif b/template/.polarion/icons/Capella_MelodycommonModelFile.gif
similarity index 100%
rename from template/.polarion/icons/MelodycommonModelFile.gif
rename to template/.polarion/icons/Capella_MelodycommonModelFile.gif
diff --git a/template/.polarion/icons/MelodycoreModelFile.gif b/template/.polarion/icons/Capella_MelodycoreModelFile.gif
similarity index 100%
rename from template/.polarion/icons/MelodycoreModelFile.gif
rename to template/.polarion/icons/Capella_MelodycoreModelFile.gif
diff --git a/template/.polarion/icons/MelodydiagramsModelFile.gif b/template/.polarion/icons/Capella_MelodydiagramsModelFile.gif
similarity index 100%
rename from template/.polarion/icons/MelodydiagramsModelFile.gif
rename to template/.polarion/icons/Capella_MelodydiagramsModelFile.gif
diff --git a/template/.polarion/icons/MelodymodellerModelFile.gif b/template/.polarion/icons/Capella_MelodymodellerModelFile.gif
similarity index 100%
rename from template/.polarion/icons/MelodymodellerModelFile.gif
rename to template/.polarion/icons/Capella_MelodymodellerModelFile.gif
diff --git a/template/.polarion/icons/MergeLink.gif b/template/.polarion/icons/Capella_MergeLink.gif
similarity index 100%
rename from template/.polarion/icons/MergeLink.gif
rename to template/.polarion/icons/Capella_MergeLink.gif
diff --git a/template/.polarion/icons/MergeNode.gif b/template/.polarion/icons/Capella_MergeNode.gif
similarity index 100%
rename from template/.polarion/icons/MergeNode.gif
rename to template/.polarion/icons/Capella_MergeNode.gif
diff --git a/template/.polarion/icons/Message.gif b/template/.polarion/icons/Capella_Message.gif
similarity index 100%
rename from template/.polarion/icons/Message.gif
rename to template/.polarion/icons/Capella_Message.gif
diff --git a/template/.polarion/icons/MessageEnd.gif b/template/.polarion/icons/Capella_MessageEnd.gif
similarity index 100%
rename from template/.polarion/icons/MessageEnd.gif
rename to template/.polarion/icons/Capella_MessageEnd.gif
diff --git a/template/.polarion/icons/InterfacePkg.gif b/template/.polarion/icons/Capella_MessagePkg.gif
similarity index 100%
rename from template/.polarion/icons/InterfacePkg.gif
rename to template/.polarion/icons/Capella_MessagePkg.gif
diff --git a/template/.polarion/icons/MessageReference.gif b/template/.polarion/icons/Capella_MessageReference.gif
similarity index 100%
rename from template/.polarion/icons/MessageReference.gif
rename to template/.polarion/icons/Capella_MessageReference.gif
diff --git a/template/.polarion/icons/MinCard.gif b/template/.polarion/icons/Capella_MinCard.gif
similarity index 100%
rename from template/.polarion/icons/MinCard.gif
rename to template/.polarion/icons/Capella_MinCard.gif
diff --git a/template/.polarion/icons/MissionPkg.gif b/template/.polarion/icons/Capella_MissionPkg.gif
similarity index 100%
rename from template/.polarion/icons/MissionPkg.gif
rename to template/.polarion/icons/Capella_MissionPkg.gif
diff --git a/template/.polarion/icons/MissionSupplierLink.gif b/template/.polarion/icons/Capella_MissionSupplierLink.gif
similarity index 100%
rename from template/.polarion/icons/MissionSupplierLink.gif
rename to template/.polarion/icons/Capella_MissionSupplierLink.gif
diff --git a/template/.polarion/icons/ModellingcoreModelFile.gif b/template/.polarion/icons/Capella_ModellingcoreModelFile.gif
similarity index 100%
rename from template/.polarion/icons/ModellingcoreModelFile.gif
rename to template/.polarion/icons/Capella_ModellingcoreModelFile.gif
diff --git a/template/.polarion/icons/NDICI.gif b/template/.polarion/icons/Capella_NDICI.gif
similarity index 100%
rename from template/.polarion/icons/NDICI.gif
rename to template/.polarion/icons/Capella_NDICI.gif
diff --git a/template/.polarion/icons/NamingRule.gif b/template/.polarion/icons/Capella_NamingRule.gif
similarity index 100%
rename from template/.polarion/icons/NamingRule.gif
rename to template/.polarion/icons/Capella_NamingRule.gif
diff --git a/template/.polarion/icons/NodeDeploymentLink.gif b/template/.polarion/icons/Capella_NodeDeploymentLink.gif
similarity index 100%
rename from template/.polarion/icons/NodeDeploymentLink.gif
rename to template/.polarion/icons/Capella_NodeDeploymentLink.gif
diff --git a/template/.polarion/icons/NumericExpression.gif b/template/.polarion/icons/Capella_NumericExpression.gif
similarity index 100%
rename from template/.polarion/icons/NumericExpression.gif
rename to template/.polarion/icons/Capella_NumericExpression.gif
diff --git a/template/.polarion/icons/NumericReference.gif b/template/.polarion/icons/Capella_NumericReference.gif
similarity index 100%
rename from template/.polarion/icons/NumericReference.gif
rename to template/.polarion/icons/Capella_NumericReference.gif
diff --git a/template/.polarion/icons/NumericSymbolicValue.gif b/template/.polarion/icons/Capella_NumericSymbolicValue.gif
similarity index 100%
rename from template/.polarion/icons/NumericSymbolicValue.gif
rename to template/.polarion/icons/Capella_NumericSymbolicValue.gif
diff --git a/template/.polarion/icons/NumericType.gif b/template/.polarion/icons/Capella_NumericType.gif
similarity index 100%
rename from template/.polarion/icons/NumericType.gif
rename to template/.polarion/icons/Capella_NumericType.gif
diff --git a/template/.polarion/icons/NumericValueReferenceLink.gif b/template/.polarion/icons/Capella_NumericValueReferenceLink.gif
similarity index 100%
rename from template/.polarion/icons/NumericValueReferenceLink.gif
rename to template/.polarion/icons/Capella_NumericValueReferenceLink.gif
diff --git a/template/.polarion/icons/OaModelFile.gif b/template/.polarion/icons/Capella_OaModelFile.gif
similarity index 100%
rename from template/.polarion/icons/OaModelFile.gif
rename to template/.polarion/icons/Capella_OaModelFile.gif
diff --git a/template/.polarion/icons/ObjectDeploymentLink.gif b/template/.polarion/icons/Capella_ObjectDeploymentLink.gif
similarity index 100%
rename from template/.polarion/icons/ObjectDeploymentLink.gif
rename to template/.polarion/icons/Capella_ObjectDeploymentLink.gif
diff --git a/template/.polarion/icons/ObjectDiagram.gif b/template/.polarion/icons/Capella_ObjectDiagram.gif
similarity index 100%
rename from template/.polarion/icons/ObjectDiagram.gif
rename to template/.polarion/icons/Capella_ObjectDiagram.gif
diff --git a/template/.polarion/icons/ObjectFlow.gif b/template/.polarion/icons/Capella_ObjectFlow.gif
similarity index 100%
rename from template/.polarion/icons/ObjectFlow.gif
rename to template/.polarion/icons/Capella_ObjectFlow.gif
diff --git a/template/.polarion/icons/OpActivityExchange.gif b/template/.polarion/icons/Capella_OpActivityExchange.gif
similarity index 100%
rename from template/.polarion/icons/OpActivityExchange.gif
rename to template/.polarion/icons/Capella_OpActivityExchange.gif
diff --git a/template/.polarion/icons/OpActivityInputPin.gif b/template/.polarion/icons/Capella_OpActivityInputPin.gif
similarity index 100%
rename from template/.polarion/icons/OpActivityInputPin.gif
rename to template/.polarion/icons/Capella_OpActivityInputPin.gif
diff --git a/template/.polarion/icons/OpActivityOutputPin.gif b/template/.polarion/icons/Capella_OpActivityOutputPin.gif
similarity index 100%
rename from template/.polarion/icons/OpActivityOutputPin.gif
rename to template/.polarion/icons/Capella_OpActivityOutputPin.gif
diff --git a/template/.polarion/icons/OperationalActionInputPin.gif b/template/.polarion/icons/Capella_OperationalActionInputPin.gif
similarity index 100%
rename from template/.polarion/icons/OperationalActionInputPin.gif
rename to template/.polarion/icons/Capella_OperationalActionInputPin.gif
diff --git a/template/.polarion/icons/OperationalActionOutputPin.gif b/template/.polarion/icons/Capella_OperationalActionOutputPin.gif
similarity index 100%
rename from template/.polarion/icons/OperationalActionOutputPin.gif
rename to template/.polarion/icons/Capella_OperationalActionOutputPin.gif
diff --git a/template/.polarion/icons/OperationalActivityAction.gif b/template/.polarion/icons/Capella_OperationalActivityAction.gif
similarity index 100%
rename from template/.polarion/icons/OperationalActivityAction.gif
rename to template/.polarion/icons/Capella_OperationalActivityAction.gif
diff --git a/template/.polarion/icons/OperationalActivityFlow.gif b/template/.polarion/icons/Capella_OperationalActivityFlow.gif
similarity index 100%
rename from template/.polarion/icons/OperationalActivityFlow.gif
rename to template/.polarion/icons/Capella_OperationalActivityFlow.gif
diff --git a/template/.polarion/icons/OperationalActivityPkg.gif b/template/.polarion/icons/Capella_OperationalActivityPkg.gif
similarity index 100%
rename from template/.polarion/icons/OperationalActivityPkg.gif
rename to template/.polarion/icons/Capella_OperationalActivityPkg.gif
diff --git a/template/.polarion/icons/OperationalActivityRealisation.gif b/template/.polarion/icons/Capella_OperationalActivityRealisation.gif
similarity index 100%
rename from template/.polarion/icons/OperationalActivityRealisation.gif
rename to template/.polarion/icons/Capella_OperationalActivityRealisation.gif
diff --git a/template/.polarion/icons/OperationalActor.gif b/template/.polarion/icons/Capella_OperationalActor.gif
similarity index 100%
rename from template/.polarion/icons/OperationalActor.gif
rename to template/.polarion/icons/Capella_OperationalActor.gif
diff --git a/template/.polarion/icons/OperationalAnalysis.gif b/template/.polarion/icons/Capella_OperationalAnalysis.gif
similarity index 100%
rename from template/.polarion/icons/OperationalAnalysis.gif
rename to template/.polarion/icons/Capella_OperationalAnalysis.gif
diff --git a/template/.polarion/icons/OperationalAnalysisRealisation.gif b/template/.polarion/icons/Capella_OperationalAnalysisRealisation.gif
similarity index 100%
rename from template/.polarion/icons/OperationalAnalysisRealisation.gif
rename to template/.polarion/icons/Capella_OperationalAnalysisRealisation.gif
diff --git a/template/.polarion/icons/OperationalCapabilityAspect.gif b/template/.polarion/icons/Capella_OperationalCapabilityAspect.gif
similarity index 100%
rename from template/.polarion/icons/OperationalCapabilityAspect.gif
rename to template/.polarion/icons/Capella_OperationalCapabilityAspect.gif
diff --git a/template/.polarion/icons/OperationalCapabilityPkg.gif b/template/.polarion/icons/Capella_OperationalCapabilityPkg.gif
similarity index 100%
rename from template/.polarion/icons/OperationalCapabilityPkg.gif
rename to template/.polarion/icons/Capella_OperationalCapabilityPkg.gif
diff --git a/template/.polarion/icons/OperationalCapabilityRealisation.gif b/template/.polarion/icons/Capella_OperationalCapabilityRealisation.gif
similarity index 100%
rename from template/.polarion/icons/OperationalCapabilityRealisation.gif
rename to template/.polarion/icons/Capella_OperationalCapabilityRealisation.gif
diff --git a/template/.polarion/icons/OperationalCapabilityUseCase.gif b/template/.polarion/icons/Capella_OperationalCapabilityUseCase.gif
similarity index 100%
rename from template/.polarion/icons/OperationalCapabilityUseCase.gif
rename to template/.polarion/icons/Capella_OperationalCapabilityUseCase.gif
diff --git a/template/.polarion/icons/OperationalEntityRealisation.gif b/template/.polarion/icons/Capella_OperationalEntityRealisation.gif
similarity index 100%
rename from template/.polarion/icons/OperationalEntityRealisation.gif
rename to template/.polarion/icons/Capella_OperationalEntityRealisation.gif
diff --git a/template/.polarion/icons/OperationalProcess.gif b/template/.polarion/icons/Capella_OperationalProcess.gif
similarity index 100%
rename from template/.polarion/icons/OperationalProcess.gif
rename to template/.polarion/icons/Capella_OperationalProcess.gif
diff --git a/template/.polarion/icons/OperationalProcessInvolvement.gif b/template/.polarion/icons/Capella_OperationalProcessInvolvement.gif
similarity index 100%
rename from template/.polarion/icons/OperationalProcessInvolvement.gif
rename to template/.polarion/icons/Capella_OperationalProcessInvolvement.gif
diff --git a/template/.polarion/icons/OperationalScenario.gif b/template/.polarion/icons/Capella_OperationalScenario.gif
similarity index 100%
rename from template/.polarion/icons/OperationalScenario.gif
rename to template/.polarion/icons/Capella_OperationalScenario.gif
diff --git a/template/.polarion/icons/OranisationalUnitComposition.gif b/template/.polarion/icons/Capella_OranisationalUnitComposition.gif
similarity index 100%
rename from template/.polarion/icons/OranisationalUnitComposition.gif
rename to template/.polarion/icons/Capella_OranisationalUnitComposition.gif
diff --git a/template/.polarion/icons/OrganisationalUnit.gif b/template/.polarion/icons/Capella_OrganisationalUnit.gif
similarity index 100%
rename from template/.polarion/icons/OrganisationalUnit.gif
rename to template/.polarion/icons/Capella_OrganisationalUnit.gif
diff --git a/template/.polarion/icons/OrganisationalUnitComposition.gif b/template/.polarion/icons/Capella_OrganisationalUnitComposition.gif
similarity index 100%
rename from template/.polarion/icons/OrganisationalUnitComposition.gif
rename to template/.polarion/icons/Capella_OrganisationalUnitComposition.gif
diff --git a/template/.polarion/icons/OutFlowPort.gif b/template/.polarion/icons/Capella_OutFlowPort.gif
similarity index 100%
rename from template/.polarion/icons/OutFlowPort.gif
rename to template/.polarion/icons/Capella_OutFlowPort.gif
diff --git a/template/.polarion/icons/OutputPin.gif b/template/.polarion/icons/Capella_OutputPin.gif
similarity index 100%
rename from template/.polarion/icons/OutputPin.gif
rename to template/.polarion/icons/Capella_OutputPin.gif
diff --git a/template/.polarion/icons/PaModelFile.gif b/template/.polarion/icons/Capella_PaModelFile.gif
similarity index 100%
rename from template/.polarion/icons/PaModelFile.gif
rename to template/.polarion/icons/Capella_PaModelFile.gif
diff --git a/template/.polarion/icons/ParameterMaxCardReference.gif b/template/.polarion/icons/Capella_ParameterMaxCardReference.gif
similarity index 100%
rename from template/.polarion/icons/ParameterMaxCardReference.gif
rename to template/.polarion/icons/Capella_ParameterMaxCardReference.gif
diff --git a/template/.polarion/icons/ParameterMinCardReference.gif b/template/.polarion/icons/Capella_ParameterMinCardReference.gif
similarity index 100%
rename from template/.polarion/icons/ParameterMinCardReference.gif
rename to template/.polarion/icons/Capella_ParameterMinCardReference.gif
diff --git a/template/.polarion/icons/PhysicalActorGeneralization.gif b/template/.polarion/icons/Capella_PhysicalActorGeneralization.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalActorGeneralization.gif
rename to template/.polarion/icons/Capella_PhysicalActorGeneralization.gif
diff --git a/template/.polarion/icons/PhysicalArchitecture.gif b/template/.polarion/icons/Capella_PhysicalArchitecture.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalArchitecture.gif
rename to template/.polarion/icons/Capella_PhysicalArchitecture.gif
diff --git a/template/.polarion/icons/PhysicalArchitectureAllocation.gif b/template/.polarion/icons/Capella_PhysicalArchitectureAllocation.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalArchitectureAllocation.gif
rename to template/.polarion/icons/Capella_PhysicalArchitectureAllocation.gif
diff --git a/template/.polarion/icons/PhysicalArchitecturePkg.gif b/template/.polarion/icons/Capella_PhysicalArchitecturePkg.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalArchitecturePkg.gif
rename to template/.polarion/icons/Capella_PhysicalArchitecturePkg.gif
diff --git a/template/.polarion/icons/PhysicalComponentAllocation.gif b/template/.polarion/icons/Capella_PhysicalComponentAllocation.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalComponentAllocation.gif
rename to template/.polarion/icons/Capella_PhysicalComponentAllocation.gif
diff --git a/template/.polarion/icons/PhysicalComponentAllocationDiagram.gif b/template/.polarion/icons/Capella_PhysicalComponentAllocationDiagram.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalComponentAllocationDiagram.gif
rename to template/.polarion/icons/Capella_PhysicalComponentAllocationDiagram.gif
diff --git a/template/.polarion/icons/PhysicalComponentInterfaceDiagram.gif b/template/.polarion/icons/Capella_PhysicalComponentInterfaceDiagram.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalComponentInterfaceDiagram.gif
rename to template/.polarion/icons/Capella_PhysicalComponentInterfaceDiagram.gif
diff --git a/template/.polarion/icons/PhysicalComponentPortAndInterfaceDiagram.gif b/template/.polarion/icons/Capella_PhysicalComponentPortAndInterfaceDiagram.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalComponentPortAndInterfaceDiagram.gif
rename to template/.polarion/icons/Capella_PhysicalComponentPortAndInterfaceDiagram.gif
diff --git a/template/.polarion/icons/PhysicalComponentRealization.gif b/template/.polarion/icons/Capella_PhysicalComponentRealization.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalComponentRealization.gif
rename to template/.polarion/icons/Capella_PhysicalComponentRealization.gif
diff --git a/template/.polarion/icons/PhysicalGlobalArchitectureDiagram.gif b/template/.polarion/icons/Capella_PhysicalGlobalArchitectureDiagram.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalGlobalArchitectureDiagram.gif
rename to template/.polarion/icons/Capella_PhysicalGlobalArchitectureDiagram.gif
diff --git a/template/.polarion/icons/PhysicalLocalArchitectureDiagram.gif b/template/.polarion/icons/Capella_PhysicalLocalArchitectureDiagram.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalLocalArchitectureDiagram.gif
rename to template/.polarion/icons/Capella_PhysicalLocalArchitectureDiagram.gif
diff --git a/template/.polarion/icons/PhysicalNode.gif b/template/.polarion/icons/Capella_PhysicalNode.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalNode.gif
rename to template/.polarion/icons/Capella_PhysicalNode.gif
diff --git a/template/.polarion/icons/PhysicalObject.gif b/template/.polarion/icons/Capella_PhysicalObject.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalObject.gif
rename to template/.polarion/icons/Capella_PhysicalObject.gif
diff --git a/template/.polarion/icons/MessagePkg.gif b/template/.polarion/icons/Capella_PhysicalObjectPkg.gif
similarity index 100%
rename from template/.polarion/icons/MessagePkg.gif
rename to template/.polarion/icons/Capella_PhysicalObjectPkg.gif
diff --git a/template/.polarion/icons/PhysicalPart.gif b/template/.polarion/icons/Capella_PhysicalPart.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalPart.gif
rename to template/.polarion/icons/Capella_PhysicalPart.gif
diff --git a/template/.polarion/icons/PhysicalPartition.gif b/template/.polarion/icons/Capella_PhysicalPartition.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalPartition.gif
rename to template/.polarion/icons/Capella_PhysicalPartition.gif
diff --git a/template/.polarion/icons/PhysicalPathInvolvement.gif b/template/.polarion/icons/Capella_PhysicalPathInvolvement.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalPathInvolvement.gif
rename to template/.polarion/icons/Capella_PhysicalPathInvolvement.gif
diff --git a/template/.polarion/icons/PhysicalPathReference.gif b/template/.polarion/icons/Capella_PhysicalPathReference.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalPathReference.gif
rename to template/.polarion/icons/Capella_PhysicalPathReference.gif
diff --git a/template/.polarion/icons/PhysicalPort.gif b/template/.polarion/icons/Capella_PhysicalPort.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalPort.gif
rename to template/.polarion/icons/Capella_PhysicalPort.gif
diff --git a/template/.polarion/icons/PhysicalQuantity.gif b/template/.polarion/icons/Capella_PhysicalQuantity.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalQuantity.gif
rename to template/.polarion/icons/Capella_PhysicalQuantity.gif
diff --git a/template/.polarion/icons/PhysicalRealizationDiagram.gif b/template/.polarion/icons/Capella_PhysicalRealizationDiagram.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalRealizationDiagram.gif
rename to template/.polarion/icons/Capella_PhysicalRealizationDiagram.gif
diff --git a/template/.polarion/icons/PhysicalSlot.gif b/template/.polarion/icons/Capella_PhysicalSlot.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalSlot.gif
rename to template/.polarion/icons/Capella_PhysicalSlot.gif
diff --git a/template/.polarion/icons/PhysicalSymbolicValue.gif b/template/.polarion/icons/Capella_PhysicalSymbolicValue.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalSymbolicValue.gif
rename to template/.polarion/icons/Capella_PhysicalSymbolicValue.gif
diff --git a/template/.polarion/icons/PhysicalValueReference.gif b/template/.polarion/icons/Capella_PhysicalValueReference.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalValueReference.gif
rename to template/.polarion/icons/Capella_PhysicalValueReference.gif
diff --git a/template/.polarion/icons/PhysicalValueReferenceLink.gif b/template/.polarion/icons/Capella_PhysicalValueReferenceLink.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalValueReferenceLink.gif
rename to template/.polarion/icons/Capella_PhysicalValueReferenceLink.gif
diff --git a/template/.polarion/icons/PortAllocation.gif b/template/.polarion/icons/Capella_PortAllocation.gif
similarity index 100%
rename from template/.polarion/icons/PortAllocation.gif
rename to template/.polarion/icons/Capella_PortAllocation.gif
diff --git a/template/.polarion/icons/PortCommunication.gif b/template/.polarion/icons/Capella_PortCommunication.gif
similarity index 100%
rename from template/.polarion/icons/PortCommunication.gif
rename to template/.polarion/icons/Capella_PortCommunication.gif
diff --git a/template/.polarion/icons/PortCommunicationEnd.gif b/template/.polarion/icons/Capella_PortCommunicationEnd.gif
similarity index 100%
rename from template/.polarion/icons/PortCommunicationEnd.gif
rename to template/.polarion/icons/Capella_PortCommunicationEnd.gif
diff --git a/template/.polarion/icons/PortCommunication_WB.gif b/template/.polarion/icons/Capella_PortCommunication_WB.gif
similarity index 100%
rename from template/.polarion/icons/PortCommunication_WB.gif
rename to template/.polarion/icons/Capella_PortCommunication_WB.gif
diff --git a/template/.polarion/icons/PortRealisation.gif b/template/.polarion/icons/Capella_PortRealisation.gif
similarity index 100%
rename from template/.polarion/icons/PortRealisation.gif
rename to template/.polarion/icons/Capella_PortRealisation.gif
diff --git a/template/.polarion/icons/PortType.gif b/template/.polarion/icons/Capella_PortType.gif
similarity index 100%
rename from template/.polarion/icons/PortType.gif
rename to template/.polarion/icons/Capella_PortType.gif
diff --git a/template/.polarion/icons/PostCond.gif b/template/.polarion/icons/Capella_PostCond.gif
similarity index 100%
rename from template/.polarion/icons/PostCond.gif
rename to template/.polarion/icons/Capella_PostCond.gif
diff --git a/template/.polarion/icons/PostCondition.gif b/template/.polarion/icons/Capella_PostCondition.gif
similarity index 100%
rename from template/.polarion/icons/PostCondition.gif
rename to template/.polarion/icons/Capella_PostCondition.gif
diff --git a/template/.polarion/icons/PreCond.gif b/template/.polarion/icons/Capella_PreCond.gif
similarity index 100%
rename from template/.polarion/icons/PreCond.gif
rename to template/.polarion/icons/Capella_PreCond.gif
diff --git a/template/.polarion/icons/PreCondition.gif b/template/.polarion/icons/Capella_PreCondition.gif
similarity index 100%
rename from template/.polarion/icons/PreCondition.gif
rename to template/.polarion/icons/Capella_PreCondition.gif
diff --git a/template/.polarion/icons/PrimeItemCI.gif b/template/.polarion/icons/Capella_PrimeItemCI.gif
similarity index 100%
rename from template/.polarion/icons/PrimeItemCI.gif
rename to template/.polarion/icons/Capella_PrimeItemCI.gif
diff --git a/template/.polarion/icons/Process.gif b/template/.polarion/icons/Capella_Process.gif
similarity index 100%
rename from template/.polarion/icons/Process.gif
rename to template/.polarion/icons/Capella_Process.gif
diff --git a/template/.polarion/icons/Project.gif b/template/.polarion/icons/Capella_Project.gif
similarity index 100%
rename from template/.polarion/icons/Project.gif
rename to template/.polarion/icons/Capella_Project.gif
diff --git a/template/.polarion/icons/Property.gif b/template/.polarion/icons/Capella_Property.gif
similarity index 100%
rename from template/.polarion/icons/Property.gif
rename to template/.polarion/icons/Capella_Property.gif
diff --git a/template/.polarion/icons/PropertyDefaultValueReference.gif b/template/.polarion/icons/Capella_PropertyDefaultValueReference.gif
similarity index 100%
rename from template/.polarion/icons/PropertyDefaultValueReference.gif
rename to template/.polarion/icons/Capella_PropertyDefaultValueReference.gif
diff --git a/template/.polarion/icons/PropertyMaxCardReference.gif b/template/.polarion/icons/Capella_PropertyMaxCardReference.gif
similarity index 100%
rename from template/.polarion/icons/PropertyMaxCardReference.gif
rename to template/.polarion/icons/Capella_PropertyMaxCardReference.gif
diff --git a/template/.polarion/icons/PropertyMinCardReference.gif b/template/.polarion/icons/Capella_PropertyMinCardReference.gif
similarity index 100%
rename from template/.polarion/icons/PropertyMinCardReference.gif
rename to template/.polarion/icons/Capella_PropertyMinCardReference.gif
diff --git a/template/.polarion/icons/PropertyReferenceLink.gif b/template/.polarion/icons/Capella_PropertyReferenceLink.gif
similarity index 100%
rename from template/.polarion/icons/PropertyReferenceLink.gif
rename to template/.polarion/icons/Capella_PropertyReferenceLink.gif
diff --git a/template/.polarion/icons/Provide.gif b/template/.polarion/icons/Capella_Provide.gif
similarity index 100%
rename from template/.polarion/icons/Provide.gif
rename to template/.polarion/icons/Capella_Provide.gif
diff --git a/template/.polarion/icons/Pseudostate.gif b/template/.polarion/icons/Capella_Pseudostate.gif
similarity index 100%
rename from template/.polarion/icons/Pseudostate.gif
rename to template/.polarion/icons/Capella_Pseudostate.gif
diff --git a/template/.polarion/icons/Pseudostate_deepHistory.gif b/template/.polarion/icons/Capella_Pseudostate_deepHistory.gif
similarity index 100%
rename from template/.polarion/icons/Pseudostate_deepHistory.gif
rename to template/.polarion/icons/Capella_Pseudostate_deepHistory.gif
diff --git a/template/.polarion/icons/Pseudostate_entryPoint.gif b/template/.polarion/icons/Capella_Pseudostate_entryPoint.gif
similarity index 100%
rename from template/.polarion/icons/Pseudostate_entryPoint.gif
rename to template/.polarion/icons/Capella_Pseudostate_entryPoint.gif
diff --git a/template/.polarion/icons/Pseudostate_exitPoint.gif b/template/.polarion/icons/Capella_Pseudostate_exitPoint.gif
similarity index 100%
rename from template/.polarion/icons/Pseudostate_exitPoint.gif
rename to template/.polarion/icons/Capella_Pseudostate_exitPoint.gif
diff --git a/template/.polarion/icons/Pseudostate_shallowHistory.gif b/template/.polarion/icons/Capella_Pseudostate_shallowHistory.gif
similarity index 100%
rename from template/.polarion/icons/Pseudostate_shallowHistory.gif
rename to template/.polarion/icons/Capella_Pseudostate_shallowHistory.gif
diff --git a/template/.polarion/icons/Realisation.gif b/template/.polarion/icons/Capella_Realisation.gif
similarity index 100%
rename from template/.polarion/icons/Realisation.gif
rename to template/.polarion/icons/Capella_Realisation.gif
diff --git a/template/.polarion/icons/ReferenceModelFile.gif b/template/.polarion/icons/Capella_ReferenceModelFile.gif
similarity index 100%
rename from template/.polarion/icons/ReferenceModelFile.gif
rename to template/.polarion/icons/Capella_ReferenceModelFile.gif
diff --git a/template/.polarion/icons/RefinementLink.gif b/template/.polarion/icons/Capella_RefinementLink.gif
similarity index 100%
rename from template/.polarion/icons/RefinementLink.gif
rename to template/.polarion/icons/Capella_RefinementLink.gif
diff --git a/template/.polarion/icons/Region.gif b/template/.polarion/icons/Capella_Region.gif
similarity index 100%
rename from template/.polarion/icons/Region.gif
rename to template/.polarion/icons/Capella_Region.gif
diff --git a/template/.polarion/icons/Require.gif b/template/.polarion/icons/Capella_Require.gif
similarity index 100%
rename from template/.polarion/icons/Require.gif
rename to template/.polarion/icons/Capella_Require.gif
diff --git a/template/.polarion/icons/RequirementAction.gif b/template/.polarion/icons/Capella_RequirementAction.gif
similarity index 100%
rename from template/.polarion/icons/RequirementAction.gif
rename to template/.polarion/icons/Capella_RequirementAction.gif
diff --git a/template/.polarion/icons/RequirementModelFile.gif b/template/.polarion/icons/Capella_RequirementModelFile.gif
similarity index 100%
rename from template/.polarion/icons/RequirementModelFile.gif
rename to template/.polarion/icons/Capella_RequirementModelFile.gif
diff --git a/template/.polarion/icons/RequirementPkg.gif b/template/.polarion/icons/Capella_RequirementPkg.gif
similarity index 100%
rename from template/.polarion/icons/RequirementPkg.gif
rename to template/.polarion/icons/Capella_RequirementPkg.gif
diff --git a/template/.polarion/icons/RequirementsPkg.gif b/template/.polarion/icons/Capella_RequirementsPkg.gif
similarity index 100%
rename from template/.polarion/icons/RequirementsPkg.gif
rename to template/.polarion/icons/Capella_RequirementsPkg.gif
diff --git a/template/.polarion/icons/RequirementsTrace.gif b/template/.polarion/icons/Capella_RequirementsTrace.gif
similarity index 100%
rename from template/.polarion/icons/RequirementsTrace.gif
rename to template/.polarion/icons/Capella_RequirementsTrace.gif
diff --git a/template/.polarion/icons/ReuseLink.gif b/template/.polarion/icons/Capella_ReuseLink.gif
similarity index 100%
rename from template/.polarion/icons/ReuseLink.gif
rename to template/.polarion/icons/Capella_ReuseLink.gif
diff --git a/template/.polarion/icons/Role.gif b/template/.polarion/icons/Capella_Role.gif
similarity index 100%
rename from template/.polarion/icons/Role.gif
rename to template/.polarion/icons/Capella_Role.gif
diff --git a/template/.polarion/icons/RoleAllocation.gif b/template/.polarion/icons/Capella_RoleAllocation.gif
similarity index 100%
rename from template/.polarion/icons/RoleAllocation.gif
rename to template/.polarion/icons/Capella_RoleAllocation.gif
diff --git a/template/.polarion/icons/RoleAssemblyUsage.gif b/template/.polarion/icons/Capella_RoleAssemblyUsage.gif
similarity index 100%
rename from template/.polarion/icons/RoleAssemblyUsage.gif
rename to template/.polarion/icons/Capella_RoleAssemblyUsage.gif
diff --git a/template/.polarion/icons/RolePkg.gif b/template/.polarion/icons/Capella_RolePkg.gif
similarity index 100%
rename from template/.polarion/icons/RolePkg.gif
rename to template/.polarion/icons/Capella_RolePkg.gif
diff --git a/template/.polarion/icons/ScenarioDiagram.gif b/template/.polarion/icons/Capella_ScenarioDiagram.gif
similarity index 100%
rename from template/.polarion/icons/ScenarioDiagram.gif
rename to template/.polarion/icons/Capella_ScenarioDiagram.gif
diff --git a/template/.polarion/icons/SequenceLink.gif b/template/.polarion/icons/Capella_SequenceLink.gif
similarity index 100%
rename from template/.polarion/icons/SequenceLink.gif
rename to template/.polarion/icons/Capella_SequenceLink.gif
diff --git a/template/.polarion/icons/SequenceMessageArmTimer.gif b/template/.polarion/icons/Capella_SequenceMessageArmTimer.gif
similarity index 100%
rename from template/.polarion/icons/SequenceMessageArmTimer.gif
rename to template/.polarion/icons/Capella_SequenceMessageArmTimer.gif
diff --git a/template/.polarion/icons/SequenceMessageCancelTimer.gif b/template/.polarion/icons/Capella_SequenceMessageCancelTimer.gif
similarity index 100%
rename from template/.polarion/icons/SequenceMessageCancelTimer.gif
rename to template/.polarion/icons/Capella_SequenceMessageCancelTimer.gif
diff --git a/template/.polarion/icons/SequenceMessageWithReply.gif b/template/.polarion/icons/Capella_SequenceMessageWithReply.gif
similarity index 100%
rename from template/.polarion/icons/SequenceMessageWithReply.gif
rename to template/.polarion/icons/Capella_SequenceMessageWithReply.gif
diff --git a/template/.polarion/icons/Service.gif b/template/.polarion/icons/Capella_Service.gif
similarity index 100%
rename from template/.polarion/icons/Service.gif
rename to template/.polarion/icons/Capella_Service.gif
diff --git a/template/.polarion/icons/Interface.gif b/template/.polarion/icons/Capella_ServiceProviderInterface.gif
similarity index 100%
rename from template/.polarion/icons/Interface.gif
rename to template/.polarion/icons/Capella_ServiceProviderInterface.gif
diff --git a/template/.polarion/icons/SharedPkg.gif b/template/.polarion/icons/Capella_SharedPkg.gif
similarity index 100%
rename from template/.polarion/icons/SharedPkg.gif
rename to template/.polarion/icons/Capella_SharedPkg.gif
diff --git a/template/.polarion/icons/SharedmodelModelFile.gif b/template/.polarion/icons/Capella_SharedmodelModelFile.gif
similarity index 100%
rename from template/.polarion/icons/SharedmodelModelFile.gif
rename to template/.polarion/icons/Capella_SharedmodelModelFile.gif
diff --git a/template/.polarion/icons/ShowHide.gif b/template/.polarion/icons/Capella_ShowHide.gif
similarity index 100%
rename from template/.polarion/icons/ShowHide.gif
rename to template/.polarion/icons/Capella_ShowHide.gif
diff --git a/template/.polarion/icons/Signal.gif b/template/.polarion/icons/Capella_Signal.gif
similarity index 100%
rename from template/.polarion/icons/Signal.gif
rename to template/.polarion/icons/Capella_Signal.gif
diff --git a/template/.polarion/icons/SignalDiagram.gif b/template/.polarion/icons/Capella_SignalDiagram.gif
similarity index 100%
rename from template/.polarion/icons/SignalDiagram.gif
rename to template/.polarion/icons/Capella_SignalDiagram.gif
diff --git a/template/.polarion/icons/SignalInstance.gif b/template/.polarion/icons/Capella_SignalInstance.gif
similarity index 100%
rename from template/.polarion/icons/SignalInstance.gif
rename to template/.polarion/icons/Capella_SignalInstance.gif
diff --git a/template/.polarion/icons/PhysicalObjectPkg.gif b/template/.polarion/icons/Capella_SignalPkg.gif
similarity index 100%
rename from template/.polarion/icons/PhysicalObjectPkg.gif
rename to template/.polarion/icons/Capella_SignalPkg.gif
diff --git a/template/.polarion/icons/ServiceProviderInterface.gif b/template/.polarion/icons/Capella_SignalReceiverInterface.gif
similarity index 100%
rename from template/.polarion/icons/ServiceProviderInterface.gif
rename to template/.polarion/icons/Capella_SignalReceiverInterface.gif
diff --git a/template/.polarion/icons/SignalReception.gif b/template/.polarion/icons/Capella_SignalReception.gif
similarity index 100%
rename from template/.polarion/icons/SignalReception.gif
rename to template/.polarion/icons/Capella_SignalReception.gif
diff --git a/template/.polarion/icons/SignalsDiagram.gif b/template/.polarion/icons/Capella_SignalsDiagram.gif
similarity index 100%
rename from template/.polarion/icons/SignalsDiagram.gif
rename to template/.polarion/icons/Capella_SignalsDiagram.gif
diff --git a/template/.polarion/icons/SimpleLink.gif b/template/.polarion/icons/Capella_SimpleLink.gif
similarity index 100%
rename from template/.polarion/icons/SimpleLink.gif
rename to template/.polarion/icons/Capella_SimpleLink.gif
diff --git a/template/.polarion/icons/Slot.gif b/template/.polarion/icons/Capella_Slot.gif
similarity index 100%
rename from template/.polarion/icons/Slot.gif
rename to template/.polarion/icons/Capella_Slot.gif
diff --git a/template/.polarion/icons/StandardPort.gif b/template/.polarion/icons/Capella_StandardPort.gif
similarity index 100%
rename from template/.polarion/icons/StandardPort.gif
rename to template/.polarion/icons/Capella_StandardPort.gif
diff --git a/template/.polarion/icons/StateTransition.gif b/template/.polarion/icons/Capella_StateTransition.gif
similarity index 100%
rename from template/.polarion/icons/StateTransition.gif
rename to template/.polarion/icons/Capella_StateTransition.gif
diff --git a/template/.polarion/icons/StatemachineModelFile.gif b/template/.polarion/icons/Capella_StatemachineModelFile.gif
similarity index 100%
rename from template/.polarion/icons/StatemachineModelFile.gif
rename to template/.polarion/icons/Capella_StatemachineModelFile.gif
diff --git a/template/.polarion/icons/StringExpression.gif b/template/.polarion/icons/Capella_StringExpression.gif
similarity index 100%
rename from template/.polarion/icons/StringExpression.gif
rename to template/.polarion/icons/Capella_StringExpression.gif
diff --git a/template/.polarion/icons/StringReference.gif b/template/.polarion/icons/Capella_StringReference.gif
similarity index 100%
rename from template/.polarion/icons/StringReference.gif
rename to template/.polarion/icons/Capella_StringReference.gif
diff --git a/template/.polarion/icons/StringSymbolicValue.gif b/template/.polarion/icons/Capella_StringSymbolicValue.gif
similarity index 100%
rename from template/.polarion/icons/StringSymbolicValue.gif
rename to template/.polarion/icons/Capella_StringSymbolicValue.gif
diff --git a/template/.polarion/icons/StringType.gif b/template/.polarion/icons/Capella_StringType.gif
similarity index 100%
rename from template/.polarion/icons/StringType.gif
rename to template/.polarion/icons/Capella_StringType.gif
diff --git a/template/.polarion/icons/StringValueReferenceLink.gif b/template/.polarion/icons/Capella_StringValueReferenceLink.gif
similarity index 100%
rename from template/.polarion/icons/StringValueReferenceLink.gif
rename to template/.polarion/icons/Capella_StringValueReferenceLink.gif
diff --git a/template/.polarion/icons/SubOpActivityPkg.gif b/template/.polarion/icons/Capella_SubOpActivityPkg.gif
similarity index 100%
rename from template/.polarion/icons/SubOpActivityPkg.gif
rename to template/.polarion/icons/Capella_SubOpActivityPkg.gif
diff --git a/template/.polarion/icons/Swimlane.gif b/template/.polarion/icons/Capella_Swimlane.gif
similarity index 100%
rename from template/.polarion/icons/Swimlane.gif
rename to template/.polarion/icons/Capella_Swimlane.gif
diff --git a/template/.polarion/icons/SystemActor.gif b/template/.polarion/icons/Capella_SystemActor.gif
similarity index 100%
rename from template/.polarion/icons/SystemActor.gif
rename to template/.polarion/icons/Capella_SystemActor.gif
diff --git a/template/.polarion/icons/SystemActorInteractionDiagram.gif b/template/.polarion/icons/Capella_SystemActorInteractionDiagram.gif
similarity index 100%
rename from template/.polarion/icons/SystemActorInteractionDiagram.gif
rename to template/.polarion/icons/Capella_SystemActorInteractionDiagram.gif
diff --git a/template/.polarion/icons/SystemAnalysis.gif b/template/.polarion/icons/Capella_SystemAnalysis.gif
similarity index 100%
rename from template/.polarion/icons/SystemAnalysis.gif
rename to template/.polarion/icons/Capella_SystemAnalysis.gif
diff --git a/template/.polarion/icons/SystemCI.gif b/template/.polarion/icons/Capella_SystemCI.gif
similarity index 100%
rename from template/.polarion/icons/SystemCI.gif
rename to template/.polarion/icons/Capella_SystemCI.gif
diff --git a/template/.polarion/icons/SystemCommunication.gif b/template/.polarion/icons/Capella_SystemCommunication.gif
similarity index 100%
rename from template/.polarion/icons/SystemCommunication.gif
rename to template/.polarion/icons/Capella_SystemCommunication.gif
diff --git a/template/.polarion/icons/SystemCommunicationHook.gif b/template/.polarion/icons/Capella_SystemCommunicationHook.gif
similarity index 100%
rename from template/.polarion/icons/SystemCommunicationHook.gif
rename to template/.polarion/icons/Capella_SystemCommunicationHook.gif
diff --git a/template/.polarion/icons/SystemComponentCapabilityRealizationInvolvement.gif b/template/.polarion/icons/Capella_SystemComponentCapabilityRealizationInvolvement.gif
similarity index 100%
rename from template/.polarion/icons/SystemComponentCapabilityRealizationInvolvement.gif
rename to template/.polarion/icons/Capella_SystemComponentCapabilityRealizationInvolvement.gif
diff --git a/template/.polarion/icons/SystemComponentCapabilityRealizationInvolvment.gif b/template/.polarion/icons/Capella_SystemComponentCapabilityRealizationInvolvment.gif
similarity index 100%
rename from template/.polarion/icons/SystemComponentCapabilityRealizationInvolvment.gif
rename to template/.polarion/icons/Capella_SystemComponentCapabilityRealizationInvolvment.gif
diff --git a/template/.polarion/icons/SystemEngineering.gif b/template/.polarion/icons/Capella_SystemEngineering.gif
similarity index 100%
rename from template/.polarion/icons/SystemEngineering.gif
rename to template/.polarion/icons/Capella_SystemEngineering.gif
diff --git a/template/.polarion/icons/SystemEngineeringPkg.gif b/template/.polarion/icons/Capella_SystemEngineeringPkg.gif
similarity index 100%
rename from template/.polarion/icons/SystemEngineeringPkg.gif
rename to template/.polarion/icons/Capella_SystemEngineeringPkg.gif
diff --git a/template/.polarion/icons/SystemFunctionPkg.gif b/template/.polarion/icons/Capella_SystemFunctionPkg.gif
similarity index 100%
rename from template/.polarion/icons/SystemFunctionPkg.gif
rename to template/.polarion/icons/Capella_SystemFunctionPkg.gif
diff --git a/template/.polarion/icons/SystemFunction_WB.gif b/template/.polarion/icons/Capella_SystemFunction_WB.gif
similarity index 100%
rename from template/.polarion/icons/SystemFunction_WB.gif
rename to template/.polarion/icons/Capella_SystemFunction_WB.gif
diff --git a/template/.polarion/icons/SystemFunctionalInterfaceRequirement.gif b/template/.polarion/icons/Capella_SystemFunctionalInterfaceRequirement.gif
similarity index 100%
rename from template/.polarion/icons/SystemFunctionalInterfaceRequirement.gif
rename to template/.polarion/icons/Capella_SystemFunctionalInterfaceRequirement.gif
diff --git a/template/.polarion/icons/SystemFunctionalRequirement.gif b/template/.polarion/icons/Capella_SystemFunctionalRequirement.gif
similarity index 100%
rename from template/.polarion/icons/SystemFunctionalRequirement.gif
rename to template/.polarion/icons/Capella_SystemFunctionalRequirement.gif
diff --git a/template/.polarion/icons/SystemInterfaceDiagram.gif b/template/.polarion/icons/Capella_SystemInterfaceDiagram.gif
similarity index 100%
rename from template/.polarion/icons/SystemInterfaceDiagram.gif
rename to template/.polarion/icons/Capella_SystemInterfaceDiagram.gif
diff --git a/template/.polarion/icons/SystemNonFunctionalInterfaceRequirement.gif b/template/.polarion/icons/Capella_SystemNonFunctionalInterfaceRequirement.gif
similarity index 100%
rename from template/.polarion/icons/SystemNonFunctionalInterfaceRequirement.gif
rename to template/.polarion/icons/Capella_SystemNonFunctionalInterfaceRequirement.gif
diff --git a/template/.polarion/icons/SystemNonFunctionalRequirement.gif b/template/.polarion/icons/Capella_SystemNonFunctionalRequirement.gif
similarity index 100%
rename from template/.polarion/icons/SystemNonFunctionalRequirement.gif
rename to template/.polarion/icons/Capella_SystemNonFunctionalRequirement.gif
diff --git a/template/.polarion/icons/SystemRealisation.gif b/template/.polarion/icons/Capella_SystemRealisation.gif
similarity index 100%
rename from template/.polarion/icons/SystemRealisation.gif
rename to template/.polarion/icons/Capella_SystemRealisation.gif
diff --git a/template/.polarion/icons/SystemUserRequirement.gif b/template/.polarion/icons/Capella_SystemUserRequirement.gif
similarity index 100%
rename from template/.polarion/icons/SystemUserRequirement.gif
rename to template/.polarion/icons/Capella_SystemUserRequirement.gif
diff --git a/template/.polarion/icons/TerminateNode.gif b/template/.polarion/icons/Capella_TerminateNode.gif
similarity index 100%
rename from template/.polarion/icons/TerminateNode.gif
rename to template/.polarion/icons/Capella_TerminateNode.gif
diff --git a/template/.polarion/icons/TerminatePseudoState.gif b/template/.polarion/icons/Capella_TerminatePseudoState.gif
similarity index 100%
rename from template/.polarion/icons/TerminatePseudoState.gif
rename to template/.polarion/icons/Capella_TerminatePseudoState.gif
diff --git a/template/.polarion/icons/TitleBlock.gif b/template/.polarion/icons/Capella_TitleBlock.gif
similarity index 100%
rename from template/.polarion/icons/TitleBlock.gif
rename to template/.polarion/icons/Capella_TitleBlock.gif
diff --git a/template/.polarion/icons/TitleBlockCell.gif b/template/.polarion/icons/Capella_TitleBlockCell.gif
similarity index 100%
rename from template/.polarion/icons/TitleBlockCell.gif
rename to template/.polarion/icons/Capella_TitleBlockCell.gif
diff --git a/template/.polarion/icons/TitleBlockColumn.gif b/template/.polarion/icons/Capella_TitleBlockColumn.gif
similarity index 100%
rename from template/.polarion/icons/TitleBlockColumn.gif
rename to template/.polarion/icons/Capella_TitleBlockColumn.gif
diff --git a/template/.polarion/icons/TitleBlockColumnRemove.gif b/template/.polarion/icons/Capella_TitleBlockColumnRemove.gif
similarity index 100%
rename from template/.polarion/icons/TitleBlockColumnRemove.gif
rename to template/.polarion/icons/Capella_TitleBlockColumnRemove.gif
diff --git a/template/.polarion/icons/TitleBlockLine.gif b/template/.polarion/icons/Capella_TitleBlockLine.gif
similarity index 100%
rename from template/.polarion/icons/TitleBlockLine.gif
rename to template/.polarion/icons/Capella_TitleBlockLine.gif
diff --git a/template/.polarion/icons/TitleBlockLineRemove.gif b/template/.polarion/icons/Capella_TitleBlockLineRemove.gif
similarity index 100%
rename from template/.polarion/icons/TitleBlockLineRemove.gif
rename to template/.polarion/icons/Capella_TitleBlockLineRemove.gif
diff --git a/template/.polarion/icons/TransfoLink.gif b/template/.polarion/icons/Capella_TransfoLink.gif
similarity index 100%
rename from template/.polarion/icons/TransfoLink.gif
rename to template/.polarion/icons/Capella_TransfoLink.gif
diff --git a/template/.polarion/icons/Transition.gif b/template/.polarion/icons/Capella_Transition.gif
similarity index 100%
rename from template/.polarion/icons/Transition.gif
rename to template/.polarion/icons/Capella_Transition.gif
diff --git a/template/.polarion/icons/Trigger.gif b/template/.polarion/icons/Capella_Trigger.gif
similarity index 100%
rename from template/.polarion/icons/Trigger.gif
rename to template/.polarion/icons/Capella_Trigger.gif
diff --git a/template/.polarion/icons/TypeDeploymentLink.gif b/template/.polarion/icons/Capella_TypeDeploymentLink.gif
similarity index 100%
rename from template/.polarion/icons/TypeDeploymentLink.gif
rename to template/.polarion/icons/Capella_TypeDeploymentLink.gif
diff --git a/template/.polarion/icons/TypeReference.gif b/template/.polarion/icons/Capella_TypeReference.gif
similarity index 100%
rename from template/.polarion/icons/TypeReference.gif
rename to template/.polarion/icons/Capella_TypeReference.gif
diff --git a/template/.polarion/icons/UnaryExpression.gif b/template/.polarion/icons/Capella_UnaryExpression.gif
similarity index 100%
rename from template/.polarion/icons/UnaryExpression.gif
rename to template/.polarion/icons/Capella_UnaryExpression.gif
diff --git a/template/.polarion/icons/Union.gif b/template/.polarion/icons/Capella_Union.gif
similarity index 100%
rename from template/.polarion/icons/Union.gif
rename to template/.polarion/icons/Capella_Union.gif
diff --git a/template/.polarion/icons/UnionProperty.gif b/template/.polarion/icons/Capella_UnionProperty.gif
similarity index 100%
rename from template/.polarion/icons/UnionProperty.gif
rename to template/.polarion/icons/Capella_UnionProperty.gif
diff --git a/template/.polarion/icons/Unit.gif b/template/.polarion/icons/Capella_Unit.gif
similarity index 100%
rename from template/.polarion/icons/Unit.gif
rename to template/.polarion/icons/Capella_Unit.gif
diff --git a/template/.polarion/icons/UnitReferenceLink.gif b/template/.polarion/icons/Capella_UnitReferenceLink.gif
similarity index 100%
rename from template/.polarion/icons/UnitReferenceLink.gif
rename to template/.polarion/icons/Capella_UnitReferenceLink.gif
diff --git a/template/.polarion/icons/UnlimitedNaturalReferenceLink.gif b/template/.polarion/icons/Capella_UnlimitedNaturalReferenceLink.gif
similarity index 100%
rename from template/.polarion/icons/UnlimitedNaturalReferenceLink.gif
rename to template/.polarion/icons/Capella_UnlimitedNaturalReferenceLink.gif
diff --git a/template/.polarion/icons/UnlimitedNaturalType.gif b/template/.polarion/icons/Capella_UnlimitedNaturalType.gif
similarity index 100%
rename from template/.polarion/icons/UnlimitedNaturalType.gif
rename to template/.polarion/icons/Capella_UnlimitedNaturalType.gif
diff --git a/template/.polarion/icons/Use.gif b/template/.polarion/icons/Capella_Use.gif
similarity index 100%
rename from template/.polarion/icons/Use.gif
rename to template/.polarion/icons/Capella_Use.gif
diff --git a/template/.polarion/icons/SignalPkg.gif b/template/.polarion/icons/Capella_ValuePkg.gif
similarity index 100%
rename from template/.polarion/icons/SignalPkg.gif
rename to template/.polarion/icons/Capella_ValuePkg.gif
diff --git a/template/.polarion/icons/XiModelFile.gif b/template/.polarion/icons/Capella_XiModelFile.gif
similarity index 100%
rename from template/.polarion/icons/XiModelFile.gif
rename to template/.polarion/icons/Capella_XiModelFile.gif
diff --git a/template/.polarion/icons/capella_process_16.gif b/template/.polarion/icons/Capella_capella_process_16.gif
similarity index 100%
rename from template/.polarion/icons/capella_process_16.gif
rename to template/.polarion/icons/Capella_capella_process_16.gif
diff --git a/template/.polarion/icons/capella_trace_16.gif b/template/.polarion/icons/Capella_capella_trace_16.gif
similarity index 100%
rename from template/.polarion/icons/capella_trace_16.gif
rename to template/.polarion/icons/Capella_capella_trace_16.gif
diff --git a/template/.polarion/icons/melody_validate_16.gif b/template/.polarion/icons/Capella_capella_validate_16.gif
similarity index 100%
rename from template/.polarion/icons/melody_validate_16.gif
rename to template/.polarion/icons/Capella_capella_validate_16.gif
diff --git a/template/.polarion/icons/containedIn.png b/template/.polarion/icons/Capella_containedIn.png
similarity index 100%
rename from template/.polarion/icons/containedIn.png
rename to template/.polarion/icons/Capella_containedIn.png
diff --git a/template/.polarion/icons/melody_analysis_16.gif b/template/.polarion/icons/Capella_melody_analysis_16.gif
similarity index 100%
rename from template/.polarion/icons/melody_analysis_16.gif
rename to template/.polarion/icons/Capella_melody_analysis_16.gif
diff --git a/template/.polarion/icons/melody_audit_16.gif b/template/.polarion/icons/Capella_melody_audit_16.gif
similarity index 100%
rename from template/.polarion/icons/melody_audit_16.gif
rename to template/.polarion/icons/Capella_melody_audit_16.gif
diff --git a/template/.polarion/icons/melody_consult_16.gif b/template/.polarion/icons/Capella_melody_consult_16.gif
similarity index 100%
rename from template/.polarion/icons/melody_consult_16.gif
rename to template/.polarion/icons/Capella_melody_consult_16.gif
diff --git a/template/.polarion/icons/melody_copy_16.gif b/template/.polarion/icons/Capella_melody_copy_16.gif
similarity index 100%
rename from template/.polarion/icons/melody_copy_16.gif
rename to template/.polarion/icons/Capella_melody_copy_16.gif
diff --git a/template/.polarion/icons/melody_cut_16.gif b/template/.polarion/icons/Capella_melody_cut_16.gif
similarity index 100%
rename from template/.polarion/icons/melody_cut_16.gif
rename to template/.polarion/icons/Capella_melody_cut_16.gif
diff --git a/template/.polarion/icons/melody_delete_16.gif b/template/.polarion/icons/Capella_melody_delete_16.gif
similarity index 100%
rename from template/.polarion/icons/melody_delete_16.gif
rename to template/.polarion/icons/Capella_melody_delete_16.gif
diff --git a/template/.polarion/icons/melody_edit_16.gif b/template/.polarion/icons/Capella_melody_edit_16.gif
similarity index 100%
rename from template/.polarion/icons/melody_edit_16.gif
rename to template/.polarion/icons/Capella_melody_edit_16.gif
diff --git a/template/.polarion/icons/melody_export_16.gif b/template/.polarion/icons/Capella_melody_export_16.gif
similarity index 100%
rename from template/.polarion/icons/melody_export_16.gif
rename to template/.polarion/icons/Capella_melody_export_16.gif
diff --git a/template/.polarion/icons/melody_import_16.gif b/template/.polarion/icons/Capella_melody_import_16.gif
similarity index 100%
rename from template/.polarion/icons/melody_import_16.gif
rename to template/.polarion/icons/Capella_melody_import_16.gif
diff --git a/template/.polarion/icons/melody_navigate_16.gif b/template/.polarion/icons/Capella_melody_navigate_16.gif
similarity index 100%
rename from template/.polarion/icons/melody_navigate_16.gif
rename to template/.polarion/icons/Capella_melody_navigate_16.gif
diff --git a/template/.polarion/icons/melody_papeete_16.gif b/template/.polarion/icons/Capella_melody_papeete_16.gif
similarity index 100%
rename from template/.polarion/icons/melody_papeete_16.gif
rename to template/.polarion/icons/Capella_melody_papeete_16.gif
diff --git a/template/.polarion/icons/melody_papeete_doc_16.gif b/template/.polarion/icons/Capella_melody_papeete_doc_16.gif
similarity index 100%
rename from template/.polarion/icons/melody_papeete_doc_16.gif
rename to template/.polarion/icons/Capella_melody_papeete_doc_16.gif
diff --git a/template/.polarion/icons/melody_paste_16.gif b/template/.polarion/icons/Capella_melody_paste_16.gif
similarity index 100%
rename from template/.polarion/icons/melody_paste_16.gif
rename to template/.polarion/icons/Capella_melody_paste_16.gif
diff --git a/template/.polarion/icons/melody_process_16.gif b/template/.polarion/icons/Capella_melody_process_16.gif
similarity index 100%
rename from template/.polarion/icons/melody_process_16.gif
rename to template/.polarion/icons/Capella_melody_process_16.gif
diff --git a/template/.polarion/icons/melody_trace_16.gif b/template/.polarion/icons/Capella_melody_trace_16.gif
similarity index 100%
rename from template/.polarion/icons/melody_trace_16.gif
rename to template/.polarion/icons/Capella_melody_trace_16.gif
diff --git a/template/.polarion/icons/Capella_melody_validate_16.gif b/template/.polarion/icons/Capella_melody_validate_16.gif
new file mode 100644
index 0000000..0ace829
Binary files /dev/null and b/template/.polarion/icons/Capella_melody_validate_16.gif differ
diff --git a/template/.polarion/icons/Class.gif b/template/.polarion/icons/Class.gif
deleted file mode 100644
index f3830c0..0000000
Binary files a/template/.polarion/icons/Class.gif and /dev/null differ
diff --git a/template/.polarion/icons/ComponentExchange.gif b/template/.polarion/icons/ComponentExchange.gif
deleted file mode 100644
index 3d378ad..0000000
Binary files a/template/.polarion/icons/ComponentExchange.gif and /dev/null differ
diff --git a/template/.polarion/icons/Connection.gif b/template/.polarion/icons/Connection.gif
deleted file mode 100644
index 3d378ad..0000000
Binary files a/template/.polarion/icons/Connection.gif and /dev/null differ
diff --git a/template/.polarion/icons/FunctionalChain.gif b/template/.polarion/icons/FunctionalChain.gif
deleted file mode 100644
index 8ea632f..0000000
Binary files a/template/.polarion/icons/FunctionalChain.gif and /dev/null differ
diff --git a/template/.polarion/icons/FunctionalExchange.gif b/template/.polarion/icons/FunctionalExchange.gif
deleted file mode 100644
index 0cbcba9..0000000
Binary files a/template/.polarion/icons/FunctionalExchange.gif and /dev/null differ
diff --git a/template/.polarion/icons/FunctionalExchange_OA.gif b/template/.polarion/icons/FunctionalExchange_OA.gif
deleted file mode 100644
index 30036ea..0000000
Binary files a/template/.polarion/icons/FunctionalExchange_OA.gif and /dev/null differ
diff --git a/template/.polarion/icons/InformationItem.gif b/template/.polarion/icons/InformationItem.gif
deleted file mode 100644
index 9b6bfcb..0000000
Binary files a/template/.polarion/icons/InformationItem.gif and /dev/null differ
diff --git a/template/.polarion/icons/LogicalComponent.gif b/template/.polarion/icons/LogicalComponent.gif
deleted file mode 100644
index a23708c..0000000
Binary files a/template/.polarion/icons/LogicalComponent.gif and /dev/null differ
diff --git a/template/.polarion/icons/LogicalFunction.gif b/template/.polarion/icons/LogicalFunction.gif
deleted file mode 100644
index 9f84889..0000000
Binary files a/template/.polarion/icons/LogicalFunction.gif and /dev/null differ
diff --git a/template/.polarion/icons/Mission.gif b/template/.polarion/icons/Mission.gif
deleted file mode 100644
index 576dc68..0000000
Binary files a/template/.polarion/icons/Mission.gif and /dev/null differ
diff --git a/template/.polarion/icons/OperationalActivity.gif b/template/.polarion/icons/OperationalActivity.gif
deleted file mode 100644
index 085c0d9..0000000
Binary files a/template/.polarion/icons/OperationalActivity.gif and /dev/null differ
diff --git a/template/.polarion/icons/OperationalCapability.gif b/template/.polarion/icons/OperationalCapability.gif
deleted file mode 100644
index 35ef84e..0000000
Binary files a/template/.polarion/icons/OperationalCapability.gif and /dev/null differ
diff --git a/template/.polarion/icons/Scenario.gif b/template/.polarion/icons/Scenario.gif
deleted file mode 100644
index af387c1..0000000
Binary files a/template/.polarion/icons/Scenario.gif and /dev/null differ
diff --git a/template/.polarion/icons/SequenceMessage.gif b/template/.polarion/icons/SequenceMessage.gif
deleted file mode 100644
index 6a35981..0000000
Binary files a/template/.polarion/icons/SequenceMessage.gif and /dev/null differ
diff --git a/template/.polarion/icons/SignalReceiverInterface.gif b/template/.polarion/icons/SignalReceiverInterface.gif
deleted file mode 100644
index 3274006..0000000
Binary files a/template/.polarion/icons/SignalReceiverInterface.gif and /dev/null differ
diff --git a/template/.polarion/icons/StateMachine.gif b/template/.polarion/icons/StateMachine.gif
deleted file mode 100644
index 327ab31..0000000
Binary files a/template/.polarion/icons/StateMachine.gif and /dev/null differ
diff --git a/template/.polarion/icons/System.gif b/template/.polarion/icons/System.gif
deleted file mode 100644
index dad866c..0000000
Binary files a/template/.polarion/icons/System.gif and /dev/null differ
diff --git a/template/.polarion/icons/SystemFunction.gif b/template/.polarion/icons/SystemFunction.gif
deleted file mode 100644
index bd34016..0000000
Binary files a/template/.polarion/icons/SystemFunction.gif and /dev/null differ
diff --git a/template/.polarion/icons/ValuePkg.gif b/template/.polarion/icons/ValuePkg.gif
deleted file mode 100644
index 2840950..0000000
Binary files a/template/.polarion/icons/ValuePkg.gif and /dev/null differ
diff --git a/template/.polarion/tracker/fields/workitem-link-role-enum.xml b/template/.polarion/tracker/fields/workitem-link-role-enum.xml
index 8c5c9a4..bca15cf 100644
--- a/template/.polarion/tracker/fields/workitem-link-role-enum.xml
+++ b/template/.polarion/tracker/fields/workitem-link-role-enum.xml
@@ -10,14 +10,14 @@ SPDX-License-Identifier: Apache-2.0 -->
     </option>
     <option id="describes" description="Capability beschrieben von der FC" name="describes" oppositeName="is described by" sortOrder="69">
         <rule from="systemFunctionalChain" to="systemCapability" />
-        <rule from="isScenario" to="capabilityRealization" />
+        <rule from="scenario" to="capabilityRealization" />
     </option>
     <option id="involves" description="Function beteiligt an der SFC" name="involves" oppositeName="is involved by" sortOrder="72">
         <rule from="systemFunctionalChain" to="systemFunction" />
         <rule from="systemFunctionalChain" sameType="true" />
         <rule from="systemFunctionalChain" to="functionalExchange" />
-        <rule from="isScenario" to="logicalComponent" />
-        <rule from="isScenario" to="logicalActor" />
+        <rule from="scenario" to="logicalComponent" />
+        <rule from="scenario" to="logicalActor" />
         <rule from="operationalProcess" to="operationalActivity, entity, operationalInteraction" />
         <rule from="operationalProcess" sameType="true" />
     </option>
@@ -52,10 +52,10 @@ SPDX-License-Identifier: Apache-2.0 -->
         <rule from="logicalFunction, systemFunction" to="functionalExchange" />
     </option>
     <option id="ownedMessages" name="owned messages" oppositeName="owner" sortOrder="82">
-        <rule from="isScenario" to="sequenceMessage" />
+        <rule from="scenario" to="sequenceMessage" />
     </option>
     <option id="references" name="references" oppositeName="is referenced by" sortOrder="83">
-        <rule from="isScenario" sameType="true" />
+        <rule from="scenario" sameType="true" />
     </option>
     <option id="exchange_items" name="carries" oppositeName="is carried by" sortOrder="84">
         <rule from="functionalExchange, componentExchange , logicalFunctionalExchange, systemFunctionalExchange" to="exchangeItem" />
diff --git a/template/.polarion/tracker/fields/workitem-type-enum.xml b/template/.polarion/tracker/fields/workitem-type-enum.xml
index b95a8d7..ff94b12 100644
--- a/template/.polarion/tracker/fields/workitem-type-enum.xml
+++ b/template/.polarion/tracker/fields/workitem-type-enum.xml
@@ -7,40 +7,37 @@ SPDX-License-Identifier: Apache-2.0 -->
   <option id="operationalEntity" name="Operational Entity" description="An Operational Entity" iconURL="/polarion/icons/project/%project-id%/Capella_Entity.gif" sortOrder="3"/>
   <option id="operationalActivity" name="Operational Activity" description="An Operational Activity" iconURL="/polarion/icons/project/%project-id%/Capella_OperationalActivity.gif" sortOrder="4"/>
   <option id="operationalInteraction" name="Operational Interaction" description="Die &quot;Operational Interaction&quot; ist Capella-intern als &quot;Functional Exchange&quot; abgebildet und bezeichnet den Datenaustausch, welche zwischen den Operational Activities statt findet." iconURL="/polarion/icons/project/%project-id%/Capella_FunctionalExchange_OA.gif" sortOrder="5"/>
-  <option id="operationalProcess" name="Operational Process" description="A Functional Chain is a mean to describe one specific path among all possible paths traversing the dataflow, either to describe an expected behavior of the System in a given context, or in order to express some non functional properties along this functional path (latency, criticality, confidentiality, redundancy...).  An elementary Functional Chain is made of a succession of Functions and Exchanges across a functional dataflow, starting and ending with a Function (allocated to the System or to an Actor)." iconURL="/polarion/icons/project/%project-id%/OperationalProcess.gif" sortOrder="6"/>
-  <option id="systemActor" name="System Actor" description="Beschreibt ein eine external Entität welche mit dem System interagiert." iconURL="/polarion/icons/project/%project-id%/Capella_Actor.gif" sortOrder="7"/>
+  <option id="operationalProcess" name="Operational Process" description="A Functional Chain is a mean to describe one specific path among all possible paths traversing the dataflow, either to describe an expected behavior of the System in a given context, or in order to express some non functional properties along this functional path (latency, criticality, confidentiality, redundancy...).  An elementary Functional Chain is made of a succession of Functions and Exchanges across a functional dataflow, starting and ending with a Function (allocated to the System or to an Actor)." iconURL="/polarion/icons/project/%project-id%/Capella_OperationalProcess.gif" sortOrder="6"/>
+  <option id="systemActor" name="System Actor" description="Beschreibt ein eine external Entität welche mit dem System interagiert." iconURL="/polarion/icons/project/%project-id%/Capella_Actor_WB.gif" sortOrder="7"/>
   <option id="systemCapability" name="System Capability" description="Bezeichnet die Fähigkeit vom System einen Service zur Verfügung zu stellen, welches die Erfüllung von operationalen Activities unterstützt." iconURL="/polarion/icons/project/%project-id%/Capella_Capability.gif" sortOrder="8"/>
   <option id="capabilityRealization" name="Capability Realization" description="Bezeichnet die Fähigkeit vom System einen Service zur Verfügung zu stellen, welches die Erfüllung von System Capabilities unterstützt." iconURL="/polarion/icons/project/%project-id%/Capella_CapabilityRealization.gif" sortOrder="9"/>
   <option id="systemComponent" name="System Component" description="Beschreibt ein System oder Teile davon." iconURL="/polarion/icons/project/%project-id%/Capella_System.gif" sortOrder="10"/>
   <option id="systemFunction" name="System Function" description="Beschreibt eine Funktionalität des Systems welche in der Regel eine oder mehrere Operational Activities verfeinert." iconURL="/polarion/icons/project/%project-id%/Capella_SystemFunction.gif" sortOrder="11"/>
   <option id="functionalExchange" name="Functional Exchange" description="Bezeichnet der Informationsaustausch zwischen Functions." iconURL="/polarion/icons/project/%project-id%/Capella_FunctionalExchange.gif" sortOrder="12"/>
-  <option id="systemFunctionalExchange" name="System Functional Exchange" description="Bezeichnet der Informationsaustausch zwischen System Functions." iconURL="/polarion/icons/%project-id%/Capella_FunctionalExchange.gif" sortOrder="13"/>
-  <option id="logicalFunctionalExchange" name="Logical Functional Exchange" description="Bezeichnet der Informationsaustausch zwischen Logical Functions." iconURL="/polarion/icons/%project-id%/Capella_FunctionalExchange.gif" sortOrder="14"/>
-  <option id="systemFunctionalChain" name="System Functional Chain" description="A Functional Chain is a mean to describe one specific path among all possible paths traversing the dataflow, either to describe an expected behavior of the System in a given context, or in order to express some non functional properties along this functional path (latency, criticality, confidentiality, redundancy...).  An elementary Functional Chain is made of a succession of Functions and Exchanges across a functional dataflow, starting and ending with a Function (allocated to the System or to an Actor)." iconURL="/polarion/icons/project/%project-id%/Capella_FunctionalChain.gif" sortOrder="15"/>
-  <option id="componentExchange" name="Component Exchange" description="Repräsentiert die Verbindung zwischen zwei Komponenten, oder Zwischen einer Komponente und einem Aktor." iconURL="/polarion/icons/project/%project-id%/Capella_ComponentExchange.gif" sortOrder="16"/>
-  <option id="isScenario" name="IS Scenario" description="Interface Scenario zeigt die Kommunikation zwischen Komponenten und/oder Aktoren mit Sequence Messages." iconURL="/polarion/icons/project/%project-id%/Capella_Scenario.gif" sortOrder="17"/>
-  <option id="logicalComponent" name="Logical Component" description="Beschreibt die Logische Bestandteile des Systems als &quot;white box&quot;, ohne Technologie Behaftung." iconURL="/polarion/icons/project/%project-id%/Capella_LogicalComponent.gif" sortOrder="18"/>
-  <option id="logicalActor" name="Logical Actor" description="Logische Entität welche mit System-Komponente(n) interagiert." iconURL="/polarion/icons/project/%project-id%/Capella_Actor.gif" sortOrder="19"/>
-  <option id="logicalFunction" name="Logical Function" description="Funktion beschrieben in der Logischen Architektur. Sie verfeinert in der Regel eine oder Mehrere Funktionen in der System Architektur." iconURL="/polarion/icons/project/%project-id%/Capella_LogicalFunction.gif" sortOrder="20"/>
-  <option id="sequenceMessage" name="Sequence Message" description="A Sequence Message carry an interaction between the element represented by the source lifeline and the one represented by the target lifeline.  In Capella, according to the kind of Scenario, Sequence Messages can refer to Functional Exchanges, Component Exchanges, Exchange Items." iconURL="/polarion/icons/project/%project-id%/Capella_SequenceMessage.gif" sortOrder="21"/>
-  <option id="exchangeItem" name="Exchange Item" description="Beschreibt ein Set von konsistenten Daten unter Betrachtung eines Verwendungskontextes." iconURL="/polarion/icons/project/%project-id%/Capella_ExchangeItem.gif" sortOrder="22"/>
-  <option id="logicalInterface" name="Logical Interface" description="Definiert den Contract zwischen Komponenten und/oder zwischen Komponenten und Aktoren. die Logische Interfaces beschreiben diesen Contract in jeweils einer Richtung der Kommunikation." iconURL="/polarion/icons/project/%project-id%/Capella_Interface.gif" sortOrder="23"/>
-  <option id="class" name="Class" description="Beschreibt die Struktur und Inhalt von Informationen." iconURL="/polarion/icons/project/%project-id%/Capella_Class.gif" sortOrder="24"/>
-  <option id="logicalBiDirectionalInterface" name="Logical Bi-Directional Interface" description="Bezeichnet den Contract zwischen Komponenten und/oder zwischen Komponenten und Aktoren und gruppiert die Logischen Interfaces." iconURL="/polarion/icons/project/%project-id%/Capella_InterfacePkg.gif" sortOrder="25"/>
-  <option id="rationale" name="Rationale" description="The recommended way for managing requirement in to use a dedicated tool (typically DOORS).  However, in certain cases, it might be useful to manage requirements in a simpler way within Capella. Requirements can be attached to any Capella model element." iconURL="/polarion/icons/project/%project-id%/Capella_rationale.gif" sortOrder="26"/>
-  <option id="stateMachine" name="State Machine" description="Each set of Modes or States linked to each other by transitions is named a finite State Machine. A Mode or State ‘A’ can be decomposed into sub-modes (and possibly sub-states) Ai. Entering a Mode or State can: Enable or disable the activation of Functions (which might be only available in some Modes or States) Modify some attributes of Functions or Components (e.g. non functional properties) Modify global Data in the model." iconURL="/polarion/icons/project/%project-id%/Capella_StateMachine.gif" sortOrder="27"/>
-  <option id="communicationMean" name="Communication Mean" description="Communication Means have a slightly different meaning according to the followed model strategy. When following Arcadia, Component Exchanges basically connect Components (through Component Ports) and carry Functional Exchanges between the source and target Components. Their Kind in that case is set to FLOW. In a context where Components are reusable (i.e. can be used to type several Parts), Component Exchanges also serve to connect Parts (and thus, not directly Components at Type level). Their Kind in that case is set to ASSEMBLY.  Component Exchanges are also used technically to model Delegation between Component Ports (in that case, their Kind is set to DELEGATION)." iconURL="/polarion/icons/project/%project-id%/Capella_CommunicationMean.gif" sortOrder="28"/>
-  <option id="constraint" name="Constraint" description="A Constraint gives access to the specification." iconURL="/polarion/icons/project/%project-id%/Capella_Constraint.gif" sortOrder="29"/>
-  <option id="scenario" name="Scenario" description="Scenarios describe dynamic, time-related interactions between elements: Operational Entities and Actors, the System itself, the System Components. These interactions are expressed through temporally ordered Sequence Messages." iconURL="/polarion/icons/project/%project-id%/Capella_Scenario.gif" sortOrder="30"/>
-  <option id="physicalPath" name="Physical Path" description="A Physical Path is an ordered set of Physical Links conveying a Component Exchange." iconURL="/polarion/icons/project/%project-id%/Capella_PhysicalPath.gif" sortOrder="31"/>
-  <option id="physicalLink" name="Physical Link" description="Physical Links are the communication/transportation means linking Node Physical Components. They carry the Component Exchanges existing between the Behavior Physical Components." iconURL="/polarion/icons/project/%project-id%/Capella_PhysicalLink.gif" sortOrder="32"/>
-  <option id="physicalActor" name="Physical Actor" description="External entity (user, operator or other system) interacting directly with the System under study." iconURL="/polarion/icons/project/%project-id%/Capella_PhysicalActor.gif" sortOrder="33"/>
-  <option id="physicalFunction" name="Physical Function" description="A System/Logical/Physical Function is an action, an operation or a service fulfilled by one Component or Actor. It has input and output Ports, respectively targets and sources of Functional Exchanges (information, data, material, fluid, etc.)." iconURL="/polarion/icons/project/%project-id%/Capella_PhysicalFunction.gif" sortOrder="34"/>
-  <option id="physicalComponentBehavior" name="Physical Component Behavior" description="A Component is a constituent part of either the System or Internal Actors. He contributes to their behavior, properties and characteristics, by interacting with other Components and with both Internal and External Actors." iconURL="/polarion/icons/project/%project-id%/Capella_PhysicalComponentBehavior.gif" sortOrder="35"/>
-  <option id="physicalComponentNode" name="Physical Component Node" description="A Component is a constituent part of either the System or Internal Actors. He contributes to their behavior, properties and characteristics, by interacting with other Components and with both Internal and External Actors." iconURL="/polarion/icons/project/%project-id%/Capella_PhysicalComponentNode.gif" sortOrder="36"/>
-  <option id="physicalComponent" name="Physical Component" description="A Component is a constituent part of either the System or Internal Actors. He contributes to their behavior, properties and characteristics, by interacting with other Components and with both Internal and External Actors." iconURL="/polarion/icons/project/%project-id%/Capella_PhysicalComponent.gif" sortOrder="37"/>
-  <option id="mode" name="Mode" description="The Mode of an element defines the kind of element exploitation expected in given use conditions. A Mode is activated by operators. It is usually the result of a design decision and is an expected behavior feature of the element." iconURL="/polarion/icons/project/%project-id%/Capella_Mode.gif" sortOrder="38"/>
-  <option id="state" name="State" description="The State of an element characterizes the element behavior in given environmental conditions. A State is activated mainly by external conditions, or by operators. It may be unexpected and even suffered." iconURL="/polarion/icons/project/%project-id%/Capella_State.gif" sortOrder="39"/>
-  <option id="dataPkg" name="DataPkg" description="A Package storing class data." iconURL="/polarion/icons/project/%project-id%/Capella_DataPkg.gif" sortOrder="40"/>
-  <option id="property" name="Property" description="A property of a class." iconURL="/polarion/icons/project/%project-id%/Property.gif" sortOrder="41"/>
+  <option id="systemFunctionalChain" name="System Functional Chain" description="A Functional Chain is a mean to describe one specific path among all possible paths traversing the dataflow, either to describe an expected behavior of the System in a given context, or in order to express some non functional properties along this functional path (latency, criticality, confidentiality, redundancy...).  An elementary Functional Chain is made of a succession of Functions and Exchanges across a functional dataflow, starting and ending with a Function (allocated to the System or to an Actor)." iconURL="/polarion/icons/project/%project-id%/Capella_FunctionalChain.gif" sortOrder="13"/>
+  <option id="componentExchange" name="Component Exchange" description="Repräsentiert die Verbindung zwischen zwei Komponenten, oder Zwischen einer Komponente und einem Aktor." iconURL="/polarion/icons/project/%project-id%/Capella_ComponentExchange.gif" sortOrder="14"/>
+  <option id="logicalComponent" name="Logical Component" description="Beschreibt die Logische Bestandteile des Systems als &quot;white box&quot;, ohne Technologie Behaftung." iconURL="/polarion/icons/project/%project-id%/Capella_LogicalComponent.gif" sortOrder="15"/>
+  <option id="logicalActor" name="Logical Actor" description="Logische Entität welche mit System-Komponente(n) interagiert." iconURL="/polarion/icons/project/%project-id%/Capella_Actor_WB.gif" sortOrder="16"/>
+  <option id="logicalFunction" name="Logical Function" description="Funktion beschrieben in der Logischen Architektur. Sie verfeinert in der Regel eine oder Mehrere Funktionen in der System Architektur." iconURL="/polarion/icons/project/%project-id%/Capella_LogicalFunction.gif" sortOrder="17"/>
+  <option id="sequenceMessage" name="Sequence Message" description="A Sequence Message carry an interaction between the element represented by the source lifeline and the one represented by the target lifeline.  In Capella, according to the kind of Scenario, Sequence Messages can refer to Functional Exchanges, Component Exchanges, Exchange Items." iconURL="/polarion/icons/project/%project-id%/Capella_SequenceMessage.gif" sortOrder="18"/>
+  <option id="exchangeItem" name="Exchange Item" description="Beschreibt ein Set von konsistenten Daten unter Betrachtung eines Verwendungskontextes." iconURL="/polarion/icons/project/%project-id%/Capella_ExchangeItem.gif" sortOrder="19"/>
+  <option id="logicalInterface" name="Logical Interface" description="Definiert den Contract zwischen Komponenten und/oder zwischen Komponenten und Aktoren. die Logische Interfaces beschreiben diesen Contract in jeweils einer Richtung der Kommunikation." iconURL="/polarion/icons/project/%project-id%/Capella_Interface.gif" sortOrder="20"/>
+  <option id="class" name="Class" description="Beschreibt die Struktur und Inhalt von Informationen." iconURL="/polarion/icons/project/%project-id%/Capella_Class.gif" sortOrder="21"/>
+  <option id="logicalBiDirectionalInterface" name="Logical Bi-Directional Interface" description="Bezeichnet den Contract zwischen Komponenten und/oder zwischen Komponenten und Aktoren und gruppiert die Logischen Interfaces." iconURL="/polarion/icons/project/%project-id%/Capella_InterfacePkg.gif" sortOrder="22"/>
+  <option id="rationale" name="Rationale" description="The recommended way for managing requirement in to use a dedicated tool (typically DOORS).  However, in certain cases, it might be useful to manage requirements in a simpler way within Capella. Requirements can be attached to any Capella model element." iconURL="/polarion/icons/project/%project-id%/Capella_rationale.gif" sortOrder="23"/>
+  <option id="stateMachine" name="State Machine" description="Each set of Modes or States linked to each other by transitions is named a finite State Machine. A Mode or State ‘A’ can be decomposed into sub-modes (and possibly sub-states) Ai. Entering a Mode or State can: Enable or disable the activation of Functions (which might be only available in some Modes or States) Modify some attributes of Functions or Components (e.g. non functional properties) Modify global Data in the model." iconURL="/polarion/icons/project/%project-id%/Capella_StateMachine.gif" sortOrder="24"/>
+  <option id="communicationMean" name="Communication Mean" description="Communication Means have a slightly different meaning according to the followed model strategy. When following Arcadia, Component Exchanges basically connect Components (through Component Ports) and carry Functional Exchanges between the source and target Components. Their Kind in that case is set to FLOW. In a context where Components are reusable (i.e. can be used to type several Parts), Component Exchanges also serve to connect Parts (and thus, not directly Components at Type level). Their Kind in that case is set to ASSEMBLY.  Component Exchanges are also used technically to model Delegation between Component Ports (in that case, their Kind is set to DELEGATION)." iconURL="/polarion/icons/project/%project-id%/Capella_CommunicationMean.gif" sortOrder="25"/>
+  <option id="constraint" name="Constraint" description="A Constraint gives access to the specification." iconURL="/polarion/icons/project/%project-id%/Capella_Constraint.gif" sortOrder="26"/>
+  <option id="scenario" name="Scenario" description="Scenarios describe dynamic, time-related interactions between elements: Operational Entities and Actors, the System itself, the System Components. These interactions are expressed through temporally ordered Sequence Messages." iconURL="/polarion/icons/project/%project-id%/Capella_Scenario.gif" sortOrder="27"/>
+  <option id="physicalPath" name="Physical Path" description="A Physical Path is an ordered set of Physical Links conveying a Component Exchange." iconURL="/polarion/icons/project/%project-id%/Capella_PhysicalPath.gif" sortOrder="28"/>
+  <option id="physicalLink" name="Physical Link" description="Physical Links are the communication/transportation means linking Node Physical Components. They carry the Component Exchanges existing between the Behavior Physical Components." iconURL="/polarion/icons/project/%project-id%/Capella_PhysicalLink.gif" sortOrder="29"/>
+  <option id="physicalActor" name="Physical Actor" description="External entity (user, operator or other system) interacting directly with the System under study." iconURL="/polarion/icons/project/%project-id%/Capella_PhysicalActor.gif" sortOrder="30"/>
+  <option id="physicalFunction" name="Physical Function" description="A System/Logical/Physical Function is an action, an operation or a service fulfilled by one Component or Actor. It has input and output Ports, respectively targets and sources of Functional Exchanges (information, data, material, fluid, etc.)." iconURL="/polarion/icons/project/%project-id%/Capella_PhysicalFunction.gif" sortOrder="31"/>
+  <option id="physicalComponentBehavior" name="Physical Component Behavior" description="A Component is a constituent part of either the System or Internal Actors. He contributes to their behavior, properties and characteristics, by interacting with other Components and with both Internal and External Actors." iconURL="/polarion/icons/project/%project-id%/Capella_PhysicalComponentBehavior.gif" sortOrder="32"/>
+  <option id="physicalComponentNode" name="Physical Component Node" description="A Component is a constituent part of either the System or Internal Actors. He contributes to their behavior, properties and characteristics, by interacting with other Components and with both Internal and External Actors." iconURL="/polarion/icons/project/%project-id%/Capella_PhysicalComponentNode.gif" sortOrder="33"/>
+  <option id="physicalComponent" name="Physical Component" description="A Component is a constituent part of either the System or Internal Actors. He contributes to their behavior, properties and characteristics, by interacting with other Components and with both Internal and External Actors." iconURL="/polarion/icons/project/%project-id%/Capella_PhysicalComponent.gif" sortOrder="34"/>
+  <option id="mode" name="Mode" description="The Mode of an element defines the kind of element exploitation expected in given use conditions. A Mode is activated by operators. It is usually the result of a design decision and is an expected behavior feature of the element." iconURL="/polarion/icons/project/%project-id%/Capella_Mode.gif" sortOrder="35"/>
+  <option id="state" name="State" description="The State of an element characterizes the element behavior in given environmental conditions. A State is activated mainly by external conditions, or by operators. It may be unexpected and even suffered." iconURL="/polarion/icons/project/%project-id%/Capella_State.gif" sortOrder="36"/>
+  <option id="dataPkg" name="DataPkg" description="A Package storing class data." iconURL="/polarion/icons/project/%project-id%/Capella_DataPkg.gif" sortOrder="37"/>
+  <option id="property" name="Property" description="A property of a class." iconURL="/polarion/icons/project/%project-id%/Capella_Property.gif" sortOrder="38"/>
 </enumeration>