diff --git a/plugin/src/main/java/de/ids_mannheim/korap/plkexport/PluginServer.java b/plugin/src/main/java/de/ids_mannheim/korap/plkexport/PluginServer.java
index d51c2e7..ecd59a5 100644
--- a/plugin/src/main/java/de/ids_mannheim/korap/plkexport/PluginServer.java
+++ b/plugin/src/main/java/de/ids_mannheim/korap/plkexport/PluginServer.java
@@ -50,7 +50,7 @@
         // Tells the Jersey Servlet which REST service/class to load.
         servletHolder.setInitParameter(
                 "jersey.config.server.provider.classnames",
-                IdsExportService.class.getCanonicalName());
+                Service.class.getCanonicalName());
 
         try {
             jettyServer.start();
diff --git a/plugin/src/main/java/de/ids_mannheim/korap/plkexport/IdsExportService.java b/plugin/src/main/java/de/ids_mannheim/korap/plkexport/Service.java
similarity index 98%
rename from plugin/src/main/java/de/ids_mannheim/korap/plkexport/IdsExportService.java
rename to plugin/src/main/java/de/ids_mannheim/korap/plkexport/Service.java
index 299c395..3f250f4 100644
--- a/plugin/src/main/java/de/ids_mannheim/korap/plkexport/IdsExportService.java
+++ b/plugin/src/main/java/de/ids_mannheim/korap/plkexport/Service.java
@@ -58,7 +58,7 @@
  */
 
 @Path("/")
-public class IdsExportService {
+public class Service {
 
     Properties prop = ExWSConf.properties(null);
 
@@ -69,7 +69,7 @@
 
     Configuration cfg = new Configuration();
     {
-        cfg.setClassForTemplateLoading(IdsExportService.class, "/assets/templates");
+        cfg.setClassForTemplateLoading(Service.class, "/assets/templates");
         cfg.setDefaultEncoding("UTF-8");
     }
 
diff --git a/plugin/src/test/java/de/ids_mannheim/korap/plkexport/AssetTest.java b/plugin/src/test/java/de/ids_mannheim/korap/plkexport/AssetTest.java
index a03e508..444e34b 100644
--- a/plugin/src/test/java/de/ids_mannheim/korap/plkexport/AssetTest.java
+++ b/plugin/src/test/java/de/ids_mannheim/korap/plkexport/AssetTest.java
@@ -23,7 +23,7 @@
     
     @Override
     protected Application configure () {
-        return new ResourceConfig(IdsExportService.class);
+        return new ResourceConfig(Service.class);
     }
 
     @Test
diff --git a/plugin/src/test/java/de/ids_mannheim/korap/plkexport/IdsExportServiceTest.java b/plugin/src/test/java/de/ids_mannheim/korap/plkexport/ServiceTest.java
similarity index 98%
rename from plugin/src/test/java/de/ids_mannheim/korap/plkexport/IdsExportServiceTest.java
rename to plugin/src/test/java/de/ids_mannheim/korap/plkexport/ServiceTest.java
index e3654a9..226f610 100644
--- a/plugin/src/test/java/de/ids_mannheim/korap/plkexport/IdsExportServiceTest.java
+++ b/plugin/src/test/java/de/ids_mannheim/korap/plkexport/ServiceTest.java
@@ -44,14 +44,12 @@
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
-import de.ids_mannheim.korap.plkexport.IdsExportService;
-import de.ids_mannheim.korap.plkexport.ExWSConf;
 
 import org.eclipse.jetty.server.Request;
 
-import static de.ids_mannheim.korap.plkexport.IdsExportService.getClientIP;
+import static de.ids_mannheim.korap.plkexport.Service.getClientIP;
 
-public class IdsExportServiceTest extends JerseyTest {
+public class ServiceTest extends JerseyTest {
 
     private static ClientAndServer mockServer;
 	private static MockServerClient mockClient;
@@ -86,7 +84,7 @@
     
     @Override
     protected Application configure () {
-        return new ResourceConfig(IdsExportService.class);
+        return new ResourceConfig(Service.class);
     }
 
     // Client is pre-configured in JerseyTest