diff --git a/test/k4FWCoreTest/options/runExampleFunctionalConsumer.py b/test/k4FWCoreTest/options/runExampleFunctionalConsumer.py
index f01d8eb6..409e11f1 100644
--- a/test/k4FWCoreTest/options/runExampleFunctionalConsumer.py
+++ b/test/k4FWCoreTest/options/runExampleFunctionalConsumer.py
@@ -12,11 +12,11 @@
 
 inp = PodioInput()
 inp.collections = [
-    "ExampleInt",
+    "MCParticles",
 ]
 
 consumer = ExampleFunctionalConsumer("ExampleFunctionalConsumer",
-                                     InputLocation="/Event/ExampleInt",
+                                     InputLocation="MCParticles",
                                      )
 
 ApplicationMgr(TopAlg=[inp, consumer],
diff --git a/test/k4FWCoreTest/options/runExampleFunctionalProducer.py b/test/k4FWCoreTest/options/runExampleFunctionalProducer.py
index 41589f9b..66f07859 100644
--- a/test/k4FWCoreTest/options/runExampleFunctionalProducer.py
+++ b/test/k4FWCoreTest/options/runExampleFunctionalProducer.py
@@ -13,7 +13,7 @@
 out.outputCommands = ["keep *"]
 
 producer = ExampleFunctionalProducer("ExampleFunctionalProducer",
-                                     OutputLocation="ExampleInt",
+                                     OutputLocation="MCParticles",
                                      ExampleInt=5)
 
 ApplicationMgr(TopAlg=[producer, out],
diff --git a/test/k4FWCoreTest/options/runExampleFunctionalTransformer.py b/test/k4FWCoreTest/options/runExampleFunctionalTransformer.py
index 8f5ac01e..53d29223 100644
--- a/test/k4FWCoreTest/options/runExampleFunctionalTransformer.py
+++ b/test/k4FWCoreTest/options/runExampleFunctionalTransformer.py
@@ -11,17 +11,17 @@
 
 inp = PodioInput()
 inp.collections = [
-    "ExampleInt",
+    "MCParticles",
 ]
 
 out = PodioOutput("out")
 out.filename = "output_k4test_exampledata_transformer.root"
 # Use this to keep all the existing collections in the input file
-out.outputCommands = ["drop ExampleInt"]
+out.outputCommands = ["drop MCParticles"]
 
 transformer = ExampleFunctionalTransformer("ExampleFunctionalTransformer",
-                                           InputLocation="ExampleInt",
-                                           OutputLocation="ExampleDoubles")
+                                           InputLocation="MCParticles",
+                                           OutputLocation="NewMCParticles")
 
 ApplicationMgr(TopAlg=[inp, transformer, out],
                EvtSel="NONE",
diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cc b/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cc
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cpp
index 02dcde77..a20dd803 100644
--- a/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cpp
+++ b/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cpp
@@ -19,7 +19,7 @@ using colltype = DataWrapper<podio::CollectionBase>;
 struct ExampleFunctionalConsumer final : Gaudi::Functional::Consumer<void(const colltype& input), BaseClass_t> {
 
   ExampleFunctionalConsumer( const std::string& name, ISvcLocator* svcLoc )
-    : Consumer( name, svcLoc, KeyValue("InputLocation", "/ExampleInt")) {}
+    : Consumer( name, svcLoc, KeyValue("InputLocation", "MCParticles")) {}
 
   // This is the function that will be called to transform the data
   // Note that the function has to be const, as well as all pointers to collections
diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalProducer.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalProducer.cpp
index 5ebcc678..8d05e9c9 100644
--- a/test/k4FWCoreTest/src/components/ExampleFunctionalProducer.cpp
+++ b/test/k4FWCoreTest/src/components/ExampleFunctionalProducer.cpp
@@ -17,7 +17,7 @@ using colltype = DataWrapper<edm4hep::MCParticleCollection>;
 struct ExampleFunctionalProducer final : Gaudi::Functional::Producer<colltype(), BaseClass_t> {
 
   ExampleFunctionalProducer( const std::string& name, ISvcLocator* svcLoc )
-    : Producer( name, svcLoc, KeyValue( "OutputLocation", "/ExampleInt" ) ) {}
+    : Producer( name, svcLoc, KeyValue( "OutputLocation", "MCParticles" ) ) {}
 
   // This is the function that will be called to produce the data
   colltype operator()() const override {
diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalTransformer.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalTransformer.cpp
index 67309ff6..9450bab1 100644
--- a/test/k4FWCoreTest/src/components/ExampleFunctionalTransformer.cpp
+++ b/test/k4FWCoreTest/src/components/ExampleFunctionalTransformer.cpp
@@ -22,8 +22,8 @@ struct ExampleFunctionalTransformer final :
   Gaudi::Functional::Transformer<colltype_out(const colltype_in&), BaseClass_t> {
 
   ExampleFunctionalTransformer( const std::string& name, ISvcLocator* svcLoc )
-    : Transformer( name, svcLoc, KeyValue("InputLocation", "/ExampleInt"),
-                   KeyValue( "OutputLocation", "/ExampleDouble" ) ) {}
+    : Transformer( name, svcLoc, KeyValue("InputLocation", "MCParticles"),
+                   KeyValue( "OutputLocation", "NewMCParticles" ) ) {}
 
   // This is the function that will be called to transform the data
   // Note that the function has to be const, as well as all pointers to collections