diff --git a/app/bcc1/alarm1/verify_a.py b/app/bcc1/alarm1/verify_a.py
index 523af7e8c62761845b1a3fc3f6444ea1df3bd355..e9c7522330b1dcf6d0255f6c06594fc521ca01ca 100644
--- a/app/bcc1/alarm1/verify_a.py
+++ b/app/bcc1/alarm1/verify_a.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, Idle, StartOS) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS"])
diff --git a/app/bcc1/alarm1/verify_b.py b/app/bcc1/alarm1/verify_b.py
index 0716ee7be694c855ba4f27f8e42bac7f7a8489da..ff6547665b7127c273b596b003fb45e1bbb8dc5b 100644
--- a/app/bcc1/alarm1/verify_b.py
+++ b/app/bcc1/alarm1/verify_b.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, Idle, StartOS) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS"])
diff --git a/app/bcc1/alarm1/verify_c.py b/app/bcc1/alarm1/verify_c.py
index 6f5dc42d4e09c9d091bb050abc26674b0d5e389d..4b1493a077c871a2e0a670179e42ee32eea34991 100644
--- a/app/bcc1/alarm1/verify_c.py
+++ b/app/bcc1/alarm1/verify_c.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, Idle, StartOS) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS"])
diff --git a/app/bcc1/alarm1/verify_d.py b/app/bcc1/alarm1/verify_d.py
index ca826c1256c93eaf41b3415f22e86399a7a75017..b65449930fbdc48fc8dd32d6b554b98decc671c6 100644
--- a/app/bcc1/alarm1/verify_d.py
+++ b/app/bcc1/alarm1/verify_d.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, Idle, StartOS) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS"])
diff --git a/app/bcc1/alarm1/verify_e.py b/app/bcc1/alarm1/verify_e.py
index d36f6241e1a2ea92bdd69b4c6d1383920811f39f..57c25df19413b9fafd22942fbc07e660560d557d 100644
--- a/app/bcc1/alarm1/verify_e.py
+++ b/app/bcc1/alarm1/verify_e.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, Idle, StartOS) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS"])
diff --git a/app/bcc1/complex1/verify_a.py b/app/bcc1/complex1/verify_a.py
index efbfbdbe01a6f1502b6cc98d424e8ac297cab6bd..bdeaa4e7ccf522f0c1c34b2a3a9189f0dbce22db 100644
--- a/app/bcc1/complex1/verify_a.py
+++ b/app/bcc1/complex1/verify_a.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, Idle, StartOS, ISR1) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS", "ISR1"])
diff --git a/app/bcc1/complex1/verify_b.py b/app/bcc1/complex1/verify_b.py
index 60e4e64ceeaebc9dd2bf7e0207fa8b1e13aa6ec9..3507bb7ad7c1d984ee96880f27c4d2c9444a866f 100644
--- a/app/bcc1/complex1/verify_b.py
+++ b/app/bcc1/complex1/verify_b.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, Idle, StartOS, ISR1) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS", "ISR1"])
diff --git a/app/bcc1/complex1/verify_c.py b/app/bcc1/complex1/verify_c.py
index a649ad2686500e696c8196185ba08f74d7953d30..303fef00554e1e48e01b0b64a9aaf9a9507a628f 100644
--- a/app/bcc1/complex1/verify_c.py
+++ b/app/bcc1/complex1/verify_c.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, Idle, StartOS, ISR1) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS", "ISR1"])
diff --git a/app/bcc1/isr2/verify_a.py b/app/bcc1/isr2/verify_a.py
index 517c166a5f83b04a69ee2e7eaae42ad66b74a3ec..29f0fb80a40cf48e47ccb28d4e237f5353bdc3eb 100644
--- a/app/bcc1/isr2/verify_a.py
+++ b/app/bcc1/isr2/verify_a.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, Idle, StartOS, ISR1) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS", "ISR1"])
diff --git a/app/bcc1/isr2/verify_b.py b/app/bcc1/isr2/verify_b.py
index 015326d4492da5450306a3073d232325a1779dde..09bf35ea870a289188063b8e27e8685ec5d230be 100644
--- a/app/bcc1/isr2/verify_b.py
+++ b/app/bcc1/isr2/verify_b.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, Idle, StartOS, ISR1) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS", "ISR1"])
diff --git a/app/bcc1/isr2/verify_c.py b/app/bcc1/isr2/verify_c.py
index c7f0b6d21ef9a949d1d80d48ae2397098a61b04b..807f23a763a6944da01d0cc7347581339a06b8f9 100644
--- a/app/bcc1/isr2/verify_c.py
+++ b/app/bcc1/isr2/verify_c.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, Idle, StartOS) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS"])
diff --git a/app/bcc1/isr2/verify_d.py b/app/bcc1/isr2/verify_d.py
index f2b4c9a2c79f610c23ba9b5c77c4d4264e66014e..0434d8b1e91e704d27d1f7e35a62bb26033fe3ba 100644
--- a/app/bcc1/isr2/verify_d.py
+++ b/app/bcc1/isr2/verify_d.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, Idle, ISR1) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "ISR1"])
diff --git a/app/bcc1/resource1/verify_a.py b/app/bcc1/resource1/verify_a.py
index 69eaf746596a37743a2a1e98480a64aa958403b0..ff299f11f51c9c65a18f566206e1eb9dbd221c11 100644
--- a/app/bcc1/resource1/verify_a.py
+++ b/app/bcc1/resource1/verify_a.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, H4, H5, Idle, StartOS) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5", 
diff --git a/app/bcc1/resource1/verify_b.py b/app/bcc1/resource1/verify_b.py
index edd0302daada8b9fe9e28bd17ecdf41e7f82c530..ad84850a4c85427af0aacb5405d93a4c8b13d458 100644
--- a/app/bcc1/resource1/verify_b.py
+++ b/app/bcc1/resource1/verify_b.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, H4, H5, Idle, StartOS) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5", 
diff --git a/app/bcc1/resource1/verify_d.py b/app/bcc1/resource1/verify_d.py
index c95172897631a065d68478c7f19f8c1a8dcbfff6..cd5ff8955d9fed53543a177e5b31c0ed275f09c6 100644
--- a/app/bcc1/resource1/verify_d.py
+++ b/app/bcc1/resource1/verify_d.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, H4, H5, Idle, StartOS, bar) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5", 
diff --git a/app/bcc1/resource1/verify_e.py b/app/bcc1/resource1/verify_e.py
index 38efcacfa62e058df27231c2d29ca1a966357533..bf0fefbab5750db7e56ea4ebb0cfd0796719ef9b 100644
--- a/app/bcc1/resource1/verify_e.py
+++ b/app/bcc1/resource1/verify_e.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, H4, H5, Idle, StartOS) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5",
diff --git a/app/bcc1/resource1/verify_f.py b/app/bcc1/resource1/verify_f.py
index 34cabe1412df419ae5223b772967d7e8a282da3b..f8c0abbfb34be08bc4151e73f7ac983824ddc3d5 100644
--- a/app/bcc1/resource1/verify_f.py
+++ b/app/bcc1/resource1/verify_f.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, H4, H5, Idle, StartOS) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5",
diff --git a/app/bcc1/resource1/verify_g.py b/app/bcc1/resource1/verify_g.py
index aeeb0521a535f6db1dc68ababf4b34ad71f4f362..9c37c4eacee657d0791b3e0e53d7f27f4b9b0950 100644
--- a/app/bcc1/resource1/verify_g.py
+++ b/app/bcc1/resource1/verify_g.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, H4, H5, Idle, StartOS) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5",
diff --git a/app/bcc1/resource1/verify_h.py b/app/bcc1/resource1/verify_h.py
index 82d43388e4774b7096d28f379449b6bf063da35d..38d9ad8c5a355775fc0c272525b1b239a58096e0 100644
--- a/app/bcc1/resource1/verify_h.py
+++ b/app/bcc1/resource1/verify_h.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, H4, H5, Idle, StartOS) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5",
diff --git a/app/bcc1/resource1/verify_k.py b/app/bcc1/resource1/verify_k.py
index ed9e207780d1bd28ee40ed5d6b596c95f87f05b9..45afa40b95580bdacbead098c3a8781517792ab8 100644
--- a/app/bcc1/resource1/verify_k.py
+++ b/app/bcc1/resource1/verify_k.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, H4, H5, Idle, StartOS) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5",
diff --git a/app/bcc1/resource2/verify_a.py b/app/bcc1/resource2/verify_a.py
index b751012a4e1208e043df689aa77a6f5ad91e8d91..f60b8b8675f5e6fcb2585dee457e149605a7f916 100644
--- a/app/bcc1/resource2/verify_a.py
+++ b/app/bcc1/resource2/verify_a.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, H4, H5, Idle, StartOS) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5", "Idle", "StartOS"])
diff --git a/app/bcc1/resource2/verify_b.py b/app/bcc1/resource2/verify_b.py
index c46a8f6a0e0e154938f9e58944e748d7530b6bd6..a28d637216b312f5850ecb50eacae6f60fbcec39 100644
--- a/app/bcc1/resource2/verify_b.py
+++ b/app/bcc1/resource2/verify_b.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, H4, H5, Idle, StartOS) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5", "Idle", "StartOS"])
diff --git a/app/bcc1/sse1/verify_a.py b/app/bcc1/sse1/verify_a.py
index 66def3c37dd11f21ff9b0ceb790bd1161f7519ca..d202d58fd7600381dfafdac70eaac267f4dc71aa 100644
--- a/app/bcc1/sse1/verify_a.py
+++ b/app/bcc1/sse1/verify_a.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, H4, H5, Idle, StartOS) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5", 
diff --git a/app/bcc1/sse1/verify_b.py b/app/bcc1/sse1/verify_b.py
index ce8d0d59a3af9b942eb500728a9de5266da7c471..acc3276031b36bc2b43b5a032563a200e6e456a7 100644
--- a/app/bcc1/sse1/verify_b.py
+++ b/app/bcc1/sse1/verify_b.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, H4, H5, Idle, StartOS, bar) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5", 
diff --git a/app/bcc1/sse1/verify_c.py b/app/bcc1/sse1/verify_c.py
index 782f109aabb8ccd5fcfb180ef8e16fdf14614ba5..9d9ffe8a74b28862ba4c1a30adf91056fd6f640a 100644
--- a/app/bcc1/sse1/verify_c.py
+++ b/app/bcc1/sse1/verify_c.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (H1, H2, H3, H4, H5, Idle, StartOS, bar) = \
        get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5", 
