diff --git a/pkg/cri/cri.go b/pkg/cri/cri.go
index 6b372d34c..a86ab39dd 100644
--- a/pkg/cri/cri.go
+++ b/pkg/cri/cri.go
@@ -127,28 +127,28 @@ func getServicesOpts(ic *plugin.InitContext) ([]containerd.ServicesOpt, error) {
 			return containerd.WithContentStore(s.(content.Store))
 		},
 		services.ImagesService: func(s interface{}) containerd.ServicesOpt {
-			return containerd.WithImageService(s.(images.ImagesClient))
+			return containerd.WithImageClient(s.(images.ImagesClient))
 		},
 		services.SnapshotsService: func(s interface{}) containerd.ServicesOpt {
 			return containerd.WithSnapshotters(s.(map[string]snapshots.Snapshotter))
 		},
 		services.ContainersService: func(s interface{}) containerd.ServicesOpt {
-			return containerd.WithContainerService(s.(containers.ContainersClient))
+			return containerd.WithContainerClient(s.(containers.ContainersClient))
 		},
 		services.TasksService: func(s interface{}) containerd.ServicesOpt {
-			return containerd.WithTaskService(s.(tasks.TasksClient))
+			return containerd.WithTaskClient(s.(tasks.TasksClient))
 		},
 		services.DiffService: func(s interface{}) containerd.ServicesOpt {
-			return containerd.WithDiffService(s.(diff.DiffClient))
+			return containerd.WithDiffClient(s.(diff.DiffClient))
 		},
 		services.NamespacesService: func(s interface{}) containerd.ServicesOpt {
-			return containerd.WithNamespaceService(s.(namespaces.NamespacesClient))
+			return containerd.WithNamespaceClient(s.(namespaces.NamespacesClient))
 		},
 		services.LeasesService: func(s interface{}) containerd.ServicesOpt {
 			return containerd.WithLeasesService(s.(leases.Manager))
 		},
 		services.IntrospectionService: func(s interface{}) containerd.ServicesOpt {
-			return containerd.WithIntrospectionService(s.(introspectionapi.IntrospectionClient))
+			return containerd.WithIntrospectionClient(s.(introspectionapi.IntrospectionClient))
 		},
 	} {
 		p := plugins[s]
diff --git a/runtime/restart/monitor/monitor.go b/runtime/restart/monitor/monitor.go
index 1c657bb34..19c0af0ef 100644
--- a/runtime/restart/monitor/monitor.go
+++ b/runtime/restart/monitor/monitor.go
@@ -103,22 +103,22 @@ func getServicesOpts(ic *plugin.InitContext) ([]containerd.ServicesOpt, error) {
 			return containerd.WithContentStore(s.(content.Store))
 		},
 		services.ImagesService: func(s interface{}) containerd.ServicesOpt {
-			return containerd.WithImageService(s.(images.ImagesClient))
+			return containerd.WithImageClient(s.(images.ImagesClient))
 		},
 		services.SnapshotsService: func(s interface{}) containerd.ServicesOpt {
 			return containerd.WithSnapshotters(s.(map[string]snapshots.Snapshotter))
 		},
 		services.ContainersService: func(s interface{}) containerd.ServicesOpt {
-			return containerd.WithContainerService(s.(containers.ContainersClient))
+			return containerd.WithContainerClient(s.(containers.ContainersClient))
 		},
 		services.TasksService: func(s interface{}) containerd.ServicesOpt {
-			return containerd.WithTaskService(s.(tasks.TasksClient))
+			return containerd.WithTaskClient(s.(tasks.TasksClient))
 		},
 		services.DiffService: func(s interface{}) containerd.ServicesOpt {
-			return containerd.WithDiffService(s.(diff.DiffClient))
+			return containerd.WithDiffClient(s.(diff.DiffClient))
 		},
 		services.NamespacesService: func(s interface{}) containerd.ServicesOpt {
-			return containerd.WithNamespaceService(s.(namespacesapi.NamespacesClient))
+			return containerd.WithNamespaceClient(s.(namespacesapi.NamespacesClient))
 		},
 		services.LeasesService: func(s interface{}) containerd.ServicesOpt {
 			return containerd.WithLeasesService(s.(leases.Manager))
diff --git a/services.go b/services.go
index d8fced559..e780e6ccf 100644
--- a/services.go
+++ b/services.go
@@ -55,13 +55,20 @@ func WithContentStore(contentStore content.Store) ServicesOpt {
 	}
 }
 
-// WithImageService sets the image service.
-func WithImageService(imageService imagesapi.ImagesClient) ServicesOpt {
+// WithImageClient sets the image service to use using an images client.
+func WithImageClient(imageService imagesapi.ImagesClient) ServicesOpt {
 	return func(s *services) {
 		s.imageStore = NewImageStoreFromClient(imageService)
 	}
 }
 
+// WithImageStore sets the image store.
+func WithImageStore(imageStore images.Store) ServicesOpt {
+	return func(s *services) {
+		s.imageStore = imageStore
+	}
+}
+
 // WithSnapshotters sets the snapshotters.
 func WithSnapshotters(snapshotters map[string]snapshots.Snapshotter) ServicesOpt {
 	return func(s *services) {
@@ -72,27 +79,41 @@ func WithSnapshotters(snapshotters map[string]snapshots.Snapshotter) ServicesOpt
 	}
 }
 
-// WithContainerService sets the container service.
-func WithContainerService(containerService containersapi.ContainersClient) ServicesOpt {
+// WithContainerClient sets the container service to use using a containers client.
+func WithContainerClient(containerService containersapi.ContainersClient) ServicesOpt {
 	return func(s *services) {
 		s.containerStore = NewRemoteContainerStore(containerService)
 	}
 }
 
-// WithTaskService sets the task service.
-func WithTaskService(taskService tasks.TasksClient) ServicesOpt {
+// WithContainerStore sets the container store.
+func WithContainerStore(containerStore containers.Store) ServicesOpt {
+	return func(s *services) {
+		s.containerStore = containerStore
+	}
+}
+
+// WithTaskClient sets the task service to use from a tasks client.
+func WithTaskClient(taskService tasks.TasksClient) ServicesOpt {
 	return func(s *services) {
 		s.taskService = taskService
 	}
 }
 
-// WithDiffService sets the diff service.
-func WithDiffService(diffService diff.DiffClient) ServicesOpt {
+// WithDiffClient sets the diff service to use from a diff client.
+func WithDiffClient(diffService diff.DiffClient) ServicesOpt {
 	return func(s *services) {
 		s.diffService = NewDiffServiceFromClient(diffService)
 	}
 }
 
+// WithDiffService sets the diff store.
+func WithDiffService(diffService DiffService) ServicesOpt {
+	return func(s *services) {
+		s.diffService = diffService
+	}
+}
+
 // WithEventService sets the event service.
 func WithEventService(eventService EventService) ServicesOpt {
 	return func(s *services) {
@@ -100,13 +121,20 @@ func WithEventService(eventService EventService) ServicesOpt {
 	}
 }
 
-// WithNamespaceService sets the namespace service.
-func WithNamespaceService(namespaceService namespacesapi.NamespacesClient) ServicesOpt {
+// WithNamespaceClient sets the namespace service using a namespaces client.
+func WithNamespaceClient(namespaceService namespacesapi.NamespacesClient) ServicesOpt {
 	return func(s *services) {
 		s.namespaceStore = NewNamespaceStoreFromClient(namespaceService)
 	}
 }
 
+// WithNamespaceService sets the namespace service.
+func WithNamespaceService(namespaceService namespaces.Store) ServicesOpt {
+	return func(s *services) {
+		s.namespaceStore = namespaceService
+	}
+}
+
 // WithLeasesService sets the lease service.
 func WithLeasesService(leasesService leases.Manager) ServicesOpt {
 	return func(s *services) {
@@ -114,9 +142,16 @@ func WithLeasesService(leasesService leases.Manager) ServicesOpt {
 	}
 }
 
-// WithIntrospectionService sets the introspection service.
-func WithIntrospectionService(in introspectionapi.IntrospectionClient) ServicesOpt {
+// WithIntrospectionClient sets the introspection service using an introspection client.
+func WithIntrospectionClient(in introspectionapi.IntrospectionClient) ServicesOpt {
 	return func(s *services) {
 		s.introspectionService = introspection.NewIntrospectionServiceFromClient(in)
 	}
 }
+
+// WithIntrospectionService sets the introspection service.
+func WithIntrospectionService(in introspection.Service) ServicesOpt {
+	return func(s *services) {
+		s.introspectionService = in
+	}
+}