diff --git a/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqService.java b/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/Fdaq.java
similarity index 96%
rename from ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqService.java
rename to ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/Fdaq.java
index 141697a..202f42b 100644
--- a/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqService.java
+++ b/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/Fdaq.java
@@ -39,9 +39,9 @@ import ch.psi.fda.messages.Metadata;
  * Fdaq service
  * 
  */
-public class FdaqService {
+public class Fdaq {
 
-	private static final Logger logger = Logger.getLogger(FdaqService.class.getName());
+	private static final Logger logger = Logger.getLogger(Fdaq.class.getName());
 
 	private volatile boolean stopAcquisition = false;
 	private volatile boolean running = false;
@@ -51,7 +51,7 @@ public class FdaqService {
 	private FdaqConfiguration configuration;
 	private final int numberOfElements = Integer.MAX_VALUE/2;
 	
-	public FdaqService(EventBus bus, FdaqConfiguration configuration){
+	public Fdaq(EventBus bus, FdaqConfiguration configuration){
 		this.bus = bus;
 		this.configuration = configuration;
 	}
diff --git a/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqMain.java b/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqMain.java
index 9695b58..f0baead 100644
--- a/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqMain.java
+++ b/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqMain.java
@@ -56,7 +56,7 @@ public class FdaqMain {
 		
 		
 		EventBus bus = new AsyncEventBus(Executors.newSingleThreadExecutor());
-		final FdaqService fdaq = new FdaqService(bus, configuration);
+		final Fdaq fdaq = new Fdaq(bus, configuration);
 
 		Signal.handle(new Signal("INT"), new SignalHandler() {
 			int count = 0;