diff --git a/src/main/groovy/io/kamax/mxisd/lookup/provider/DnsLookupFetcher.groovy b/src/main/groovy/io/kamax/mxisd/lookup/provider/DnsLookupProvider.groovy
similarity index 98%
rename from src/main/groovy/io/kamax/mxisd/lookup/provider/DnsLookupFetcher.groovy
rename to src/main/groovy/io/kamax/mxisd/lookup/provider/DnsLookupProvider.groovy
index 93ba2b8..141a375 100644
--- a/src/main/groovy/io/kamax/mxisd/lookup/provider/DnsLookupFetcher.groovy
+++ b/src/main/groovy/io/kamax/mxisd/lookup/provider/DnsLookupProvider.groovy
@@ -38,9 +38,9 @@ import java.util.concurrent.RecursiveTask
 import java.util.function.Function
 
 @Component
-class DnsLookupFetcher implements IThreePidProvider {
+class DnsLookupProvider implements IThreePidProvider {
 
-    private Logger log = LoggerFactory.getLogger(DnsLookupFetcher.class)
+    private Logger log = LoggerFactory.getLogger(DnsLookupProvider.class)
 
     @Autowired
     private ServerConfig srvCfg
diff --git a/src/main/groovy/io/kamax/mxisd/lookup/provider/ForwarderFetcher.groovy b/src/main/groovy/io/kamax/mxisd/lookup/provider/ForwarderProvider.groovy
similarity index 95%
rename from src/main/groovy/io/kamax/mxisd/lookup/provider/ForwarderFetcher.groovy
rename to src/main/groovy/io/kamax/mxisd/lookup/provider/ForwarderProvider.groovy
index 165b7ac..d6093a0 100644
--- a/src/main/groovy/io/kamax/mxisd/lookup/provider/ForwarderFetcher.groovy
+++ b/src/main/groovy/io/kamax/mxisd/lookup/provider/ForwarderProvider.groovy
@@ -30,9 +30,9 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
 
 @Component
-class ForwarderFetcher implements IThreePidProvider {
+class ForwarderProvider implements IThreePidProvider {
 
-    private Logger log = LoggerFactory.getLogger(ForwarderFetcher.class)
+    private Logger log = LoggerFactory.getLogger(ForwarderProvider.class)
 
     @Autowired
     private ForwardConfig cfg