diff --git a/source/net/filebot/web/AcoustIDClient.java b/source/net/filebot/web/AcoustIDClient.java
index 52592218..31510eee 100644
--- a/source/net/filebot/web/AcoustIDClient.java
+++ b/source/net/filebot/web/AcoustIDClient.java
@@ -40,7 +40,7 @@ public class AcoustIDClient implements MusicIdentificationService {
 	}
 
 	@Override
-	public String getName() {
+	public String getIdentifier() {
 		return "AcoustID";
 	}
 
diff --git a/source/net/filebot/web/AnidbClient.java b/source/net/filebot/web/AnidbClient.java
index 653a3316..edde0bbc 100644
--- a/source/net/filebot/web/AnidbClient.java
+++ b/source/net/filebot/web/AnidbClient.java
@@ -50,7 +50,7 @@ public class AnidbClient extends AbstractEpisodeListProvider {
 	}
 
 	@Override
-	public String getName() {
+	public String getIdentifier() {
 		return "AniDB";
 	}
 
diff --git a/source/net/filebot/web/Datasource.java b/source/net/filebot/web/Datasource.java
index 7e0ec813..5c0152c8 100644
--- a/source/net/filebot/web/Datasource.java
+++ b/source/net/filebot/web/Datasource.java
@@ -4,12 +4,12 @@ import javax.swing.Icon;
 
 public interface Datasource {
 
-	String getName();
+	String getIdentifier();
 
 	Icon getIcon();
 
-	default String getIdentifier() {
-		return getName();
+	default String getName() {
+		return getIdentifier();
 	}
 
 }
diff --git a/source/net/filebot/web/FanartTVClient.java b/source/net/filebot/web/FanartTVClient.java
index f151a06a..4057e35c 100644
--- a/source/net/filebot/web/FanartTVClient.java
+++ b/source/net/filebot/web/FanartTVClient.java
@@ -25,7 +25,7 @@ public class FanartTVClient implements Datasource, ArtworkProvider {
 	}
 
 	@Override
-	public String getName() {
+	public String getIdentifier() {
 		return "FanartTV";
 	}
 
diff --git a/source/net/filebot/web/ID3Lookup.java b/source/net/filebot/web/ID3Lookup.java
index 1187de10..09c87557 100644
--- a/source/net/filebot/web/ID3Lookup.java
+++ b/source/net/filebot/web/ID3Lookup.java
@@ -21,13 +21,13 @@ import net.filebot.mediainfo.MediaInfo.StreamKind;
 public class ID3Lookup implements MusicIdentificationService {
 
 	@Override
-	public String getName() {
-		return "ID3 Tags";
+	public String getIdentifier() {
+		return "ID3";
 	}
 
 	@Override
-	public String getIdentifier() {
-		return "ID3";
+	public String getName() {
+		return "ID3 Tags";
 	}
 
 	@Override
diff --git a/source/net/filebot/web/OMDbClient.java b/source/net/filebot/web/OMDbClient.java
index 2e2d782a..3bf236bb 100644
--- a/source/net/filebot/web/OMDbClient.java
+++ b/source/net/filebot/web/OMDbClient.java
@@ -37,7 +37,7 @@ public class OMDbClient implements MovieIdentificationService {
 	private static final FloodLimit REQUEST_LIMIT = new FloodLimit(20, 10, TimeUnit.SECONDS);
 
 	@Override
-	public String getName() {
+	public String getIdentifier() {
 		return "OMDb";
 	}
 
diff --git a/source/net/filebot/web/OpenSubtitlesClient.java b/source/net/filebot/web/OpenSubtitlesClient.java
index a2755978..7e2d3209 100644
--- a/source/net/filebot/web/OpenSubtitlesClient.java
+++ b/source/net/filebot/web/OpenSubtitlesClient.java
@@ -55,7 +55,7 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
 	}
 
 	@Override
-	public String getName() {
+	public String getIdentifier() {
 		return "OpenSubtitles";
 	}
 
diff --git a/source/net/filebot/web/ShooterSubtitles.java b/source/net/filebot/web/ShooterSubtitles.java
index e6517b87..07c3318c 100644
--- a/source/net/filebot/web/ShooterSubtitles.java
+++ b/source/net/filebot/web/ShooterSubtitles.java
@@ -33,6 +33,11 @@ import net.filebot.ResourceManager;
 
 public class ShooterSubtitles implements VideoHashSubtitleService {
 
+	@Override
+	public String getIdentifier() {
+		return "Shooter";
+	}
+
 	@Override
 	public String getName() {
 		return "射手网";
@@ -43,11 +48,6 @@ public class ShooterSubtitles implements VideoHashSubtitleService {
 		return ResourceManager.getIcon("search.shooter");
 	}
 
-	@Override
-	public String getIdentifier() {
-		return "Shooter";
-	}
-
 	@Override
 	public URI getLink() {
 		return URI.create("http://shooter.cn");
diff --git a/source/net/filebot/web/TMDbClient.java b/source/net/filebot/web/TMDbClient.java
index 9cf388e1..98a89edb 100644
--- a/source/net/filebot/web/TMDbClient.java
+++ b/source/net/filebot/web/TMDbClient.java
@@ -51,7 +51,7 @@ public class TMDbClient implements MovieIdentificationService, ArtworkProvider {
 	}
 
 	@Override
-	public String getName() {
+	public String getIdentifier() {
 		return "TheMovieDB";
 	}
 
diff --git a/source/net/filebot/web/TMDbTVClient.java b/source/net/filebot/web/TMDbTVClient.java
index d5b82ead..91b9bfdd 100644
--- a/source/net/filebot/web/TMDbTVClient.java
+++ b/source/net/filebot/web/TMDbTVClient.java
@@ -26,13 +26,13 @@ public class TMDbTVClient extends AbstractEpisodeListProvider {
 	}
 
 	@Override
-	public String getName() {
-		return tmdb.getName();
+	public String getIdentifier() {
+		return "TheMovieDB::TV";
 	}
 
 	@Override
-	public String getIdentifier() {
-		return "TheMovieDB::TV";
+	public String getName() {
+		return tmdb.getName();
 	}
 
 	@Override
diff --git a/source/net/filebot/web/TVMazeClient.java b/source/net/filebot/web/TVMazeClient.java
index 8d953e03..2f55f01b 100644
--- a/source/net/filebot/web/TVMazeClient.java
+++ b/source/net/filebot/web/TVMazeClient.java
@@ -20,7 +20,7 @@ import net.filebot.ResourceManager;
 public class TVMazeClient extends AbstractEpisodeListProvider {
 
 	@Override
-	public String getName() {
+	public String getIdentifier() {
 		return "TVmaze";
 	}
 
diff --git a/source/net/filebot/web/TheTVDBClient.java b/source/net/filebot/web/TheTVDBClient.java
index 0c6873e3..aa0c13dc 100644
--- a/source/net/filebot/web/TheTVDBClient.java
+++ b/source/net/filebot/web/TheTVDBClient.java
@@ -39,7 +39,7 @@ public class TheTVDBClient extends AbstractEpisodeListProvider implements Artwor
 	}
 
 	@Override
-	public String getName() {
+	public String getIdentifier() {
 		return "TheTVDBv2";
 	}
 
diff --git a/source/net/filebot/web/TheTVDBClientV1.java b/source/net/filebot/web/TheTVDBClientV1.java
index 79165ea8..f80d831c 100644
--- a/source/net/filebot/web/TheTVDBClientV1.java
+++ b/source/net/filebot/web/TheTVDBClientV1.java
@@ -49,7 +49,7 @@ public class TheTVDBClientV1 extends AbstractEpisodeListProvider implements Artw
 	}
 
 	@Override
-	public String getName() {
+	public String getIdentifier() {
 		return "TheTVDB";
 	}