diff --git a/service.go b/service.go
index b6ad904..09e67c9 100644
--- a/service.go
+++ b/service.go
@@ -79,8 +79,8 @@ type Service struct {
 
 type ServiceOptions struct {
 	Records                      map[string]NameRecords
-	Discoverer                   func() (map[string]NameRecords, error)
-	FallbackDiscoverer           func() (map[string]NameRecords, error)
+	RecordDiscoverer             func() (map[string]NameRecords, error)
+	FallbackRecordDiscoverer     func() (map[string]NameRecords, error)
 	MainchainAliasClient         *MainchainAliasClient
 	HSDClient                    *HSDClient
 	ChainAliasActionCaller       ActionCaller
@@ -126,8 +126,8 @@ func NewService(options ServiceOptions) *Service {
 		mainchainAliasClient:         options.MainchainAliasClient,
 		chainAliasActionCaller:       options.ChainAliasActionCaller,
 		chainAliasAction:             options.ChainAliasAction,
-		recordDiscoverer:             options.Discoverer,
-		fallbackRecordDiscoverer:     options.FallbackDiscoverer,
+		recordDiscoverer:             options.RecordDiscoverer,
+		fallbackRecordDiscoverer:     options.FallbackRecordDiscoverer,
 		chainAliasDiscoverer:         options.ChainAliasDiscoverer,
 		fallbackChainAliasDiscoverer: options.FallbackChainAliasDiscoverer,
 		treeRootCheckInterval:        checkInterval,
diff --git a/service_test.go b/service_test.go
index db6ddfa..095e278 100644
--- a/service_test.go
+++ b/service_test.go
@@ -430,7 +430,7 @@ func TestServiceDiscoverReplacesRecordsFromDiscoverer(t *testing.T) {
 				A: []string{"10.11.11.11"},
 			},
 		},
-		Discoverer: func() (map[string]NameRecords, error) {
+		RecordDiscoverer: func() (map[string]NameRecords, error) {
 			next := records[index%len(records)]
 			index++
 			return next, nil
@@ -859,11 +859,11 @@ func TestServiceDiscoverFallsBackWhenPrimaryDiscovererFails(t *testing.T) {
 				A: []string{"10.11.11.11"},
 			},
 		},
-		Discoverer: func() (map[string]NameRecords, error) {
+		RecordDiscoverer: func() (map[string]NameRecords, error) {
 			primaryCalled = true
 			return nil, errors.New("chain service unavailable")
 		},
-		FallbackDiscoverer: func() (map[string]NameRecords, error) {
+		FallbackRecordDiscoverer: func() (map[string]NameRecords, error) {
 			fallbackCalled = true
 			return map[string]NameRecords{
 				"gateway.charon.lthn": {
@@ -904,7 +904,7 @@ func TestServiceDiscoverUsesFallbackOnlyWhenPrimaryMissing(t *testing.T) {
 				A: []string{"10.11.11.11"},
 			},
 		},
-		FallbackDiscoverer: func() (map[string]NameRecords, error) {
+		FallbackRecordDiscoverer: func() (map[string]NameRecords, error) {
 			fallbackCalled = true
 			return map[string]NameRecords{
 				"gateway.charon.lthn": {