diff --git a/src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java b/src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java
index 6608ef8..ecd8b6a 100644
--- a/src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java
+++ b/src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java
@@ -67,7 +67,7 @@ public class QueryRestConfig {
    private Set<String> defaultResponseFields() {
       List<String> defaultFields = Arrays.asList(
             StringUtils.commaDelimitedListToStringArray(
-                  env.getProperty("rest.default.response.fields")
+                  env.getProperty("queryrest.default.response.fields")
             ));
       Set<String> defaultResponseFields = Sets.newHashSet(defaultFields.iterator());
       return defaultResponseFields;
diff --git a/src/main/resources/rest.properties b/src/main/resources/queryrest.properties
similarity index 69%
rename from src/main/resources/rest.properties
rename to src/main/resources/queryrest.properties
index 2b5f02a..2e55ecf 100644
--- a/src/main/resources/rest.properties
+++ b/src/main/resources/queryrest.properties
@@ -3,4 +3,4 @@ server.port=8080
 
 # defines the fields that are included in the response 
 # if no fields have been specified by the user
-rest.default.response.fields=channel,pulseId,globalMillis,globalNanos,value
\ No newline at end of file
+queryrest.default.response.fields=channel,pulseId,globalMillis,globalNanos,value
\ No newline at end of file
diff --git a/src/test/java/ch/psi/daq/test/rest/AbstractDaqRestTest.java b/src/test/java/ch/psi/daq/test/queryrest/AbstractDaqRestTest.java
similarity index 98%
rename from src/test/java/ch/psi/daq/test/rest/AbstractDaqRestTest.java
rename to src/test/java/ch/psi/daq/test/queryrest/AbstractDaqRestTest.java
index 0ced6f8..8a12d6e 100644
--- a/src/test/java/ch/psi/daq/test/rest/AbstractDaqRestTest.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/AbstractDaqRestTest.java
@@ -1,4 +1,4 @@
-package ch.psi.daq.test.rest;
+package ch.psi.daq.test.queryrest;
 
 import org.junit.Before;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/ch/psi/daq/test/rest/DaqWebMvcConfig.java b/src/test/java/ch/psi/daq/test/queryrest/DaqWebMvcConfig.java
similarity index 94%
rename from src/test/java/ch/psi/daq/test/rest/DaqWebMvcConfig.java
rename to src/test/java/ch/psi/daq/test/queryrest/DaqWebMvcConfig.java
index 9af2f6f..a043ba0 100644
--- a/src/test/java/ch/psi/daq/test/rest/DaqWebMvcConfig.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/DaqWebMvcConfig.java
@@ -1,4 +1,4 @@
-package ch.psi.daq.test.rest;
+package ch.psi.daq.test.queryrest;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
diff --git a/src/test/java/ch/psi/daq/test/rest/controller/DaqRestControllerTest.java b/src/test/java/ch/psi/daq/test/queryrest/controller/DaqRestControllerTest.java
similarity index 97%
rename from src/test/java/ch/psi/daq/test/rest/controller/DaqRestControllerTest.java
rename to src/test/java/ch/psi/daq/test/queryrest/controller/DaqRestControllerTest.java
index c4ee29e..af31866 100644
--- a/src/test/java/ch/psi/daq/test/rest/controller/DaqRestControllerTest.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/controller/DaqRestControllerTest.java
@@ -1,4 +1,4 @@
-package ch.psi.daq.test.rest.controller;
+package ch.psi.daq.test.queryrest.controller;
 
 import java.util.Date;
 import java.util.List;
@@ -21,7 +21,7 @@ import ch.psi.daq.query.model.PulseRangeQuery;
 import ch.psi.daq.query.model.TimeRangeQuery;
 import ch.psi.daq.query.range.QueryRange;
 import ch.psi.daq.query.range.QueryRangeImpl;
-import ch.psi.daq.test.rest.AbstractDaqRestTest;
+import ch.psi.daq.test.queryrest.AbstractDaqRestTest;
 
 /**
  * Tests the {@link DaqController} implementation. 
diff --git a/src/test/java/ch/psi/daq/test/rest/queries/AbstractQueryTest.java b/src/test/java/ch/psi/daq/test/queryrest/queries/AbstractQueryTest.java
similarity index 90%
rename from src/test/java/ch/psi/daq/test/rest/queries/AbstractQueryTest.java
rename to src/test/java/ch/psi/daq/test/queryrest/queries/AbstractQueryTest.java
index 4dcd7a5..99563ae 100644
--- a/src/test/java/ch/psi/daq/test/rest/queries/AbstractQueryTest.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/queries/AbstractQueryTest.java
@@ -1,4 +1,4 @@
-package ch.psi.daq.test.rest.queries;
+package ch.psi.daq.test.queryrest.queries;
 
 import java.util.Date;
 import java.util.List;
diff --git a/src/test/java/ch/psi/daq/test/rest/queries/AbstractQueryTestTest.java b/src/test/java/ch/psi/daq/test/queryrest/queries/AbstractQueryTestTest.java
similarity index 99%
rename from src/test/java/ch/psi/daq/test/rest/queries/AbstractQueryTestTest.java
rename to src/test/java/ch/psi/daq/test/queryrest/queries/AbstractQueryTestTest.java
index 4c5b8ea..a81085f 100644
--- a/src/test/java/ch/psi/daq/test/rest/queries/AbstractQueryTestTest.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/queries/AbstractQueryTestTest.java
@@ -1,4 +1,4 @@
-package ch.psi.daq.test.rest.queries;
+package ch.psi.daq.test.queryrest.queries;
 
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
diff --git a/src/test/java/ch/psi/daq/test/rest/queries/TimeRangeQueryTest.java b/src/test/java/ch/psi/daq/test/queryrest/queries/TimeRangeQueryTest.java
similarity index 98%
rename from src/test/java/ch/psi/daq/test/rest/queries/TimeRangeQueryTest.java
rename to src/test/java/ch/psi/daq/test/queryrest/queries/TimeRangeQueryTest.java
index b610637..3366602 100644
--- a/src/test/java/ch/psi/daq/test/rest/queries/TimeRangeQueryTest.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/queries/TimeRangeQueryTest.java
@@ -1,4 +1,4 @@
-package ch.psi.daq.test.rest.queries;
+package ch.psi.daq.test.queryrest.queries;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/src/test/java/ch/psi/daq/test/rest/query/DummyQueryProcessor.java b/src/test/java/ch/psi/daq/test/queryrest/query/DummyQueryProcessor.java
similarity index 97%
rename from src/test/java/ch/psi/daq/test/rest/query/DummyQueryProcessor.java
rename to src/test/java/ch/psi/daq/test/queryrest/query/DummyQueryProcessor.java
index 1040166..f83a045 100644
--- a/src/test/java/ch/psi/daq/test/rest/query/DummyQueryProcessor.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/query/DummyQueryProcessor.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package ch.psi.daq.test.rest.query;
+package ch.psi.daq.test.queryrest.query;
 
 import java.util.List;
 import java.util.Map;