diff --git a/control-plane/config/samples/lazykoala_v1alpha1_inspector.yaml b/control-plane/config/samples/lazykoala_v1alpha1_inspector.yaml
index 08b9890..98006a4 100644
--- a/control-plane/config/samples/lazykoala_v1alpha1_inspector.yaml
+++ b/control-plane/config/samples/lazykoala_v1alpha1_inspector.yaml
@@ -1,40 +1,44 @@
 apiVersion: lazykoala.isala.me/v1alpha1
 kind: Inspector
 metadata:
-  name: service-1-6c63f0f5
+  name: service-1
+  namespace: default
 spec:
-  deploymentRef: service-1-6c63f0f5
-  serviceRef: service-1-6c63f0f5
+  deploymentRef: service-1-0e762959
+  serviceRef: service-1-0e762959
   namespace: default
   modelURI: path/to/checkpoint.ckpt
 ---
 apiVersion: lazykoala.isala.me/v1alpha1
 kind: Inspector
 metadata:
-  name: service-2-6c63f0f5
+  name: service-2
+  namespace: default
 spec:
-  deploymentRef: service-2-6c63f0f5
-  serviceRef: service-2-6c63f0f5
+  deploymentRef: service-2-0e762959
+  serviceRef: service-2-0e762959
   namespace: default
   modelURI: path/to/checkpoint.ckpt
 ---
 apiVersion: lazykoala.isala.me/v1alpha1
 kind: Inspector
 metadata:
-  name: service-3-6c63f0f5
+  name: service-3
+  namespace: default
 spec:
-  deploymentRef: service-3-6c63f0f5
-  serviceRef: service-3-6c63f0f5
+  deploymentRef: service-3-0e762959
+  serviceRef: service-3-0e762959
   namespace: default
   modelURI: path/to/checkpoint.ckpt
 ---
 apiVersion: lazykoala.isala.me/v1alpha1
 kind: Inspector
 metadata:
-  name: service-4-6c63f0f5
+  name: service-4
+  namespace: default
 spec:
-  deploymentRef: service-4-6c63f0f5
-  serviceRef: service-4-6c63f0f5
+  deploymentRef: service-4-0e762959
+  serviceRef: service-4-0e762959
   namespace: default
   modelURI: path/to/checkpoint.ckpt
 ---
diff --git a/control-plane/controllers/inspector_controller.go b/control-plane/controllers/inspector_controller.go
index 9c2b069..9e0c2ce 100644
--- a/control-plane/controllers/inspector_controller.go
+++ b/control-plane/controllers/inspector_controller.go
@@ -134,7 +134,7 @@ func (r *InspectorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	for _, pod := range podList.Items {
 		scrapePoints[pod.Status.PodIP] = ScrapePoint{
 			Name:        pod.ObjectMeta.Name,
-			ServiceName: inspector.Spec.DeploymentRef,
+			ServiceName: inspector.ObjectMeta.Name,
 			Namespace:   inspector.Spec.Namespace,
 			Node:        &pod.Spec.NodeName,
 			IsService:   false,
@@ -152,7 +152,7 @@ func (r *InspectorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 
 	scrapePoints[serviceRef.Spec.ClusterIP] = ScrapePoint{
 		Name:        serviceRef.ObjectMeta.Name,
-		ServiceName: inspector.Spec.DeploymentRef,
+		ServiceName: inspector.ObjectMeta.Name,
 		Namespace:   inspector.Spec.Namespace,
 		Node:        nil,
 		IsService:   true,