diff --git a/app/bcc1/task1/verify_a.py b/app/bcc1/task1/verify_a.py
index b7454076366b3cf2d5ed3d91fdf8213ec354916f..a820974ccd63b06284d70b488238e85e785b8fa6 100644
--- a/app/bcc1/task1/verify_a.py
+++ b/app/bcc1/task1/verify_a.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (Handler11, Handler12, Handler13, Idle, StartOS) = \
          get_functions(analysis.system, ["Handler11", "Handler12", "Handler13", "Idle", "StartOS"])
diff --git a/app/bcc1/task1/verify_b.py b/app/bcc1/task1/verify_b.py
index 181c42e1165c24d060dde6370ea401153f947edf..ac6a1a808a1edaf9db66722ac1f169af627b7757 100644
--- a/app/bcc1/task1/verify_b.py
+++ b/app/bcc1/task1/verify_b.py
@@ -17,7 +17,7 @@ def after_MoveFunctionsToTask(analysis):
     # But is not yet moved to the Task of Handler11
     assert bar in Handler11.task.functions
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (Handler11, Handler12, Handler13, bar, Idle, StartOS) = \
        get_functions(analysis.system, ["Handler11", "Handler12", "Handler13", "bar", "Idle", "StartOS"])
diff --git a/app/bcc1/task1/verify_c.py b/app/bcc1/task1/verify_c.py
index 85763c4be30c35f5b1954339b95205f710fa1b40..170d9f5c36d5b595d6def419a99b4f9f9704f777 100644
--- a/app/bcc1/task1/verify_c.py
+++ b/app/bcc1/task1/verify_c.py
@@ -17,7 +17,7 @@ def after_MoveFunctionsToTask(analysis):
     # But is not yet moved to the Task of Handler11
     assert bar in Handler11.task.functions
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (Handler11, Handler12, Handler13, bar, Idle, StartOS) = \
        get_functions(analysis.system, ["Handler11", "Handler12", "Handler13", "bar", "Idle", "StartOS"])
