diff --git a/tests/Plugins/LinuxDeviceTreeGenerator/tst_LinuxDeviceTreeGenerator.cpp b/tests/Plugins/LinuxDeviceTreeGenerator/tst_LinuxDeviceTreeGenerator.cpp
index 4a2086727..09d3a99a3 100644
--- a/tests/Plugins/LinuxDeviceTreeGenerator/tst_LinuxDeviceTreeGenerator.cpp
+++ b/tests/Plugins/LinuxDeviceTreeGenerator/tst_LinuxDeviceTreeGenerator.cpp
@@ -21,9 +21,9 @@
 #include <IPXACTmodels/Component/AddressBlock.h>
 #include <IPXACTmodels/Component/AddressSpace.h>
 #include <IPXACTmodels/Component/BusInterface.h>
-#include <IPXACTmodels/Component/MasterInterface.h>
-#include <IPXACTmodels/Component/SlaveInterface.h>
-#include <IPXACTmodels/Component/MirroredSlaveInterface.h>
+#include <IPXACTmodels/Component/InitiatorInterface.h>
+#include <IPXACTmodels/Component/TargetInterface.h>
+#include <IPXACTmodels/Component/MirroredTargetInterface.h>
 #include <IPXACTmodels/Component/TransparentBridge.h>
 #include <IPXACTmodels/Component/Cpu.h>
 
@@ -1305,7 +1305,7 @@ QSharedPointer<BusInterface> tst_LinuxDeviceTreeGenerator::createMasterBusInterf
 
     if (referencedSpace)
     {
-        QSharedPointer<MasterInterface> newMasterInterface(new MasterInterface());
+        QSharedPointer<InitiatorInterface> newMasterInterface(new InitiatorInterface());
         newMasterInterface->setAddressSpaceRef(referencedSpace->name());
         newMasterBus->setMaster(newMasterInterface);
     }
@@ -1321,7 +1321,7 @@ QSharedPointer<BusInterface> tst_LinuxDeviceTreeGenerator::createSlaveBusInterfa
 {
     QSharedPointer<BusInterface> newSlaveBus = createBusInterface(busName, General::SLAVE, containingComponent);
 
-    QSharedPointer<SlaveInterface> newSlaveInterface(new SlaveInterface());
+    QSharedPointer<TargetInterface> newSlaveInterface(new TargetInterface());
 
     if (referencedMap)
     {
@@ -1342,7 +1342,7 @@ QSharedPointer<BusInterface> tst_LinuxDeviceTreeGenerator::createMirroredSlaveBu
     QSharedPointer<BusInterface> newMirrorSlaveBus =
         createBusInterface(busName, General::MIRROREDSLAVE, containingComponent);
 
-    QSharedPointer<MirroredSlaveInterface> newMirrorSlaveInterface(new MirroredSlaveInterface());
+    QSharedPointer<MirroredTargetInterface> newMirrorSlaveInterface(new MirroredTargetInterface());
     newMirrorSlaveInterface->setRange(remapRange);
     newMirrorSlaveInterface->setRemapAddress(remapAddress);