diff --git a/src/internal/m365/service/groups/export.go b/src/internal/m365/service/groups/export.go
index 82ee4548a..61b2546c8 100644
--- a/src/internal/m365/service/groups/export.go
+++ b/src/internal/m365/service/groups/export.go
@@ -19,26 +19,26 @@ import (
 	"github.com/alcionai/corso/src/pkg/path"
 )
 
-var _ inject.ServiceHandler = &groupsHandler{}
+var _ inject.ServiceHandler = &baseGroupsHandler{}
 
 func NewGroupsHandler(
 	opts control.Options,
-) *groupsHandler {
-	return &groupsHandler{
+) *baseGroupsHandler {
+	return &baseGroupsHandler{
 		opts:               opts,
 		backupDriveIDNames: idname.NewCache(nil),
 		backupSiteIDWebURL: idname.NewCache(nil),
 	}
 }
 
-type groupsHandler struct {
+type baseGroupsHandler struct {
 	opts control.Options
 
 	backupDriveIDNames idname.CacheBuilder
 	backupSiteIDWebURL idname.CacheBuilder
 }
 
-func (h *groupsHandler) CacheItemInfo(v details.ItemInfo) {
+func (h *baseGroupsHandler) CacheItemInfo(v details.ItemInfo) {
 	if v.Groups == nil {
 		return
 	}
@@ -49,7 +49,7 @@ func (h *groupsHandler) CacheItemInfo(v details.ItemInfo) {
 
 // ProduceExportCollections will create the export collections for the
 // given restore collections.
-func (h *groupsHandler) ProduceExportCollections(
+func (h *baseGroupsHandler) ProduceExportCollections(
 	ctx context.Context,
 	backupVersion int,
 	exportCfg control.ExportConfig,
diff --git a/src/internal/m365/service/onedrive/export.go b/src/internal/m365/service/onedrive/export.go
index 93a268644..b1945cd3e 100644
--- a/src/internal/m365/service/onedrive/export.go
+++ b/src/internal/m365/service/onedrive/export.go
@@ -15,25 +15,25 @@ import (
 	"github.com/alcionai/corso/src/pkg/path"
 )
 
-var _ inject.ServiceHandler = &onedriveHandler{}
+var _ inject.ServiceHandler = &baseOnedriveHandler{}
 
 func NewOneDriveHandler(
 	opts control.Options,
-) *onedriveHandler {
-	return &onedriveHandler{
+) *baseOnedriveHandler {
+	return &baseOnedriveHandler{
 		opts: opts,
 	}
 }
 
-type onedriveHandler struct {
+type baseOnedriveHandler struct {
 	opts control.Options
 }
 
-func (h *onedriveHandler) CacheItemInfo(v details.ItemInfo) {}
+func (h *baseOnedriveHandler) CacheItemInfo(v details.ItemInfo) {}
 
 // ProduceExportCollections will create the export collections for the
 // given restore collections.
-func (h *onedriveHandler) ProduceExportCollections(
+func (h *baseOnedriveHandler) ProduceExportCollections(
 	ctx context.Context,
 	backupVersion int,
 	exportCfg control.ExportConfig,
diff --git a/src/internal/m365/service/sharepoint/export.go b/src/internal/m365/service/sharepoint/export.go
index 461c6256c..c185b6d05 100644
--- a/src/internal/m365/service/sharepoint/export.go
+++ b/src/internal/m365/service/sharepoint/export.go
@@ -17,23 +17,23 @@ import (
 	"github.com/alcionai/corso/src/pkg/path"
 )
 
-var _ inject.ServiceHandler = &sharepointHandler{}
+var _ inject.ServiceHandler = &baseSharepointHandler{}
 
 func NewSharePointHandler(
 	opts control.Options,
-) *sharepointHandler {
-	return &sharepointHandler{
+) *baseSharepointHandler {
+	return &baseSharepointHandler{
 		opts:               opts,
 		backupDriveIDNames: idname.NewCache(nil),
 	}
 }
 
-type sharepointHandler struct {
+type baseSharepointHandler struct {
 	opts               control.Options
 	backupDriveIDNames idname.CacheBuilder
 }
 
-func (h *sharepointHandler) CacheItemInfo(v details.ItemInfo) {
+func (h *baseSharepointHandler) CacheItemInfo(v details.ItemInfo) {
 	// Old versions would store SharePoint data as OneDrive.
 	switch {
 	case v.SharePoint != nil:
@@ -46,7 +46,7 @@ func (h *sharepointHandler) CacheItemInfo(v details.ItemInfo) {
 
 // ProduceExportCollections will create the export collections for the
 // given restore collections.
-func (h *sharepointHandler) ProduceExportCollections(
+func (h *baseSharepointHandler) ProduceExportCollections(
 	ctx context.Context,
 	backupVersion int,
 	exportCfg control.ExportConfig,