diff --git a/app/bcc1/task1/verify_d.py b/app/bcc1/task1/verify_d.py
index 086b688550a7b2dccaa4f4f3de8752ec0a9dbfb3..9a4e4e1ae46778633f5f49abc34f5a4872958396 100644
--- a/app/bcc1/task1/verify_d.py
+++ b/app/bcc1/task1/verify_d.py
@@ -17,7 +17,7 @@ def after_MoveFunctionsToTask(analysis):
     # But is not yet moved to the Task of Handler11
     assert bar in Handler11.task.functions
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (Handler11, Handler12, Handler13, bar, Idle, StartOS) = \
        get_functions(analysis.system, ["Handler11", "Handler12", "Handler13", "bar", "Idle", "StartOS"])
diff --git a/app/bcc1/task1/verify_e.py b/app/bcc1/task1/verify_e.py
index e7fa842c2ccbe0d31aaac7348958437e7b782bad..81487b9a58b1668abe9229e995a7ca4a1de604f6 100644
--- a/app/bcc1/task1/verify_e.py
+++ b/app/bcc1/task1/verify_e.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (Handler11, Handler12, Handler13, Idle, StartOS) = \
        get_functions(analysis.system, ["Handler11", "Handler12", "Handler13", "Idle", "StartOS"])
