diff --git a/org.fortiss.af3.platform.raspberry/model/raspberry.ecore b/org.fortiss.af3.platform.raspberry/model/raspberry.ecore
index c230bd8f659a8d847611f544132fb351ad33ac3f..1706b361720a1bbbbd74a3111516a0a35100d9d2 100644
--- a/org.fortiss.af3.platform.raspberry/model/raspberry.ecore
+++ b/org.fortiss.af3.platform.raspberry/model/raspberry.ecore
@@ -110,19 +110,21 @@
   </eSubpackages>
   <eSubpackages name="v2v" nsURI="http://www.fortiss.org/af3/platform/raspberry/v2v"
       nsPrefix="org-fortiss-af3-platform-raspberry-v2v">
-    <eClassifiers xsi:type="ecore:EClass" name="V2VPlatoonInput" eSuperTypes="#//RaspberryPiReceiverBase"/>
-    <eClassifiers xsi:type="ecore:EClass" name="V2VPlatoonOutput" eSuperTypes="#//RaspberryPiTransmitterBase"/>
-    <eClassifiers xsi:type="ecore:EClass" name="V2VLeaderHeartbeatInput" eSuperTypes="#//RaspberryPiReceiverBase"/>
-    <eClassifiers xsi:type="ecore:EClass" name="V2VLeaderHeartbeatOutput" eSuperTypes="#//RaspberryPiTransmitterBase"/>
-    <eClassifiers xsi:type="ecore:EClass" name="V2VFollowerInput" eSuperTypes="#//RaspberryPiReceiverBase"/>
-    <eClassifiers xsi:type="ecore:EClass" name="V2VFollowerOutput" eSuperTypes="#//RaspberryPiTransmitterBase"/>
-    <eClassifiers xsi:type="ecore:EClass" name="V2VLeavePlatoonInput" eSuperTypes="#//RaspberryPiReceiverBase"/>
-    <eClassifiers xsi:type="ecore:EClass" name="V2VLeavePlatoonOutput" eSuperTypes="#//RaspberryPiTransmitterBase"/>
-    <eClassifiers xsi:type="ecore:EClass" name="V2VSplitInput" eSuperTypes="#//RaspberryPiReceiverBase"/>
-    <eClassifiers xsi:type="ecore:EClass" name="V2VSplitOutput" eSuperTypes="#//RaspberryPiTransmitterBase"/>
-    <eClassifiers xsi:type="ecore:EClass" name="V2VNewLeaderInput" eSuperTypes="#//RaspberryPiReceiverBase"/>
-    <eClassifiers xsi:type="ecore:EClass" name="V2VNewLeaderOutput" eSuperTypes="#//RaspberryPiTransmitterBase"/>
-    <eClassifiers xsi:type="ecore:EClass" name="V2VFusePlatoonInput" eSuperTypes="#//RaspberryPiReceiverBase"/>
-    <eClassifiers xsi:type="ecore:EClass" name="V2VFusePlatoonOutput" eSuperTypes="#//RaspberryPiTransmitterBase"/>
+    <eClassifiers xsi:type="ecore:EClass" name="V2VPlatoonInput" eSuperTypes="#//v2v/V2VInput"/>
+    <eClassifiers xsi:type="ecore:EClass" name="V2VPlatoonOutput" eSuperTypes="#//v2v/V2VOuput"/>
+    <eClassifiers xsi:type="ecore:EClass" name="V2VLeaderHeartbeatInput" eSuperTypes="#//v2v/V2VInput"/>
+    <eClassifiers xsi:type="ecore:EClass" name="V2VLeaderHeartbeatOutput" eSuperTypes="#//v2v/V2VOuput"/>
+    <eClassifiers xsi:type="ecore:EClass" name="V2VFollowerInput" eSuperTypes="#//v2v/V2VInput"/>
+    <eClassifiers xsi:type="ecore:EClass" name="V2VFollowerOutput" eSuperTypes="#//v2v/V2VOuput"/>
+    <eClassifiers xsi:type="ecore:EClass" name="V2VLeavePlatoonInput" eSuperTypes="#//v2v/V2VInput"/>
+    <eClassifiers xsi:type="ecore:EClass" name="V2VLeavePlatoonOutput" eSuperTypes="#//v2v/V2VOuput"/>
+    <eClassifiers xsi:type="ecore:EClass" name="V2VSplitInput" eSuperTypes="#//v2v/V2VInput"/>
+    <eClassifiers xsi:type="ecore:EClass" name="V2VSplitOutput" eSuperTypes="#//v2v/V2VOuput"/>
+    <eClassifiers xsi:type="ecore:EClass" name="V2VNewLeaderInput" eSuperTypes="#//v2v/V2VInput"/>
+    <eClassifiers xsi:type="ecore:EClass" name="V2VNewLeaderOutput" eSuperTypes="#//v2v/V2VOuput"/>
+    <eClassifiers xsi:type="ecore:EClass" name="V2VFusePlatoonInput" eSuperTypes="#//v2v/V2VInput"/>
+    <eClassifiers xsi:type="ecore:EClass" name="V2VFusePlatoonOutput" eSuperTypes="#//v2v/V2VOuput"/>
+    <eClassifiers xsi:type="ecore:EClass" name="V2VInput" eSuperTypes="#//RaspberryPiReceiverBase"/>
+    <eClassifiers xsi:type="ecore:EClass" name="V2VOuput" eSuperTypes="#//RaspberryPiTransmitterBase"/>
   </eSubpackages>
 </ecore:EPackage>