diff --git a/controller/controller.go b/controller/controller.go
index 869ced18067536346736dadb5d8476a753124fb8..7f602931773b5a31887bd3175b47c56c239444bc 100644
--- a/controller/controller.go
+++ b/controller/controller.go
@@ -48,7 +48,7 @@ type Core struct {
 	pndStore        networkdomain.PndStore
 	userService     rbac.UserService
 	roleService     rbac.RoleService
-	topologyService topology.TService
+	topologyService topology.TopologyService
 	nodeService     nodes.Service
 	portService     ports.Service
 	httpServer      *http.Server
diff --git a/controller/northbound/server/nbi.go b/controller/northbound/server/nbi.go
index 2837d930510738c78828adfb9671801b0d67ffed..1b022237fec1f0ac9eb6d408760d46607df11dd6 100644
--- a/controller/northbound/server/nbi.go
+++ b/controller/northbound/server/nbi.go
@@ -34,7 +34,7 @@ func NewNBI(
 	users rbacInterfaces.UserService,
 	roles rbacInterfaces.RoleService,
 	jwt rbac.JWTManager,
-	topologyService topology.TService,
+	topologyService topology.TopologyService,
 	nodeService nodes.Service,
 	portService ports.Service,
 
diff --git a/controller/northbound/server/topology.go b/controller/northbound/server/topology.go
index 21e9f5df72da9ad5261cc38e09d94a4651e5ee90..71ee89a6fb9db008628cc810efe9d751677f8b2c 100644
--- a/controller/northbound/server/topology.go
+++ b/controller/northbound/server/topology.go
@@ -17,14 +17,14 @@ import (
 // Topology holds a topologyService and represents a TopologyServiceServer.
 type Topology struct {
 	apb.UnimplementedTopologyServiceServer
-	topologyService topology.TService
+	topologyService topology.TopologyService
 	nodeService     nodes.Service
 	portService     ports.Service
 }
 
 // NewTopologyServer receives a topologyService and returns a new TopologyServer.
 func NewTopologyServer(
-	service topology.TService,
+	service topology.TopologyService,
 	nodeService nodes.Service,
 	portService ports.Service,
 ) *Topology {
diff --git a/controller/topology/topologyService.go b/controller/topology/topologyService.go
index 0061f874f5ee5fce5f250f075b32786e5df44fb2..71881fd4d25075bd6eeb6e585f5d1344724470e3 100644
--- a/controller/topology/topologyService.go
+++ b/controller/topology/topologyService.go
@@ -2,8 +2,8 @@ package topology
 
 import "code.fbi.h-da.de/danet/gosdn/controller/topology/links"
 
-// TService defines an interface for a TopologyService
-type TService interface {
+// TopologyService defines an interface for a TopologyService
+type TopologyService interface {
 	AddLink(links.Link) error
 	UpdateLink(links.Link) error
 	DeleteLink(links.Link) error
@@ -16,7 +16,7 @@ type Service struct {
 }
 
 // NewTopologyService creates a new TopologyService
-func NewTopologyService(store Store) TService {
+func NewTopologyService(store Store) TopologyService {
 	return &Service{
 		store: store,
 	}