diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/kiosk/KioskList.java b/extractor/src/main/java/org/schabi/newpipe/extractor/kiosk/KioskList.java
index 04d8d7bed..1287d912e 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/kiosk/KioskList.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/kiosk/KioskList.java
@@ -25,10 +25,10 @@ public  class KioskList {
     private class KioskEntry {
         public KioskEntry(KioskExtractorFactory ef, UIHFactory h) {
             extractorFactory = ef;
-            handler = h;
+            handlerFactory = h;
         }
         final KioskExtractorFactory extractorFactory;
-        final UIHFactory handler;
+        final UIHFactory handlerFactory;
     }
 
     public KioskList(int service_id) {
@@ -73,7 +73,7 @@ public  class KioskList {
             throw new ExtractionException("No kiosk found with the type: " + kioskId);
         } else {
             return ke.extractorFactory.createNewKiosk(NewPipe.getService(service_id),
-                    ke.handler.fromId(kioskId).getUrl(), kioskId);
+                    ke.handlerFactory.fromId(kioskId).getUrl(), kioskId);
         }
     }
 
@@ -85,14 +85,14 @@ public  class KioskList {
             throws ExtractionException, IOException {
         for(Map.Entry<String, KioskEntry> e : kioskList.entrySet()) {
             KioskEntry ke = e.getValue();
-            if(ke.handler.acceptUrl(url)) {
+            if(ke.handlerFactory.acceptUrl(url)) {
                 return getExtractorById(e.getKey(), nextPageUrl);
             }
         }
         throw new ExtractionException("Could not find a kiosk that fits to the url: " + url);
     }
 
-    public UIHFactory getUrlIdHandlerByType(String type) {
-        return kioskList.get(type).handler;
+    public UIHFactory getUIHFactoryByType(String type) {
+        return kioskList.get(type).handlerFactory;
     }
 }
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingKioskInfoTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingKioskInfoTest.java
index b7f0a50bd..6f3fc38b2 100644
--- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingKioskInfoTest.java
+++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingKioskInfoTest.java
@@ -43,7 +43,7 @@ public class YoutubeTrendingKioskInfoTest {
             throws Exception {
         NewPipe.init(Downloader.getInstance());
         StreamingService service = YouTube;
-        UIHFactory UIHFactory = service.getKioskList().getUrlIdHandlerByType("Trending");
+        UIHFactory UIHFactory = service.getKioskList().getUIHFactoryByType("Trending");
 
         kioskInfo = KioskInfo.getInfo(YouTube, UIHFactory.fromId("Trending").getUrl(), null);
     }
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingUIHFactoryTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingUIHFactoryTest.java
index 3bbf7e949..9d1fd3b69 100644
--- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingUIHFactoryTest.java
+++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingUIHFactoryTest.java
@@ -24,13 +24,10 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.exceptions.FoundAdException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.uih.UIHFactory;
 import org.schabi.newpipe.extractor.services.youtube.urlIdHandlers.YoutubeTrendingUIHFactory;
 
-import java.text.ParseException;
-
 import static junit.framework.TestCase.assertFalse;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -44,7 +41,7 @@ public class YoutubeTrendingUIHFactoryTest {
 
     @BeforeClass
     public static void setUp() throws Exception {
-        UIHFactory = YouTube.getKioskList().getUrlIdHandlerByType("Trending");
+        UIHFactory = YouTube.getKioskList().getUIHFactoryByType("Trending");
         NewPipe.init(Downloader.getInstance());
     }