diff --git a/applications/arista-routing-engine/main.go b/applications/arista-routing-engine/main.go
index caa3030cbdf66423ac93e7280195165077222bb0..7963c24ebbf47f475742c360b90036d66f08ea57 100644
--- a/applications/arista-routing-engine/main.go
+++ b/applications/arista-routing-engine/main.go
@@ -17,7 +17,7 @@ func main() {
 
 	eventServiceLinks, err := event.NewEventService(
 		queueCredentials,
-		[]event.Topic{event.Link, event.RoutingTable},
+		[]event.Topic{event.Link, event.Link},
 	)
 	if err != nil {
 		logrus.Errorf("failed to create event service. %v", err)
diff --git a/applications/hostname-checker/app.go b/applications/hostname-checker/app.go
index 01d6867c79fcb2920c1f4c683b5a9a4e832b2960..b2107e08536e5ac9d50730c15b88e4fcc3825f90 100644
--- a/applications/hostname-checker/app.go
+++ b/applications/hostname-checker/app.go
@@ -8,11 +8,11 @@ import (
 	"syscall"
 	"time"
 
-	"code.fbi.h-da.de/danet/gosdn/api/go/gosdn/device"
-
 	"github.com/google/uuid"
 	"github.com/openconfig/ygot/ygot"
 
+	"code.fbi.h-da.de/danet/gosdn/api/go/gosdn/networkelement"
+
 	"code.fbi.h-da.de/danet/gosdn/application-framework/event"
 	"code.fbi.h-da.de/danet/gosdn/application-framework/models"
 	"google.golang.org/grpc"
@@ -61,22 +61,22 @@ func (a *Application) Run() {
 
 func (a *Application) callback(event *event.Event) {
 	ctx := context.Background()
-	deviceServer := device.NewDeviceServiceClient(a.grpcClientConn)
+	networkElementServer := networkelement.NewNetworkElementServiceClient(a.grpcClientConn)
 
-	request := &device.GetDeviceRequest{
-		Timestamp: time.Now().UnixNano(),
-		DeviceID:  event.EntityID.String(),
+	request := &networkelement.GetNetworkElementRequest{
+		Timestamp:        time.Now().UnixNano(),
+		NetworkElementId: event.EntityID.String(),
 	}
 
-	response, err := deviceServer.Get(ctx, request)
+	response, err := networkElementServer.Get(ctx, request)
 	if err != nil {
 		fmt.Printf("Error %+v\n ", err)
 		return
 	}
 
-	fmt.Printf("\n[APP] Device-ID: %v, Device-Name: %+v \n", response.Device.Id, response.Device.Name)
+	fmt.Printf("\n[APP] Device-ID: %v, NetworkElement-Name: %+v \n", response.NetworkElement.Id, response.NetworkElement.Name)
 
-	d := NewDevice(uuid.MustParse(response.Device.Id), response.Device.Name)
+	d := NewDevice(uuid.MustParse(response.NetworkElement.Id), response.NetworkElement.Name)
 
 	// Create 'root' path to be able to load the whole model from the store.
 	path, err := ygot.StringToPath("/", ygot.StructuredPath)
@@ -85,7 +85,7 @@ func (a *Application) callback(event *event.Event) {
 	}
 
 	// Use unmarshall from the devices SBI to unmarshall ygot json in go struct.
-	err = models.Unmarshal([]byte(response.Device.Model), path, &d.Model)
+	err = models.Unmarshal([]byte(response.NetworkElement.Model), path, &d.Model)
 	if err != nil {
 		panic(err)
 	}
@@ -103,16 +103,16 @@ func (a *Application) callback(event *event.Event) {
 			panic(err)
 		}
 
-		requestUpdate := &device.UpdateDeviceRequest{
+		requestUpdate := &networkelement.UpdateNetworkElementRequest{
 			Timestamp: time.Now().UnixNano(),
-			Device: &device.Device{
+			NetworkElement: &networkelement.NetworkElement{
 				Id:    d.UUID.String(),
 				Name:  d.Name,
 				Model: modelAsString,
 			},
 		}
 
-		updateResponse, err := deviceServer.Update(ctx, requestUpdate)
+		updateResponse, err := networkElementServer.Update(ctx, requestUpdate)
 		if err != nil {
 			panic(err)
 		}
diff --git a/applications/hostname-checker/main.go b/applications/hostname-checker/main.go
index d68ebc9807316c01db9d3e0fc486613d49554c40..53c3e462e2012a3361148b41525cde678fa97292 100644
--- a/applications/hostname-checker/main.go
+++ b/applications/hostname-checker/main.go
@@ -17,7 +17,7 @@ func main() {
 
 	eventService, err := event.NewEventService(
 		queueCredentials,
-		[]event.Topic{event.Device},
+		[]event.Topic{event.ManagedNetworkElement},
 	)
 	if err != nil {
 		logrus.Errorf("failed to create event service. %v", err)