diff --git a/app/bcc1/task1/verify_f.py b/app/bcc1/task1/verify_f.py
index 82521c1718f05ba2ea9ca044c5c100bab5a978aa..fbeafa9b27c0c37cef8600f3dbdd184bc0c49844 100644
--- a/app/bcc1/task1/verify_f.py
+++ b/app/bcc1/task1/verify_f.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (Handler11, Handler12, Handler13, Idle, StartOS) = \
        get_functions(analysis.system, ["Handler11", "Handler12", "Handler13", "Idle", "StartOS"])
diff --git a/app/bcc1/task1/verify_g.py b/app/bcc1/task1/verify_g.py
index 41dd6bd536aec5d42682a9f45497d562dee02f80..17f1e510e56f2e291a9ecca0c1361ff7b4033b11 100644
--- a/app/bcc1/task1/verify_g.py
+++ b/app/bcc1/task1/verify_g.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (Handler11, Handler12, Handler13, Idle, StartOS, bar) = \
        get_functions(analysis.system, ["Handler11", "Handler12", "Handler13", "Idle", "StartOS", "bar"])
diff --git a/app/bcc1/task2/verify_a.py b/app/bcc1/task2/verify_a.py
index 06a5e97561fa2e47556be86b7c376e6307010ffe..4fff90605b029c270e118d7c1a21ab50bb61cf6e 100644
--- a/app/bcc1/task2/verify_a.py
+++ b/app/bcc1/task2/verify_a.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (Handler11, Handler12, Handler13, Idle, StartOS) = \
        get_functions(analysis.system, ["Handler11", "Handler12", "Handler13", "Idle", "StartOS"])
diff --git a/app/bcc1/task2/verify_b.py b/app/bcc1/task2/verify_b.py
index 686a26453d019efd42c04f88093d6b7b97160f52..e6859b151659fc1e2e0748e08b08c81fb9800395 100644
--- a/app/bcc1/task2/verify_b.py
+++ b/app/bcc1/task2/verify_b.py
@@ -1,6 +1,6 @@
 from generator.graph.verifier_tools import *
 
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
     # Find all three systemcall handlers
     (Handler11, Handler12, Handler13, Idle, StartOS) = \
        get_functions(analysis.system, ["Handler11", "Handler12", "Handler13", "Idle", "StartOS"])
