diff --git a/corsika/modules/qgsjetII/Interaction.hpp b/corsika/modules/qgsjetII/Interaction.hpp
index f272b8af14417550cfcfa1c0a65af0679559bc38..6d94312e494c468bf154e1629e3cb620dcd58652 100644
--- a/corsika/modules/qgsjetII/Interaction.hpp
+++ b/corsika/modules/qgsjetII/Interaction.hpp
@@ -55,7 +55,7 @@ namespace corsika::qgsjetII {
     corsika::EProcessReturn DoInteraction(TProjectile&);
 
   private:
-    corsika::default_prng_type& fRNG = corsika::RNGManager::getInstance().getRandomStream("qgran");
+    corsika::default_prng_type& fRNG = corsika::RNGManager::getInstance().getRandomStream("qgsjet");
     const int maxMassNumber_ = 208;
   };
 
diff --git a/corsika/modules/sibyll/Interaction.hpp b/corsika/modules/sibyll/Interaction.hpp
index 4b7d5cac95bac3283fe43d115a20a6e0bac6cc76..387d3e7f2666673b96cfa0d94b5f835545656da6 100644
--- a/corsika/modules/sibyll/Interaction.hpp
+++ b/corsika/modules/sibyll/Interaction.hpp
@@ -65,7 +65,7 @@ namespace corsika::sibyll {
     corsika::EProcessReturn DoInteraction(TProjectile&);
 
   private:
-    corsika::default_prng_type& RNG_ = corsika::RNGManager::getInstance().getRandomStream("s_rndm");
+    corsika::default_prng_type& RNG_ = corsika::RNGManager::getInstance().getRandomStream("sibyll");
     // FOR NOW keep trackedParticles private, could be configurable
     std::vector<corsika::Code> const trackedParticles_ = {
         corsika::Code::PiPlus,    corsika::Code::PiMinus,    corsika::Code::Pi0,
diff --git a/corsika/modules/sibyll/NuclearInteraction.hpp b/corsika/modules/sibyll/NuclearInteraction.hpp
index a743cae72c161ec7cc69bc17fe63b6dd03ab4db9..e30a4ed012f814c319a64dcaae82ce3015c80bdc 100644
--- a/corsika/modules/sibyll/NuclearInteraction.hpp
+++ b/corsika/modules/sibyll/NuclearInteraction.hpp
@@ -56,7 +56,7 @@ namespace corsika::sibyll {
     TEnvironment const& environment_;
     corsika::sibyll::Interaction& hadronicInteraction_;
     std::map<corsika::Code, int> targetComponentsIndex_;
-    corsika::default_prng_type& RNG_ = corsika::RNGManager::getInstance().getRandomStream("s_rndm");
+    corsika::default_prng_type& RNG_ = corsika::RNGManager::getInstance().getRandomStream("sibyll");
     static constexpr unsigned int gNSample_ =
         500; // number of samples in MC estimation of cross section
     static constexpr unsigned int gMaxNucleusAProjectile_ = 56;
diff --git a/corsika/modules/urqmd/UrQMD.hpp b/corsika/modules/urqmd/UrQMD.hpp
index c9f6a227f828cf75b3476975d9d1ab7c395c1cc6..9005ceb2bc5ac39e70ad8ec8a53b95a1ff6c0578 100644
--- a/corsika/modules/urqmd/UrQMD.hpp
+++ b/corsika/modules/urqmd/UrQMD.hpp
@@ -38,7 +38,7 @@ namespace corsika::urqmd {
   private:
     static CrossSectionType GetCrossSection(corsika::Code, corsika::Code, HEPEnergyType,
                                             int);
-    corsika::default_prng_type& fRNG = corsika::RNGManager::getInstance().getRandomStream("UrQMD");
+    corsika::default_prng_type& fRNG = corsika::RNGManager::getInstance().getRandomStream("urqmd");
 
     std::uniform_int_distribution<int> fBooleanDist{0, 1};
   };
diff --git a/examples/boundary_example.cpp b/examples/boundary_example.cpp
index 56b1b326552465f57155a3895f1d2d7fd79972ea..e19c8c9560b72b7e0d652a0432e1d8d06e5f7c83 100644
--- a/examples/boundary_example.cpp
+++ b/examples/boundary_example.cpp
@@ -100,7 +100,7 @@ int main() {
   // setup processes, decays and interactions
   tracking_line::TrackingLine tracking;
 
-  RNGManager::getInstance().registerRandomStream("s_rndm");
+  RNGManager::getInstance().registerRandomStream("sibyll");
   corsika::sibyll::Interaction sibyll;
   corsika::sibyll::Decay decay;
 
diff --git a/examples/cascade_example.cpp b/examples/cascade_example.cpp
index e5433c8263669c91501ef8cabda9c9aaf534e841..07a1d8e205e923bc455574600a53197cb1139fc3 100644
--- a/examples/cascade_example.cpp
+++ b/examples/cascade_example.cpp
@@ -115,7 +115,7 @@ int main() {
   tracking_line::TrackingLine tracking;
   stack_inspector::StackInspector<setup::Stack> stackInspect(1, true, E0);
 
-  corsika::RNGManager::getInstance().registerRandomStream("s_rndm");
+  corsika::RNGManager::getInstance().registerRandomStream("sibyll");
   corsika::RNGManager::getInstance().registerRandomStream("pythia");
   corsika::sibyll::Interaction sibyll;
   corsika::sibyll::NuclearInteraction sibyllNuc(sibyll, env);
diff --git a/examples/cascade_proton_example.cpp b/examples/cascade_proton_example.cpp
index 87e4f47afc37fb70aee8e7ef83e619017bc647d9..729f4a7f7ce14f8f33ae0d06f7a940df23f54ac3 100644
--- a/examples/cascade_proton_example.cpp
+++ b/examples/cascade_proton_example.cpp
@@ -103,7 +103,7 @@ int main() {
       corsika::Code::PiPlus, corsika::Code::PiMinus, corsika::Code::KPlus,
       corsika::Code::KMinus, corsika::Code::K0Long,  corsika::Code::K0Short};
 
-  corsika::RNGManager::getInstance().registerRandomStream("s_rndm");
+  corsika::RNGManager::getInstance().registerRandomStream("sibyll");
   corsika::RNGManager::getInstance().registerRandomStream("pythia");
   //  corsika::sibyll::Interaction sibyll(env);
   corsika::pythia8::Interaction pythia;
diff --git a/examples/stack_example.cpp b/examples/stack_example.cpp
index 7d97400273732abd785fe8e1c7475885320b4a51..795ceb100b829fb230ece51c954b9b6eda3f947e 100644
--- a/examples/stack_example.cpp
+++ b/examples/stack_example.cpp
@@ -37,7 +37,6 @@ void read(corsika::super_stupid::SuperStupidStack& s) {
   assert(s.GetSize() == 11); // stack has 11 particles
 
   HEPEnergyType total_energy;
-  int i = 0;
   for (const auto& p : s) {
     total_energy += p.GetEnergy();
     // particles are electrons with 1.5 GeV energy times i
diff --git a/examples/vertical_EAS.cpp b/examples/vertical_EAS.cpp
index dbb64116cf5b2b200ad54a2805e55eca695247df..5ec62fec732a2d2eb138a9382668c74ffaa5baf9 100644
--- a/examples/vertical_EAS.cpp
+++ b/examples/vertical_EAS.cpp
@@ -43,9 +43,9 @@ using namespace std;
 
 void registerRandomStreams() {
   corsika::RNGManager::getInstance().registerRandomStream("cascade");
-  corsika::RNGManager::getInstance().registerRandomStream("s_rndm");
+  corsika::RNGManager::getInstance().registerRandomStream("sibyll");
   // corsika::RNGManager::getInstance().registerRandomStream("pythia");
-  corsika::RNGManager::getInstance().registerRandomStream("UrQMD");
+  corsika::RNGManager::getInstance().registerRandomStream("urqmd");
 
   corsika::RNGManager::getInstance().seedAll();
 }
diff --git a/modules/conex b/modules/conex
index c6b0301c0f8eecf530ce8498d47cb1b56e070d37..c228d89b485ed0fa0822c64d5f12e53e32d2915d 160000
--- a/modules/conex
+++ b/modules/conex
@@ -1 +1 @@
-Subproject commit c6b0301c0f8eecf530ce8498d47cb1b56e070d37
+Subproject commit c228d89b485ed0fa0822c64d5f12e53e32d2915d
diff --git a/tests/modules/testQGSJetII.cpp b/tests/modules/testQGSJetII.cpp
index d09371a849b51049ad4de003c56d1ef15e32b570..5ecfe1d63793dc28c2eb01e9089683de1d512aec 100644
--- a/tests/modules/testQGSJetII.cpp
+++ b/tests/modules/testQGSJetII.cpp
@@ -88,7 +88,7 @@ TEST_CASE("QgsjetIIInterface", "[processes]") {
 
   const corsika::CoordinateSystem& cs = env.GetCoordinateSystem();
 
-  corsika::RNGManager::getInstance().registerRandomStream("qgran");
+  corsika::RNGManager::getInstance().registerRandomStream("qgsjet");
 
   SECTION("InteractionInterface") {
 
diff --git a/tests/modules/testSibyll.cpp b/tests/modules/testSibyll.cpp
index dc6b7e760cc30e53fb32cffdec703dc1feedc384..d203c652336b446160e8c834fe171997ad2f94df 100644
--- a/tests/modules/testSibyll.cpp
+++ b/tests/modules/testSibyll.cpp
@@ -95,7 +95,7 @@ TEST_CASE("SibyllInterface", "[processes]") {
 
   const corsika::CoordinateSystem& cs = env.GetCoordinateSystem();
 
-  corsika::RNGManager::getInstance().registerRandomStream("s_rndm");
+  corsika::RNGManager::getInstance().registerRandomStream("sibyll");
 
   SECTION("InteractionInterface") {
 
diff --git a/tests/modules/testUrQMD.cpp b/tests/modules/testUrQMD.cpp
index 00293889ddd0c62adf475692fb38ac90658cc58c..688daaadea7b0e5ede09f1d820b98d415db187dc 100644
--- a/tests/modules/testUrQMD.cpp
+++ b/tests/modules/testUrQMD.cpp
@@ -123,7 +123,7 @@ TEST_CASE("UrQMD") {
   }
 
   feenableexcept(FE_INVALID);
-  corsika::RNGManager::getInstance().registerRandomStream("UrQMD");
+  corsika::RNGManager::getInstance().registerRandomStream("urqmd");
   UrQMD urqmd;
 
   SECTION("cross sections") {