diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1eb296b..12a1cd6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -22,8 +22,8 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testinput)
 list(APPEND monio_testinput
-  testinput/background_basic.yaml
-  testinput/background_full.yaml
+  testinput/state_basic.yaml
+  testinput/state_full.yaml
 )
 
 foreach(FILENAME ${monio_testinput})
@@ -47,15 +47,15 @@ ecbuild_add_test(TARGET monio_coding_norms
                        ${PROJECT_SOURCE_DIR}/src
                        ${PROJECT_SOURCE_DIR}/test)
 
-ecbuild_add_test(TARGET  test_background_basic
-                 SOURCES mains/TestBackgroundBasic.cc
-                 ARGS    "testinput/background_basic.yaml"
+ecbuild_add_test(TARGET  test_state_basic
+                 SOURCES mains/TestStateBasic.cc
+                 ARGS    "testinput/state_basic.yaml"
                  LIBS    monio
                  MPI     4)
 
-ecbuild_add_test(TARGET  test_background_full
-                 SOURCES mains/TestBackgroundFull.cc
-                 ARGS    "testinput/background_full.yaml"
+ecbuild_add_test(TARGET  test_state_full
+                 SOURCES mains/TestStateFull.cc
+                 ARGS    "testinput/state_full.yaml"
                  LIBS    monio
                  MPI     4)
 
diff --git a/test/mains/TestBackgroundFull.cc b/test/mains/TestStateBasic.cc
similarity index 91%
rename from test/mains/TestBackgroundFull.cc
rename to test/mains/TestStateBasic.cc
index 47ea209..d4d3541 100644
--- a/test/mains/TestBackgroundFull.cc
+++ b/test/mains/TestStateBasic.cc
@@ -6,11 +6,11 @@
 # This software is licensed under the terms of the Apache Licence Version 2.0 #
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.        #
 #############################################################################*/
-#include "../monio/BackgroundFull.h"
+#include "../monio/StateBasic.h"
 #include "oops/runs/Run.h"
 
 int main(int argc,  char ** argv) {
   oops::Run run(argc, argv);
-  monio::test::BackgroundFull tests;
+  monio::test::StateBasic tests;
   return run.execute(tests);
 }
diff --git a/test/mains/TestBackgroundBasic.cc b/test/mains/TestStateFull.cc
similarity index 90%
rename from test/mains/TestBackgroundBasic.cc
rename to test/mains/TestStateFull.cc
index d5017c5..ad1e01c 100644
--- a/test/mains/TestBackgroundBasic.cc
+++ b/test/mains/TestStateFull.cc
@@ -6,11 +6,11 @@
 # This software is licensed under the terms of the Apache Licence Version 2.0 #
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.        #
 #############################################################################*/
-#include "../monio/BackgroundBasic.h"
+#include "../monio/StateFull.h"
 #include "oops/runs/Run.h"
 
 int main(int argc,  char ** argv) {
   oops::Run run(argc, argv);
-  monio::test::BackgroundBasic tests;
+  monio::test::StateFull tests;
   return run.execute(tests);
 }
diff --git a/test/monio/BackgroundBasic.h b/test/monio/StateBasic.h
similarity index 93%
rename from test/monio/BackgroundBasic.h
rename to test/monio/StateBasic.h
index 7968631..889a494 100644
--- a/test/monio/BackgroundBasic.h
+++ b/test/monio/StateBasic.h
@@ -78,13 +78,13 @@ void testFunction() {
   }
 }
 
-class BackgroundBasic : public oops::Test{
+class StateBasic : public oops::Test{
  public:
-  BackgroundBasic() {}
-  virtual ~BackgroundBasic() {}
+  StateBasic() {}
+  virtual ~StateBasic() {}
  private:
   std::string testid() const override {
-    return "monio::test::BackgroundBasic";
+    return "monio::test::StateBasic";
   }
 
   void register_tests() const override {
@@ -92,7 +92,7 @@ class BackgroundBasic : public oops::Test{
 
     std::function<void(std::string&, int&, int)> testFn =
         [](std::string &, int&, int) { testFunction(); };
-    ts.push_back(eckit::testing::Test("monio/test_background_basic", testFn));
+    ts.push_back(eckit::testing::Test("monio/test_state_basic", testFn));
   }
   void clear() const override {}
 };
diff --git a/test/monio/BackgroundFull.h b/test/monio/StateFull.h
similarity index 96%
rename from test/monio/BackgroundFull.h
rename to test/monio/StateFull.h
index c86e49f..63856b3 100644
--- a/test/monio/BackgroundFull.h
+++ b/test/monio/StateFull.h
@@ -149,14 +149,14 @@ void main() {
   readOutput(outputFilePath);
 }
 
-class BackgroundFull : public oops::Test{
+class StateFull : public oops::Test{
  public:
-  BackgroundFull() {}
-  virtual ~BackgroundFull() {}
+  StateFull() {}
+  virtual ~StateFull() {}
 
  private:
   std::string testid() const override {
-    return "monio::test::BackgroundFull";
+    return "monio::test::StateFull";
   }
 
   void register_tests() const override {
@@ -164,7 +164,7 @@ class BackgroundFull : public oops::Test{
 
     std::function<void(std::string&, int&, int)> mainFunction =
         [&](std::string&, int&, int) { main(); };
-    ts.push_back(eckit::testing::Test("monio/test_background_full", mainFunction));
+    ts.push_back(eckit::testing::Test("monio/test_state_full", mainFunction));
   }
   void clear() const override {}
 };
diff --git a/test/testinput/background_basic.yaml b/test/testinput/state_basic.yaml
similarity index 100%
rename from test/testinput/background_basic.yaml
rename to test/testinput/state_basic.yaml
diff --git a/test/testinput/background_full.yaml b/test/testinput/state_full.yaml
similarity index 100%
rename from test/testinput/background_full.yaml
rename to test/testinput/state_full.yaml