diff --git a/generator/graph/SymbolicSystemExecution.py b/generator/graph/SymbolicSystemExecution.py
index 59fcfce0886694873d051c76c6911f8678ab2562..6f417064a6a7a358790f76f0ffd0045b8553ebd5 100644
--- a/generator/graph/SymbolicSystemExecution.py
+++ b/generator/graph/SymbolicSystemExecution.py
@@ -157,7 +157,7 @@ class Combine_RunningTask_SSE(Analysis):
 
     def requires(self):
         # We require all possible system edges to be contructed
-        return ["RunningTaskAnalysis", "SymbolicSystemExecution"]
+        return ["SystemStateFlow", "SymbolicSystemExecution"]
 
     def do(self):
         self.removed_edges = []
diff --git a/generator/graph/RunningTask.py b/generator/graph/SystemStateFlow.py
similarity index 98%
rename from generator/graph/RunningTask.py
rename to generator/graph/SystemStateFlow.py
index 7247c64faba351f8cd7e352abe6f845b659b75a0..eda2f9390c9f5563608334e4f335b50c5216746e 100644
--- a/generator/graph/RunningTask.py
+++ b/generator/graph/SystemStateFlow.py
@@ -8,7 +8,7 @@ from generator.graph.AtomicBasicBlock import E
 from generator.tools import panic
 
 
-class RunningTaskAnalysis(Analysis):
+class SystemStateFlow(Analysis):
     def __init__(self):
         Analysis.__init__(self)
         self.sporadic_events = []
@@ -35,7 +35,7 @@ class RunningTaskAnalysis(Analysis):
 
     @staticmethod
     def update_before_state(edge_states, before_state_dict, block, edge_type):
-        before = RunningTaskAnalysis.merge_inputs(edge_states, block, edge_type)
+        before = SystemStateFlow.merge_inputs(edge_states, block, edge_type)
         changed = False
         if not block in before_state_dict:
             before_state_dict[block] = before
@@ -231,7 +231,7 @@ class RunningTask_ISR(SporadicEvent):
             self.before_abb_states[block] = before
         else:
             self.changed_current_block, before = \
-                RunningTaskAnalysis.update_before_state(self.edge_states,
+                SystemStateFlow.update_before_state(self.edge_states,
                                                         self.before_abb_states,
                                                         block,
                                                         edge_type = E.irq_level)
diff --git a/generator/graph/__init__.py b/generator/graph/__init__.py
index 248280477b9b29857a2e0ef50ae964a3d7fb1e24..a4999fe8f15befb69034506fa2f3554ac0f75076 100644
--- a/generator/graph/__init__.py
+++ b/generator/graph/__init__.py
@@ -8,7 +8,7 @@ from generator.graph.Subtask import Subtask
 from generator.graph.AtomicBasicBlock import AtomicBasicBlock
 from generator.graph.Function import Function
 from generator.graph.Analysis import *
-from generator.graph.RunningTask import *
+from generator.graph.SystemStateFlow import *
 from generator.graph.common import GraphObject
 from generator.graph.Sporadic import Alarm
 from generator.graph.Resource import Resource
diff --git a/generator/main.py b/generator/main.py
index e61ea838da44e72860b24cb95d50d7ddff8ee648..0c14bb3fba9e38c42cefc5d3c00d656372c77b6f 100755
--- a/generator/main.py
+++ b/generator/main.py
@@ -95,7 +95,7 @@ if __name__ == "__main__":
     pass_manager.register_and_enqueue_analysis(DynamicPriorityAnalysis())
 
     # System-Level: Analysis
-    pass_manager.register_analysis(RunningTaskAnalysis())
+    pass_manager.register_analysis(SystemStateFlow())
     pass_manager.register_analysis(SymbolicSystemExecution())
     pass_manager.register_analysis(Combine_RunningTask_SSE())
 
@@ -118,7 +118,7 @@ if __name__ == "__main__":
         # Only when we want to specialize the system calls, run the
         # System-Level analysises
         pass_manager.enqueue_analysis("Combine_RunningTask_SSE")
-        global_abb_information = pass_manager.get_pass("RunningTaskAnalysis")
+        global_abb_information = pass_manager.get_pass("SystemStateFlow")
         syscall_rules = SpecializedSystemCalls(global_abb_information)
     else:
         syscall_rules = FullSystemCalls()