diff --git a/pkg/icingadb/v1/host.go b/pkg/icingadb/v1/host.go
index dc349d93..1035ee52 100644
--- a/pkg/icingadb/v1/host.go
+++ b/pkg/icingadb/v1/host.go
@@ -43,11 +43,7 @@ type Host struct {
 }
 
 func NewHost() contracts.Entity {
-	h := &Host{}
-	// TODO(el): Interfacify!
-	h.NameCi = &h.Name
-
-	return h
+	return &Host{}
 }
 
 // Assert interface compliance.
diff --git a/pkg/icingadb/v1/service.go b/pkg/icingadb/v1/service.go
index 1c51d4f1..b29d8e25 100644
--- a/pkg/icingadb/v1/service.go
+++ b/pkg/icingadb/v1/service.go
@@ -11,11 +11,7 @@ type Service struct {
 }
 
 func NewService() contracts.Entity {
-	s := &Service{}
-	// TODO(el): Interfacify!
-	s.NameCi = &s.Name
-
-	return s
+	return &Service{}
 }
 
 // Assert interface compliance.