diff --git a/Readme.md b/Readme.md
index 16ae647..a4fd668 100644
--- a/Readme.md
+++ b/Readme.md
@@ -158,7 +158,7 @@ A request is performed by sending a valid JSON object in the HTTP request body.
    "valueTransformations":[
 	   {
 	      "pattern":"ImageChannel",
-	      "backend":"sf-imagestorage",
+	      "backend":"sf-imagebuffer",
 	      "sequence":[
 	         ...
 	      ]
@@ -383,7 +383,7 @@ Following transformation sequence resizes images by the factor of 8, sets the va
 "valueTransformations":[
    {
       "pattern":"Image",
-      "backend":"sf-imagestorage",
+      "backend":"sf-imagebuffer",
       "sequence":[
          {
             "imageResize":{
diff --git a/src/test/java/ch/psi/daq/test/queryrest/config/DaqWebMvcConfig.java b/src/test/java/ch/psi/daq/test/queryrest/config/DaqWebMvcConfig.java
index 65dc612..adab72d 100644
--- a/src/test/java/ch/psi/daq/test/queryrest/config/DaqWebMvcConfig.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/config/DaqWebMvcConfig.java
@@ -53,8 +53,8 @@ public class DaqWebMvcConfig extends WebMvcConfigurationSupport {
       backendAccess.addStreamEventReaderSupplier(Backend.SF_DATABUFFER, () -> cassandraReader());
       backendAccess.addChannelInfoReaderSupplier(Backend.SF_DATABUFFER, () -> cassandraReader());
       
-      backendAccess.addStreamEventReaderSupplier(Backend.SF_IMAGESTORAGE, () -> filestorageReader());
-      backendAccess.addChannelInfoReaderSupplier(Backend.SF_IMAGESTORAGE, () -> filestorageReader());
+      backendAccess.addStreamEventReaderSupplier(Backend.SF_IMAGEBUFFER, () -> filestorageReader());
+      backendAccess.addChannelInfoReaderSupplier(Backend.SF_IMAGEBUFFER, () -> filestorageReader());
 
       backendAccess.addDataReaderSupplier(Backend.SF_ARCHIVERAPPLIANCE, () -> archiverApplianceReader());
    }
diff --git a/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTest.java b/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTest.java
index c798111..8274729 100644
--- a/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTest.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTest.java
@@ -89,7 +89,7 @@ public class JsonQueryRestControllerTest extends AbstractDaqRestTest {
             .andExpect(MockMvcResultMatchers.jsonPath("$[1].backend").value(Backend.SF_ARCHIVERAPPLIANCE.getKey()))
             .andExpect(MockMvcResultMatchers.jsonPath("$[1].channels").isArray())
             .andExpect(MockMvcResultMatchers.jsonPath("$[2]").exists())
-            .andExpect(MockMvcResultMatchers.jsonPath("$[2].backend").value(Backend.SF_IMAGESTORAGE.getKey()))
+            .andExpect(MockMvcResultMatchers.jsonPath("$[2].backend").value(Backend.SF_IMAGEBUFFER.getKey()))
             .andExpect(MockMvcResultMatchers.jsonPath("$[2].channels").isArray())
             .andExpect(MockMvcResultMatchers.jsonPath("$[2].channels[0]").exists())
             .andExpect(MockMvcResultMatchers.jsonPath("$[2].channels[0]").value("BoolScalar"))
@@ -122,7 +122,7 @@ public class JsonQueryRestControllerTest extends AbstractDaqRestTest {
             .andExpect(MockMvcResultMatchers.jsonPath("$[1].backend").value(Backend.SF_ARCHIVERAPPLIANCE.getKey()))
             .andExpect(MockMvcResultMatchers.jsonPath("$[1].channels").isArray())
             .andExpect(MockMvcResultMatchers.jsonPath("$[2]").exists())
-            .andExpect(MockMvcResultMatchers.jsonPath("$[2].backend").value(Backend.SF_IMAGESTORAGE.getKey()))
+            .andExpect(MockMvcResultMatchers.jsonPath("$[2].backend").value(Backend.SF_IMAGEBUFFER.getKey()))
             .andExpect(MockMvcResultMatchers.jsonPath("$[2].channels").isArray())
             .andExpect(MockMvcResultMatchers.jsonPath("$[2].channels[0]").exists())
             .andExpect(MockMvcResultMatchers.jsonPath("$[2].channels[0]").value("Int32Scalar"))
@@ -185,7 +185,7 @@ public class JsonQueryRestControllerTest extends AbstractDaqRestTest {
             .andExpect(MockMvcResultMatchers.jsonPath("$[0].channels[24]").doesNotExist())
             .andExpect(MockMvcResultMatchers.jsonPath("$[1].backend").value(Backend.SF_ARCHIVERAPPLIANCE.getKey()))
             .andExpect(MockMvcResultMatchers.jsonPath("$[1].channels").isArray())
-            .andExpect(MockMvcResultMatchers.jsonPath("$[2].backend").value(Backend.SF_IMAGESTORAGE.getKey()))
+            .andExpect(MockMvcResultMatchers.jsonPath("$[2].backend").value(Backend.SF_IMAGEBUFFER.getKey()))
             .andExpect(MockMvcResultMatchers.jsonPath("$[2].channels").isArray())
             .andExpect(MockMvcResultMatchers.jsonPath("$[2].channels[23]").exists())
             .andExpect(MockMvcResultMatchers.jsonPath("$[2].channels[24]").doesNotExist());
@@ -211,7 +211,7 @@ public class JsonQueryRestControllerTest extends AbstractDaqRestTest {
             .andExpect(MockMvcResultMatchers.jsonPath("$[0].channels[25]").doesNotExist())
             .andExpect(MockMvcResultMatchers.jsonPath("$[1].backend").value(Backend.SF_ARCHIVERAPPLIANCE.getKey()))
             .andExpect(MockMvcResultMatchers.jsonPath("$[1].channels").isArray())
-            .andExpect(MockMvcResultMatchers.jsonPath("$[2].backend").value(Backend.SF_IMAGESTORAGE.getKey()))
+            .andExpect(MockMvcResultMatchers.jsonPath("$[2].backend").value(Backend.SF_IMAGEBUFFER.getKey()))
             .andExpect(MockMvcResultMatchers.jsonPath("$[2].channels").isArray())
             .andExpect(MockMvcResultMatchers.jsonPath("$[2].channels[24]").exists())
             .andExpect(MockMvcResultMatchers.jsonPath("$[2].channels[25]").doesNotExist());
diff --git a/src/test/java/ch/psi/daq/test/queryrest/query/DummyFilestorageReader.java b/src/test/java/ch/psi/daq/test/queryrest/query/DummyFilestorageReader.java
index f0782f8..0002675 100644
--- a/src/test/java/ch/psi/daq/test/queryrest/query/DummyFilestorageReader.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/query/DummyFilestorageReader.java
@@ -11,6 +11,6 @@ public class DummyFilestorageReader extends AbstractStreamEventReader {
 
    @PostConstruct
    public void afterPropertiesSet() {
-      init(Backend.SF_IMAGESTORAGE);
+      init(Backend.SF_IMAGEBUFFER);
    }
 }