split metropolis

79 files changed, 1596 insertions, 638 deletions

diff --git a/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1.json b/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1.json
index 29196d322..b8a44029d 100644
--- a/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1.json
+++ b/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1.json
@@ -2,7 +2,7 @@
     "call_OOG_additionalGasCosts1" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts1Filler.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x8062bf5562f807ca2bd8f94dc31bc3b77775d5fef1e6b9ed74549acf3742cbbe",
+                    "hash" : "0x8e5bd1989eadfd5129c7f0ae2ba9be8c347a8d109a000c333443a582eafcc58d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x8e5bd1989eadfd5129c7f0ae2ba9be8c347a8d109a000c333443a582eafcc58d",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x8062bf5562f807ca2bd8f94dc31bc3b77775d5fef1e6b9ed74549acf3742cbbe",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x8e5bd1989eadfd5129c7f0ae2ba9be8c347a8d109a000c333443a582eafcc58d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x8062bf5562f807ca2bd8f94dc31bc3b77775d5fef1e6b9ed74549acf3742cbbe",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x8e5bd1989eadfd5129c7f0ae2ba9be8c347a8d109a000c333443a582eafcc58d",
+                    "hash" : "0x8062bf5562f807ca2bd8f94dc31bc3b77775d5fef1e6b9ed74549acf3742cbbe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2.json b/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2.json
index f82c0a091..3fca9af07 100644
--- a/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2.json
+++ b/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2.json
@@ -2,7 +2,7 @@
     "call_OOG_additionalGasCosts2" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts2Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6",
                     "indexes" : {
diff --git a/GeneralStateTests/stCallCodes/callcall_00.json b/GeneralStateTests/stCallCodes/callcall_00.json
index 51e053fbe..ece2ee03e 100644
--- a/GeneralStateTests/stCallCodes/callcall_00.json
+++ b/GeneralStateTests/stCallCodes/callcall_00.json
@@ -2,7 +2,7 @@
     "callcall_00" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcall_00Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x7ebd8fdaaeb5e96fd2ad3b11c675e3b16e5902ae4fe100710f39925e59ccd914",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x7ebd8fdaaeb5e96fd2ad3b11c675e3b16e5902ae4fe100710f39925e59ccd914",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x8f8ed2aed2973e159fa5486f47c6ebf15c5058f8e2350286b84b569bc6ce2d25",
+                    "hash" : "0x7ebd8fdaaeb5e96fd2ad3b11c675e3b16e5902ae4fe100710f39925e59ccd914",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x7ebd8fdaaeb5e96fd2ad3b11c675e3b16e5902ae4fe100710f39925e59ccd914",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x8f8ed2aed2973e159fa5486f47c6ebf15c5058f8e2350286b84b569bc6ce2d25",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x7ebd8fdaaeb5e96fd2ad3b11c675e3b16e5902ae4fe100710f39925e59ccd914",
+                    "hash" : "0x8f8ed2aed2973e159fa5486f47c6ebf15c5058f8e2350286b84b569bc6ce2d25",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcall_00_OOGE.json b/GeneralStateTests/stCallCodes/callcall_00_OOGE.json
index 0d32c727a..67e2662b9 100644
--- a/GeneralStateTests/stCallCodes/callcall_00_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcall_00_OOGE.json
@@ -2,7 +2,7 @@
     "callcall_00_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x9ec338ed8924f9d1ec3c31a3869815c4d36353c789941aaf432128a12102bfd5",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x9ec338ed8924f9d1ec3c31a3869815c4d36353c789941aaf432128a12102bfd5",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xa66f080864c72c593d874a42aa8c17eff838bf1e45ecb0bbe2bb041a3c235f94",
+                    "hash" : "0x9ec338ed8924f9d1ec3c31a3869815c4d36353c789941aaf432128a12102bfd5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x9ec338ed8924f9d1ec3c31a3869815c4d36353c789941aaf432128a12102bfd5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xa66f080864c72c593d874a42aa8c17eff838bf1e45ecb0bbe2bb041a3c235f94",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x9ec338ed8924f9d1ec3c31a3869815c4d36353c789941aaf432128a12102bfd5",
+                    "hash" : "0xa66f080864c72c593d874a42aa8c17eff838bf1e45ecb0bbe2bb041a3c235f94",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer.json b/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer.json
index 73d79ebaa..66fd960fb 100644
--- a/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer.json
+++ b/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer.json
@@ -2,7 +2,7 @@
     "callcall_00_OOGE_valueTransfer" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGE_valueTransferFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa0cd16519becf11ddd65f0aa43e0e4dafdef18d87de8fe4ac3e396758e8fb0a5",
                     "indexes" : {
@@ -36,7 +36,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa0cd16519becf11ddd65f0aa43e0e4dafdef18d87de8fe4ac3e396758e8fb0a5",
                     "indexes" : {
@@ -58,9 +58,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x3972c50ed3df88eb64729a02c3cfcb06ae7f0b2dbf16870213633e6d160936f9",
+                    "hash" : "0xa0cd16519becf11ddd65f0aa43e0e4dafdef18d87de8fe4ac3e396758e8fb0a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -70,7 +70,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x3972c50ed3df88eb64729a02c3cfcb06ae7f0b2dbf16870213633e6d160936f9",
+                    "hash" : "0x18f49ad2f2527eabe4cf24910a048341c7875650f34679a96db8fd6147af702b",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -80,7 +80,29 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xa0cd16519becf11ddd65f0aa43e0e4dafdef18d87de8fe4ac3e396758e8fb0a5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x18f49ad2f2527eabe4cf24910a048341c7875650f34679a96db8fd6147af702b",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x3972c50ed3df88eb64729a02c3cfcb06ae7f0b2dbf16870213633e6d160936f9",
                     "indexes" : {
@@ -102,9 +124,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xa0cd16519becf11ddd65f0aa43e0e4dafdef18d87de8fe4ac3e396758e8fb0a5",
+                    "hash" : "0x3972c50ed3df88eb64729a02c3cfcb06ae7f0b2dbf16870213633e6d160936f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -114,7 +136,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x18f49ad2f2527eabe4cf24910a048341c7875650f34679a96db8fd6147af702b",
+                    "hash" : "0x3972c50ed3df88eb64729a02c3cfcb06ae7f0b2dbf16870213633e6d160936f9",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd.json
index 469ca8f8c..7a878e00a 100644
--- a/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd.json
@@ -2,7 +2,7 @@
     "callcall_00_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcall_00_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x24f1a71eb1db0e939e466f484a7bdc5e99020478c8792957b7283ae160ba5114",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x24f1a71eb1db0e939e466f484a7bdc5e99020478c8792957b7283ae160ba5114",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x6edf980c4ea12c7909b073b2fd8902d00bb24a0b9df2142eb415aa31e4c7edda",
+                    "hash" : "0x24f1a71eb1db0e939e466f484a7bdc5e99020478c8792957b7283ae160ba5114",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x24f1a71eb1db0e939e466f484a7bdc5e99020478c8792957b7283ae160ba5114",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x6edf980c4ea12c7909b073b2fd8902d00bb24a0b9df2142eb415aa31e4c7edda",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x24f1a71eb1db0e939e466f484a7bdc5e99020478c8792957b7283ae160ba5114",
+                    "hash" : "0x6edf980c4ea12c7909b073b2fd8902d00bb24a0b9df2142eb415aa31e4c7edda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcall_000.json b/GeneralStateTests/stCallCodes/callcallcall_000.json
index d261bc781..13bc8bb0d 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_000.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_000.json
@@ -2,7 +2,7 @@
     "callcallcall_000" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x032e35d298fcec655b23a551cacd49a7fb4549bb4d962b3e8d011e9a49b584d6",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x032e35d298fcec655b23a551cacd49a7fb4549bb4d962b3e8d011e9a49b584d6",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x1ed24a8068d61509a3b7b1c30d1311735bba0587f6f6877efd5e74aa2364d382",
+                    "hash" : "0x032e35d298fcec655b23a551cacd49a7fb4549bb4d962b3e8d011e9a49b584d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x032e35d298fcec655b23a551cacd49a7fb4549bb4d962b3e8d011e9a49b584d6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x1ed24a8068d61509a3b7b1c30d1311735bba0587f6f6877efd5e74aa2364d382",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x032e35d298fcec655b23a551cacd49a7fb4549bb4d962b3e8d011e9a49b584d6",
+                    "hash" : "0x1ed24a8068d61509a3b7b1c30d1311735bba0587f6f6877efd5e74aa2364d382",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_OOGE.json b/GeneralStateTests/stCallCodes/callcallcall_000_OOGE.json
index 73f64f5a5..489d68a25 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_000_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_000_OOGE.json
@@ -2,7 +2,7 @@
     "callcallcall_000_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x05e4fd564371885b0d4ece7dc2d92a18f71da4915d212db0c18d87ba94ce3fb1",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x05e4fd564371885b0d4ece7dc2d92a18f71da4915d212db0c18d87ba94ce3fb1",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x7d58669ba6ac24ea5bb8aae0dd7a7143b069e37b06e31fad81976a51f35a47f4",
+                    "hash" : "0x05e4fd564371885b0d4ece7dc2d92a18f71da4915d212db0c18d87ba94ce3fb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x05e4fd564371885b0d4ece7dc2d92a18f71da4915d212db0c18d87ba94ce3fb1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x7d58669ba6ac24ea5bb8aae0dd7a7143b069e37b06e31fad81976a51f35a47f4",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x05e4fd564371885b0d4ece7dc2d92a18f71da4915d212db0c18d87ba94ce3fb1",
+                    "hash" : "0x7d58669ba6ac24ea5bb8aae0dd7a7143b069e37b06e31fad81976a51f35a47f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter.json
index 201a23aa2..15ec0eee1 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter.json
@@ -2,7 +2,7 @@
     "callcallcall_000_OOGMAfter" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMAfterFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xeaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xeaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xa767a97d79ec39107df9149cc68b1199fcdc3fd89a41193dd5c280eeb56ddc42",
+                    "hash" : "0xeaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xeaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xa767a97d79ec39107df9149cc68b1199fcdc3fd89a41193dd5c280eeb56ddc42",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xeaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
+                    "hash" : "0xa767a97d79ec39107df9149cc68b1199fcdc3fd89a41193dd5c280eeb56ddc42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore.json
index 08ee73466..f206a8f48 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore.json
@@ -2,7 +2,7 @@
     "callcallcall_000_OOGMBefore" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMBeforeFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xd2bc86dc047a69d169c9a13f9330765ff4509230af9d321fe367c09c30d095e1",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xd2bc86dc047a69d169c9a13f9330765ff4509230af9d321fe367c09c30d095e1",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xf46f37e7238438a444d89b8156b5cb11c331f0dafe29aa0c9d1396894b6ddf89",
+                    "hash" : "0xd2bc86dc047a69d169c9a13f9330765ff4509230af9d321fe367c09c30d095e1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xd2bc86dc047a69d169c9a13f9330765ff4509230af9d321fe367c09c30d095e1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xf46f37e7238438a444d89b8156b5cb11c331f0dafe29aa0c9d1396894b6ddf89",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xd2bc86dc047a69d169c9a13f9330765ff4509230af9d321fe367c09c30d095e1",
+                    "hash" : "0xf46f37e7238438a444d89b8156b5cb11c331f0dafe29aa0c9d1396894b6ddf89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd.json
index 81272eb18..9579cfc4d 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd.json
@@ -2,7 +2,7 @@
     "callcallcall_000_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x5c6d6ece9302edcdcc03a8fcbc0b16c8a09caf7764d920ff59477f10d55747c8",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x5c6d6ece9302edcdcc03a8fcbc0b16c8a09caf7764d920ff59477f10d55747c8",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xb2cc70b5c91805a7ba65d849ab2f2977354a5ed97458fa5481daaa78dd01783f",
+                    "hash" : "0x5c6d6ece9302edcdcc03a8fcbc0b16c8a09caf7764d920ff59477f10d55747c8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x5c6d6ece9302edcdcc03a8fcbc0b16c8a09caf7764d920ff59477f10d55747c8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xb2cc70b5c91805a7ba65d849ab2f2977354a5ed97458fa5481daaa78dd01783f",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x5c6d6ece9302edcdcc03a8fcbc0b16c8a09caf7764d920ff59477f10d55747c8",
+                    "hash" : "0xb2cc70b5c91805a7ba65d849ab2f2977354a5ed97458fa5481daaa78dd01783f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle.json
index 5d4811648..9c3e33909 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle.json
@@ -2,7 +2,7 @@
     "callcallcall_000_SuicideMiddle" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideMiddleFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951",
+                    "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
+                    "hash" : "0x23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE.json
index f4955108a..d534efee4 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE.json
@@ -2,7 +2,7 @@
     "callcallcall_ABCB_RECURSIVE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xb416fc6cf45e453dd9cd560d6a4e38b17562443c1e17528a3f6d81e071489ef5",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xb416fc6cf45e453dd9cd560d6a4e38b17562443c1e17528a3f6d81e071489ef5",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xf9904c46ff09c63f9864b18ef1acc3fa7ddda90e80b87f197500e40be0f61e54",
+                    "hash" : "0xb416fc6cf45e453dd9cd560d6a4e38b17562443c1e17528a3f6d81e071489ef5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xb416fc6cf45e453dd9cd560d6a4e38b17562443c1e17528a3f6d81e071489ef5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xf9904c46ff09c63f9864b18ef1acc3fa7ddda90e80b87f197500e40be0f61e54",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xb416fc6cf45e453dd9cd560d6a4e38b17562443c1e17528a3f6d81e071489ef5",
+                    "hash" : "0xf9904c46ff09c63f9864b18ef1acc3fa7ddda90e80b87f197500e40be0f61e54",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001.json b/GeneralStateTests/stCallCodes/callcallcallcode_001.json
index b3516277f..7ef681ab1 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_001.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_001.json
@@ -2,7 +2,7 @@
     "callcallcallcode_001" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x12596d09e34d8fe77b7639ff7a08660d4886299db9bf62db8c16e6823cadf84c",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x12596d09e34d8fe77b7639ff7a08660d4886299db9bf62db8c16e6823cadf84c",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x2b22357b48c2d396726a13e3eed3e61a6ee67351051154572f734c4090796124",
+                    "hash" : "0x12596d09e34d8fe77b7639ff7a08660d4886299db9bf62db8c16e6823cadf84c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x12596d09e34d8fe77b7639ff7a08660d4886299db9bf62db8c16e6823cadf84c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x2b22357b48c2d396726a13e3eed3e61a6ee67351051154572f734c4090796124",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x12596d09e34d8fe77b7639ff7a08660d4886299db9bf62db8c16e6823cadf84c",
+                    "hash" : "0x2b22357b48c2d396726a13e3eed3e61a6ee67351051154572f734c4090796124",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE.json
index 765599bb4..6bc7c028e 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE.json
@@ -2,7 +2,7 @@
     "callcallcallcode_001_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x7b92ad9527c67d4c4c4d297d7602cb02a8a95e6810730cd5164c4ab3d2c84956",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x7b92ad9527c67d4c4c4d297d7602cb02a8a95e6810730cd5164c4ab3d2c84956",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x606981436db0f6678cdf2891f26f52bd2659a6649d3c709acda4bf161b59c7c2",
+                    "hash" : "0x7b92ad9527c67d4c4c4d297d7602cb02a8a95e6810730cd5164c4ab3d2c84956",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x7b92ad9527c67d4c4c4d297d7602cb02a8a95e6810730cd5164c4ab3d2c84956",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x606981436db0f6678cdf2891f26f52bd2659a6649d3c709acda4bf161b59c7c2",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x7b92ad9527c67d4c4c4d297d7602cb02a8a95e6810730cd5164c4ab3d2c84956",
+                    "hash" : "0x606981436db0f6678cdf2891f26f52bd2659a6649d3c709acda4bf161b59c7c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter.json
index 4f151e28c..ab1727cae 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter.json
@@ -2,7 +2,7 @@
     "callcallcallcode_001_OOGMAfter" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMAfterFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xed050e8941d0530b3fab2fe1307f8b8ebed135ad216d2aa8f52c2d83f22399b0",
+                    "hash" : "0x85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xed050e8941d0530b3fab2fe1307f8b8ebed135ad216d2aa8f52c2d83f22399b0",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
+                    "hash" : "0xed050e8941d0530b3fab2fe1307f8b8ebed135ad216d2aa8f52c2d83f22399b0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore.json
index 667f590bb..ad34033b8 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore.json
@@ -2,7 +2,7 @@
     "callcallcallcode_001_OOGMBefore" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMBeforeFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x9b100dde5e66323eb06b6719b88472b366cbae95de5eeb62ed28f8254f3fc723",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x9b100dde5e66323eb06b6719b88472b366cbae95de5eeb62ed28f8254f3fc723",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x6e70eb4863af52fd076d45371513ff49043c76b06c11ef2bba4d4ab8edf33aba",
+                    "hash" : "0x9b100dde5e66323eb06b6719b88472b366cbae95de5eeb62ed28f8254f3fc723",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x9b100dde5e66323eb06b6719b88472b366cbae95de5eeb62ed28f8254f3fc723",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x6e70eb4863af52fd076d45371513ff49043c76b06c11ef2bba4d4ab8edf33aba",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x9b100dde5e66323eb06b6719b88472b366cbae95de5eeb62ed28f8254f3fc723",
+                    "hash" : "0x6e70eb4863af52fd076d45371513ff49043c76b06c11ef2bba4d4ab8edf33aba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd.json
index ccbee9e47..47cd2dd7d 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd.json
@@ -2,7 +2,7 @@
     "callcallcallcode_001_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x690ad82b4158dcc88162392a81d90a0dbbbd746780f4b49ef42967625d197c46",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x690ad82b4158dcc88162392a81d90a0dbbbd746780f4b49ef42967625d197c46",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x5ee6eeb669c1d7a7e71592eb8cb5a34c0375a8996d698e02f565fbf18da69705",
+                    "hash" : "0x690ad82b4158dcc88162392a81d90a0dbbbd746780f4b49ef42967625d197c46",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x690ad82b4158dcc88162392a81d90a0dbbbd746780f4b49ef42967625d197c46",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x5ee6eeb669c1d7a7e71592eb8cb5a34c0375a8996d698e02f565fbf18da69705",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x690ad82b4158dcc88162392a81d90a0dbbbd746780f4b49ef42967625d197c46",
+                    "hash" : "0x5ee6eeb669c1d7a7e71592eb8cb5a34c0375a8996d698e02f565fbf18da69705",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle.json
index 5da2095a8..3a4894892 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle.json
@@ -2,7 +2,7 @@
     "callcallcallcode_001_SuicideMiddle" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951",
+                    "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
+                    "hash" : "0x23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE.json
index d876d1911..f33eeba7e 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE.json
@@ -2,7 +2,7 @@
     "callcallcallcode_ABCB_RECURSIVE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xd60f0feab4578b9374bf7263fe10d917b70201b56524b1b0f5543abd16635e7d",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xd60f0feab4578b9374bf7263fe10d917b70201b56524b1b0f5543abd16635e7d",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x5cfc164fa79f7a1ed6e4c96e479a96efdb50a7c14eb59af4016b1f0de169504e",
+                    "hash" : "0xd60f0feab4578b9374bf7263fe10d917b70201b56524b1b0f5543abd16635e7d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xd60f0feab4578b9374bf7263fe10d917b70201b56524b1b0f5543abd16635e7d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x5cfc164fa79f7a1ed6e4c96e479a96efdb50a7c14eb59af4016b1f0de169504e",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xd60f0feab4578b9374bf7263fe10d917b70201b56524b1b0f5543abd16635e7d",
+                    "hash" : "0x5cfc164fa79f7a1ed6e4c96e479a96efdb50a7c14eb59af4016b1f0de169504e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcode_01.json b/GeneralStateTests/stCallCodes/callcallcode_01.json
index 3eadbd0e3..23dc5e71d 100644
--- a/GeneralStateTests/stCallCodes/callcallcode_01.json
+++ b/GeneralStateTests/stCallCodes/callcallcode_01.json
@@ -2,7 +2,7 @@
     "callcallcode_01" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x9d5a38358bff52dd9b7c82e53e45d22a2eb7917db9de0c05fe0b1b5e2dd24b7a",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x9d5a38358bff52dd9b7c82e53e45d22a2eb7917db9de0c05fe0b1b5e2dd24b7a",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x54475c6c67f504eace680150ef531ece0daf0181a5b469f8c369a5c74c1ce53c",
+                    "hash" : "0x9d5a38358bff52dd9b7c82e53e45d22a2eb7917db9de0c05fe0b1b5e2dd24b7a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x9d5a38358bff52dd9b7c82e53e45d22a2eb7917db9de0c05fe0b1b5e2dd24b7a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x54475c6c67f504eace680150ef531ece0daf0181a5b469f8c369a5c74c1ce53c",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x9d5a38358bff52dd9b7c82e53e45d22a2eb7917db9de0c05fe0b1b5e2dd24b7a",
+                    "hash" : "0x54475c6c67f504eace680150ef531ece0daf0181a5b469f8c369a5c74c1ce53c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcode_01_OOGE.json b/GeneralStateTests/stCallCodes/callcallcode_01_OOGE.json
index 92e29dbc7..d799a1823 100644
--- a/GeneralStateTests/stCallCodes/callcallcode_01_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcallcode_01_OOGE.json
@@ -2,7 +2,7 @@
     "callcallcode_01_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa4e40e003f4451cb909d92c1bedae7067a5625364638d346c6c7707814010ad6",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa4e40e003f4451cb909d92c1bedae7067a5625364638d346c6c7707814010ad6",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xe4209a1b867017e6b14927afeeed7d1129d53ecf7d18a29c7ee4b0ffa2a313a1",
+                    "hash" : "0xa4e40e003f4451cb909d92c1bedae7067a5625364638d346c6c7707814010ad6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xa4e40e003f4451cb909d92c1bedae7067a5625364638d346c6c7707814010ad6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xe4209a1b867017e6b14927afeeed7d1129d53ecf7d18a29c7ee4b0ffa2a313a1",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xa4e40e003f4451cb909d92c1bedae7067a5625364638d346c6c7707814010ad6",
+                    "hash" : "0xe4209a1b867017e6b14927afeeed7d1129d53ecf7d18a29c7ee4b0ffa2a313a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd.json
index a0b44c21e..b6fc717fd 100644
--- a/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd.json
@@ -2,7 +2,7 @@
     "callcallcode_01_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xd56431bc1677db24c8d1e96c6ad3a2b4bcdafac7f3d40f29a07a60ac05620eed",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xd56431bc1677db24c8d1e96c6ad3a2b4bcdafac7f3d40f29a07a60ac05620eed",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x3618f0634e258733a71ad69de3d642b67e8eb7d30ed210514e7fd231c80e7370",
+                    "hash" : "0xd56431bc1677db24c8d1e96c6ad3a2b4bcdafac7f3d40f29a07a60ac05620eed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xd56431bc1677db24c8d1e96c6ad3a2b4bcdafac7f3d40f29a07a60ac05620eed",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x3618f0634e258733a71ad69de3d642b67e8eb7d30ed210514e7fd231c80e7370",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xd56431bc1677db24c8d1e96c6ad3a2b4bcdafac7f3d40f29a07a60ac05620eed",
+                    "hash" : "0x3618f0634e258733a71ad69de3d642b67e8eb7d30ed210514e7fd231c80e7370",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010.json b/GeneralStateTests/stCallCodes/callcallcodecall_010.json
index 1800f05b4..756cf83ec 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_010.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_010.json
@@ -2,7 +2,7 @@
     "callcallcodecall_010" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xbc171762a13eae43b6919a40cc2384845b4006298db3cc4d12891369e6402cd3",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xbc171762a13eae43b6919a40cc2384845b4006298db3cc4d12891369e6402cd3",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xa71dce458a63645998a19a4c2f2c3bf68fb56b070835a91ae29d8ff94eb83d4d",
+                    "hash" : "0xbc171762a13eae43b6919a40cc2384845b4006298db3cc4d12891369e6402cd3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xbc171762a13eae43b6919a40cc2384845b4006298db3cc4d12891369e6402cd3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xa71dce458a63645998a19a4c2f2c3bf68fb56b070835a91ae29d8ff94eb83d4d",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xbc171762a13eae43b6919a40cc2384845b4006298db3cc4d12891369e6402cd3",
+                    "hash" : "0xa71dce458a63645998a19a4c2f2c3bf68fb56b070835a91ae29d8ff94eb83d4d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE.json
index 534e343e5..e6677148d 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE.json
@@ -2,7 +2,7 @@
     "callcallcodecall_010_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x0cbe5cffcd08f0ecf924fca2c8c4e80f0b33aa85bf5c177716739a780e74a5b7",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x0cbe5cffcd08f0ecf924fca2c8c4e80f0b33aa85bf5c177716739a780e74a5b7",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x4df6a657dc1699015b3105c69f85f344c8f02a0a67c7ea525d04382f4193a24e",
+                    "hash" : "0x0cbe5cffcd08f0ecf924fca2c8c4e80f0b33aa85bf5c177716739a780e74a5b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x0cbe5cffcd08f0ecf924fca2c8c4e80f0b33aa85bf5c177716739a780e74a5b7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x4df6a657dc1699015b3105c69f85f344c8f02a0a67c7ea525d04382f4193a24e",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x0cbe5cffcd08f0ecf924fca2c8c4e80f0b33aa85bf5c177716739a780e74a5b7",
+                    "hash" : "0x4df6a657dc1699015b3105c69f85f344c8f02a0a67c7ea525d04382f4193a24e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter.json
index c7ffd299a..4698013df 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter.json
@@ -2,7 +2,7 @@
     "callcallcodecall_010_OOGMAfter" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMAfterFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xc41a25808023d223b1dc3f3914c233a901168605f5f02a9f15c5fadce6044462",
+                    "hash" : "0x0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xc41a25808023d223b1dc3f3914c233a901168605f5f02a9f15c5fadce6044462",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
+                    "hash" : "0xc41a25808023d223b1dc3f3914c233a901168605f5f02a9f15c5fadce6044462",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore.json
index 93ae5a07f..5a54d7a7f 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore.json
@@ -2,7 +2,7 @@
     "callcallcodecall_010_OOGMBefore" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMBeforeFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x50bb5017d9c0c0e18f3be754d132f796e7aaff23065caf2f0a803fb9cf5cff5f",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x50bb5017d9c0c0e18f3be754d132f796e7aaff23065caf2f0a803fb9cf5cff5f",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x88eb1770368d56d4c62fdef02d85cbe710724cef84e492c5360fe635ff3eedda",
+                    "hash" : "0x50bb5017d9c0c0e18f3be754d132f796e7aaff23065caf2f0a803fb9cf5cff5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x50bb5017d9c0c0e18f3be754d132f796e7aaff23065caf2f0a803fb9cf5cff5f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x88eb1770368d56d4c62fdef02d85cbe710724cef84e492c5360fe635ff3eedda",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x50bb5017d9c0c0e18f3be754d132f796e7aaff23065caf2f0a803fb9cf5cff5f",
+                    "hash" : "0x88eb1770368d56d4c62fdef02d85cbe710724cef84e492c5360fe635ff3eedda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd.json
index 349fffe07..9c56bfde7 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd.json
@@ -2,7 +2,7 @@
     "callcallcodecall_010_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xb6ff93632d94e6a2fab89af79029d71c1e70ae92d912602ddbab344c26730068",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xb6ff93632d94e6a2fab89af79029d71c1e70ae92d912602ddbab344c26730068",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x308b378d2e435c0692646066af5f00b554ff5b3a2c9ebfee622d34231ded98fc",
+                    "hash" : "0xb6ff93632d94e6a2fab89af79029d71c1e70ae92d912602ddbab344c26730068",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xb6ff93632d94e6a2fab89af79029d71c1e70ae92d912602ddbab344c26730068",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x308b378d2e435c0692646066af5f00b554ff5b3a2c9ebfee622d34231ded98fc",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xb6ff93632d94e6a2fab89af79029d71c1e70ae92d912602ddbab344c26730068",
+                    "hash" : "0x308b378d2e435c0692646066af5f00b554ff5b3a2c9ebfee622d34231ded98fc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle.json
index 5a6afea44..0372981e5 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle.json
@@ -2,7 +2,7 @@
     "callcallcodecall_010_SuicideMiddle" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x5032b0ab27e1f0ac4e7951396f82db3a8dc8300d4ad4186a83349b0d1b70e532",
+                    "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x5032b0ab27e1f0ac4e7951396f82db3a8dc8300d4ad4186a83349b0d1b70e532",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9",
+                    "hash" : "0x5032b0ab27e1f0ac4e7951396f82db3a8dc8300d4ad4186a83349b0d1b70e532",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE.json
index 6485ccd48..cec8f966c 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE.json
@@ -2,7 +2,7 @@
     "callcallcodecall_ABCB_RECURSIVE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xc6cd69de23a75c8198e6e33bdef0f93c2a1a70a140548a93c20593f2dda3d941",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xc6cd69de23a75c8198e6e33bdef0f93c2a1a70a140548a93c20593f2dda3d941",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x28b46965732d9fed6925f56bd10ae0df42205d903c9c0b51f8c6b6295f6ead44",
+                    "hash" : "0xc6cd69de23a75c8198e6e33bdef0f93c2a1a70a140548a93c20593f2dda3d941",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xc6cd69de23a75c8198e6e33bdef0f93c2a1a70a140548a93c20593f2dda3d941",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x28b46965732d9fed6925f56bd10ae0df42205d903c9c0b51f8c6b6295f6ead44",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xc6cd69de23a75c8198e6e33bdef0f93c2a1a70a140548a93c20593f2dda3d941",
+                    "hash" : "0x28b46965732d9fed6925f56bd10ae0df42205d903c9c0b51f8c6b6295f6ead44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json
index 005a50fa5..09af81532 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json
@@ -2,7 +2,7 @@
     "callcallcodecallcode_011" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x9b73e3601b02719ca2a8bf639f350fb9906c1238085b402be677faba97bddf9b",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x9b73e3601b02719ca2a8bf639f350fb9906c1238085b402be677faba97bddf9b",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x4257fafde1d6f617828d567841b0331101f8240fa2a7f4518318c7ee5439e487",
+                    "hash" : "0x9b73e3601b02719ca2a8bf639f350fb9906c1238085b402be677faba97bddf9b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x9b73e3601b02719ca2a8bf639f350fb9906c1238085b402be677faba97bddf9b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x4257fafde1d6f617828d567841b0331101f8240fa2a7f4518318c7ee5439e487",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x9b73e3601b02719ca2a8bf639f350fb9906c1238085b402be677faba97bddf9b",
+                    "hash" : "0x4257fafde1d6f617828d567841b0331101f8240fa2a7f4518318c7ee5439e487",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE.json
index 4ffdc2d09..145dafdef 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE.json
@@ -2,7 +2,7 @@
     "callcallcodecallcode_011_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x666fd38cdf67c3b574d3319aa731d8bf10f212fdfb7d39bc8591815f182014df",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x666fd38cdf67c3b574d3319aa731d8bf10f212fdfb7d39bc8591815f182014df",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x80287ae33d156b8057b1c5242a8de40c31d2c1a2e79a2939594359ece6055df5",
+                    "hash" : "0x666fd38cdf67c3b574d3319aa731d8bf10f212fdfb7d39bc8591815f182014df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x666fd38cdf67c3b574d3319aa731d8bf10f212fdfb7d39bc8591815f182014df",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x80287ae33d156b8057b1c5242a8de40c31d2c1a2e79a2939594359ece6055df5",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x666fd38cdf67c3b574d3319aa731d8bf10f212fdfb7d39bc8591815f182014df",
+                    "hash" : "0x80287ae33d156b8057b1c5242a8de40c31d2c1a2e79a2939594359ece6055df5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter.json
index bc5543e96..6449a8319 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter.json
@@ -2,7 +2,7 @@
     "callcallcodecallcode_011_OOGMAfter" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMAfterFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xb1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xb1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xcd6b0d134a9ebf655f0e1f76cb2d6c8c66a36c478867d3abbb00d7655dbf0911",
+                    "hash" : "0xb1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xb1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xcd6b0d134a9ebf655f0e1f76cb2d6c8c66a36c478867d3abbb00d7655dbf0911",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xb1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
+                    "hash" : "0xcd6b0d134a9ebf655f0e1f76cb2d6c8c66a36c478867d3abbb00d7655dbf0911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore.json
index 7c49d6f41..e1e0f65ca 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore.json
@@ -2,7 +2,7 @@
     "callcallcodecallcode_011_OOGMBefore" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMBeforeFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x29d489641ecc56959584b5595751df02b859cb7477cd1f9d83c3d556e4f66b77",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x29d489641ecc56959584b5595751df02b859cb7477cd1f9d83c3d556e4f66b77",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x9584516d9633bace4678666471e26662982dcd9c842c62e00c9c9ff2ada13b15",
+                    "hash" : "0x29d489641ecc56959584b5595751df02b859cb7477cd1f9d83c3d556e4f66b77",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x29d489641ecc56959584b5595751df02b859cb7477cd1f9d83c3d556e4f66b77",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x9584516d9633bace4678666471e26662982dcd9c842c62e00c9c9ff2ada13b15",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x29d489641ecc56959584b5595751df02b859cb7477cd1f9d83c3d556e4f66b77",
+                    "hash" : "0x9584516d9633bace4678666471e26662982dcd9c842c62e00c9c9ff2ada13b15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd.json
index 7bbb83fad..2f13468a7 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd.json
@@ -2,7 +2,7 @@
     "callcallcodecallcode_011_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x6b12f1a241fa65db9f44b42cd16ab4b5db2a5da287c7b436880014010adbad62",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x6b12f1a241fa65db9f44b42cd16ab4b5db2a5da287c7b436880014010adbad62",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xf43c5e45844f6bbb7b0a55cef021b13121fecab88793bdf5dea426825d17f9e5",
+                    "hash" : "0x6b12f1a241fa65db9f44b42cd16ab4b5db2a5da287c7b436880014010adbad62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x6b12f1a241fa65db9f44b42cd16ab4b5db2a5da287c7b436880014010adbad62",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xf43c5e45844f6bbb7b0a55cef021b13121fecab88793bdf5dea426825d17f9e5",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x6b12f1a241fa65db9f44b42cd16ab4b5db2a5da287c7b436880014010adbad62",
+                    "hash" : "0xf43c5e45844f6bbb7b0a55cef021b13121fecab88793bdf5dea426825d17f9e5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle.json
index 976119e10..0d8bfbc34 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle.json
@@ -2,7 +2,7 @@
     "callcallcodecallcode_011_SuicideMiddle" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x5032b0ab27e1f0ac4e7951396f82db3a8dc8300d4ad4186a83349b0d1b70e532",
+                    "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x5032b0ab27e1f0ac4e7951396f82db3a8dc8300d4ad4186a83349b0d1b70e532",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9",
+                    "hash" : "0x5032b0ab27e1f0ac4e7951396f82db3a8dc8300d4ad4186a83349b0d1b70e532",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE.json
index 98bbbb324..7a7c1b50e 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE.json
@@ -2,7 +2,7 @@
     "callcallcodecallcode_ABCB_RECURSIVE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xd2155a852eaa4f76a5a4fe4bb7fe268d82a52a357962dd6a2617cd4a3af0f8fa",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xd2155a852eaa4f76a5a4fe4bb7fe268d82a52a357962dd6a2617cd4a3af0f8fa",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xe3ad647f45f66170708956d7148b3e3b7a092def6a2399d27be7fbfbdea4230f",
+                    "hash" : "0xd2155a852eaa4f76a5a4fe4bb7fe268d82a52a357962dd6a2617cd4a3af0f8fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xd2155a852eaa4f76a5a4fe4bb7fe268d82a52a357962dd6a2617cd4a3af0f8fa",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xe3ad647f45f66170708956d7148b3e3b7a092def6a2399d27be7fbfbdea4230f",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xd2155a852eaa4f76a5a4fe4bb7fe268d82a52a357962dd6a2617cd4a3af0f8fa",
+                    "hash" : "0xe3ad647f45f66170708956d7148b3e3b7a092def6a2399d27be7fbfbdea4230f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodeDynamicCode.json b/GeneralStateTests/stCallCodes/callcodeDynamicCode.json
index c0a262b63..417e7ec0c 100644
--- a/GeneralStateTests/stCallCodes/callcodeDynamicCode.json
+++ b/GeneralStateTests/stCallCodes/callcodeDynamicCode.json
@@ -2,7 +2,7 @@
     "callcodeDynamicCode" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x70c391c82965c0b9b701f5175b9f417a873e923e8742b5e9bff4413541ccde63",
+                    "hash" : "0x41e3f2ade5c27789716737d703559dd8a53f868baf7a876c408fcdb48d0df9b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x41e3f2ade5c27789716737d703559dd8a53f868baf7a876c408fcdb48d0df9b7",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x17388b6d68e240d2ac5841e36517ca05e9c61adc44787471fc40e5683f8279c3",
+                    "hash" : "0x70c391c82965c0b9b701f5175b9f417a873e923e8742b5e9bff4413541ccde63",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x41e3f2ade5c27789716737d703559dd8a53f868baf7a876c408fcdb48d0df9b7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x17388b6d68e240d2ac5841e36517ca05e9c61adc44787471fc40e5683f8279c3",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x41e3f2ade5c27789716737d703559dd8a53f868baf7a876c408fcdb48d0df9b7",
+                    "hash" : "0x17388b6d68e240d2ac5841e36517ca05e9c61adc44787471fc40e5683f8279c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall.json b/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall.json
index 74f86a4f3..469693266 100644
--- a/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall.json
+++ b/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall.json
@@ -2,7 +2,7 @@
     "callcodeDynamicCode2SelfCall" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCode2SelfCallFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x80cee8031b01b19740fac1888ec0628fd5b24b70f0eebfb44dfcbda5f4d5aea4",
+                    "hash" : "0xdf2b5e393c8e61ef04550e38a3c53b87016b34d93a995b6b1709c0a19d1addad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xdf2b5e393c8e61ef04550e38a3c53b87016b34d93a995b6b1709c0a19d1addad",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x53b3500d29c4ac1cc8db0f5403c0c35c256e9bff7ada5a8a35c99f805dc0e72f",
+                    "hash" : "0x80cee8031b01b19740fac1888ec0628fd5b24b70f0eebfb44dfcbda5f4d5aea4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xdf2b5e393c8e61ef04550e38a3c53b87016b34d93a995b6b1709c0a19d1addad",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x53b3500d29c4ac1cc8db0f5403c0c35c256e9bff7ada5a8a35c99f805dc0e72f",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xdf2b5e393c8e61ef04550e38a3c53b87016b34d93a995b6b1709c0a19d1addad",
+                    "hash" : "0x53b3500d29c4ac1cc8db0f5403c0c35c256e9bff7ada5a8a35c99f805dc0e72f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodeEmptycontract.json b/GeneralStateTests/stCallCodes/callcodeEmptycontract.json
index 92ca621e0..6461dd2be 100644
--- a/GeneralStateTests/stCallCodes/callcodeEmptycontract.json
+++ b/GeneralStateTests/stCallCodes/callcodeEmptycontract.json
@@ -2,7 +2,7 @@
     "callcodeEmptycontract" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodeEmptycontractFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x62726d292794da1b6eb2ecf6c30ce7fc64e7efee90636bc501362a71239a9bf2",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x62726d292794da1b6eb2ecf6c30ce7fc64e7efee90636bc501362a71239a9bf2",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x95716e7d0b244da6a57bacc2a981d4777c44a208820153c67224112315fbc985",
+                    "hash" : "0x62726d292794da1b6eb2ecf6c30ce7fc64e7efee90636bc501362a71239a9bf2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x62726d292794da1b6eb2ecf6c30ce7fc64e7efee90636bc501362a71239a9bf2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x95716e7d0b244da6a57bacc2a981d4777c44a208820153c67224112315fbc985",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x62726d292794da1b6eb2ecf6c30ce7fc64e7efee90636bc501362a71239a9bf2",
+                    "hash" : "0x95716e7d0b244da6a57bacc2a981d4777c44a208820153c67224112315fbc985",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract.json b/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract.json
index d82aa6c79..a9ec2b7e0 100644
--- a/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract.json
+++ b/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract.json
@@ -2,7 +2,7 @@
     "callcodeInInitcodeToEmptyContract" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToEmptyContractFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xf210d64ccb8593d338544f76f6f758a1bcb01c82acf4177e18648a086a32a008",
+                    "hash" : "0xbe3b36e7cf22ba2ac86dcac37b66b60ef96e0d28616df36251cb7de9aa2500aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xbe3b36e7cf22ba2ac86dcac37b66b60ef96e0d28616df36251cb7de9aa2500aa",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x157885c99eb23c5285e43296833a84e14e978aaa0f4a550b3bd6dde8a0ee734f",
+                    "hash" : "0xf210d64ccb8593d338544f76f6f758a1bcb01c82acf4177e18648a086a32a008",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xbe3b36e7cf22ba2ac86dcac37b66b60ef96e0d28616df36251cb7de9aa2500aa",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x157885c99eb23c5285e43296833a84e14e978aaa0f4a550b3bd6dde8a0ee734f",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xbe3b36e7cf22ba2ac86dcac37b66b60ef96e0d28616df36251cb7de9aa2500aa",
+                    "hash" : "0x157885c99eb23c5285e43296833a84e14e978aaa0f4a550b3bd6dde8a0ee734f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney.json b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney.json
index 91fefd688..56e4af195 100644
--- a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney.json
+++ b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney.json
@@ -2,7 +2,7 @@
     "callcodeInInitcodeToExisContractWithVTransferNEMoney" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoneyFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xbe6656bd52c7659c81827a5c684c5b08426e3027dbc6575d22aa16b974e04ec5",
+                    "hash" : "0x5d8fbaea35718275758ade9e78b2d8c64469cff78bd85a8a11a8c4691208b534",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x5d8fbaea35718275758ade9e78b2d8c64469cff78bd85a8a11a8c4691208b534",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xa94d8401ace9ce65aa88b52d16096f872a7b3b21b1a3302324ec51de1bb314f7",
+                    "hash" : "0xbe6656bd52c7659c81827a5c684c5b08426e3027dbc6575d22aa16b974e04ec5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x5d8fbaea35718275758ade9e78b2d8c64469cff78bd85a8a11a8c4691208b534",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xa94d8401ace9ce65aa88b52d16096f872a7b3b21b1a3302324ec51de1bb314f7",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x5d8fbaea35718275758ade9e78b2d8c64469cff78bd85a8a11a8c4691208b534",
+                    "hash" : "0xa94d8401ace9ce65aa88b52d16096f872a7b3b21b1a3302324ec51de1bb314f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json
index f2ff426f3..89573f403 100644
--- a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json
+++ b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json
@@ -2,7 +2,7 @@
     "callcodeInInitcodeToExistingContract" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x84551be7bbc2416c4482dae32daacb4447c5aaedd36da87713f4fe49781f61e0",
+                    "hash" : "0x0e9e704dc511c55b64b545eb97670caee07ad2c2b01d6c85b07748893ccf097f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x0e9e704dc511c55b64b545eb97670caee07ad2c2b01d6c85b07748893ccf097f",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x7e27ab28a19de7010592bfeb0b95bdc06e207a0ce56388dcf1fc92ade2abeb3c",
+                    "hash" : "0x84551be7bbc2416c4482dae32daacb4447c5aaedd36da87713f4fe49781f61e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x0e9e704dc511c55b64b545eb97670caee07ad2c2b01d6c85b07748893ccf097f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x7e27ab28a19de7010592bfeb0b95bdc06e207a0ce56388dcf1fc92ade2abeb3c",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x0e9e704dc511c55b64b545eb97670caee07ad2c2b01d6c85b07748893ccf097f",
+                    "hash" : "0x7e27ab28a19de7010592bfeb0b95bdc06e207a0ce56388dcf1fc92ade2abeb3c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json
index 58c7fbe86..db0be8fec 100644
--- a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json
+++ b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json
@@ -2,7 +2,7 @@
     "callcodeInInitcodeToExistingContractWithValueTransfer" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransferFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xf12e898bcf64ff2fbc15cdd1455b9eed5b57d45b2e9daf5b5ce4446c5f02fc0e",
+                    "hash" : "0xf98edc3fae7714d4f245414565d74b69a221627c7fdf7783a4cfc2f83951d5fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf98edc3fae7714d4f245414565d74b69a221627c7fdf7783a4cfc2f83951d5fa",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x51937cc2ddfdd89ecd073f53256f00a7e0497e5a9494d2dac6a63dd6b5bb0548",
+                    "hash" : "0xf12e898bcf64ff2fbc15cdd1455b9eed5b57d45b2e9daf5b5ce4446c5f02fc0e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xf98edc3fae7714d4f245414565d74b69a221627c7fdf7783a4cfc2f83951d5fa",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x51937cc2ddfdd89ecd073f53256f00a7e0497e5a9494d2dac6a63dd6b5bb0548",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xf98edc3fae7714d4f245414565d74b69a221627c7fdf7783a4cfc2f83951d5fa",
+                    "hash" : "0x51937cc2ddfdd89ecd073f53256f00a7e0497e5a9494d2dac6a63dd6b5bb0548",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcode_checkPC.json b/GeneralStateTests/stCallCodes/callcode_checkPC.json
index f6027294c..4d08187f3 100644
--- a/GeneralStateTests/stCallCodes/callcode_checkPC.json
+++ b/GeneralStateTests/stCallCodes/callcode_checkPC.json
@@ -2,7 +2,7 @@
     "callcode_checkPC" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcode_checkPCFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x62b3e139fab71b36127dc4f80cf91618e22bb5b05b36a43f0ae1e46e1e3bd9d9",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x62b3e139fab71b36127dc4f80cf91618e22bb5b05b36a43f0ae1e46e1e3bd9d9",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x4d8ba7f5982eec7fb7309a002e047fdf47d5e54f6e75077d3b7ad2c4601c1212",
+                    "hash" : "0x62b3e139fab71b36127dc4f80cf91618e22bb5b05b36a43f0ae1e46e1e3bd9d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x62b3e139fab71b36127dc4f80cf91618e22bb5b05b36a43f0ae1e46e1e3bd9d9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x4d8ba7f5982eec7fb7309a002e047fdf47d5e54f6e75077d3b7ad2c4601c1212",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x62b3e139fab71b36127dc4f80cf91618e22bb5b05b36a43f0ae1e46e1e3bd9d9",
+                    "hash" : "0x4d8ba7f5982eec7fb7309a002e047fdf47d5e54f6e75077d3b7ad2c4601c1212",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecall_10.json b/GeneralStateTests/stCallCodes/callcodecall_10.json
index 95de8a894..53c6aaafe 100644
--- a/GeneralStateTests/stCallCodes/callcodecall_10.json
+++ b/GeneralStateTests/stCallCodes/callcodecall_10.json
@@ -2,7 +2,7 @@
     "callcodecall_10" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x472ac3f8bd2f7a6936a664679c98b1a2cab94a9f23cf7e452ad0bd16972762f8",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x472ac3f8bd2f7a6936a664679c98b1a2cab94a9f23cf7e452ad0bd16972762f8",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x266f3efb4679756e79477cfa28d932bc5118d5e95ec131b92ceef8c5e2a54dd5",
+                    "hash" : "0x472ac3f8bd2f7a6936a664679c98b1a2cab94a9f23cf7e452ad0bd16972762f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x472ac3f8bd2f7a6936a664679c98b1a2cab94a9f23cf7e452ad0bd16972762f8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x266f3efb4679756e79477cfa28d932bc5118d5e95ec131b92ceef8c5e2a54dd5",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x472ac3f8bd2f7a6936a664679c98b1a2cab94a9f23cf7e452ad0bd16972762f8",
+                    "hash" : "0x266f3efb4679756e79477cfa28d932bc5118d5e95ec131b92ceef8c5e2a54dd5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecall_10_OOGE.json b/GeneralStateTests/stCallCodes/callcodecall_10_OOGE.json
index 4351efbc6..91b1b7bd2 100644
--- a/GeneralStateTests/stCallCodes/callcodecall_10_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcodecall_10_OOGE.json
@@ -2,7 +2,7 @@
     "callcodecall_10_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x721509038dd5a70d8aa67141fcb4cd7ac8efe66ea4f79fc439d4580421fbd22e",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x721509038dd5a70d8aa67141fcb4cd7ac8efe66ea4f79fc439d4580421fbd22e",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xa8759b2e9bc8080233d0170205eae59883131a8d420bc15d4aa04af39d3ad190",
+                    "hash" : "0x721509038dd5a70d8aa67141fcb4cd7ac8efe66ea4f79fc439d4580421fbd22e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x721509038dd5a70d8aa67141fcb4cd7ac8efe66ea4f79fc439d4580421fbd22e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xa8759b2e9bc8080233d0170205eae59883131a8d420bc15d4aa04af39d3ad190",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x721509038dd5a70d8aa67141fcb4cd7ac8efe66ea4f79fc439d4580421fbd22e",
+                    "hash" : "0xa8759b2e9bc8080233d0170205eae59883131a8d420bc15d4aa04af39d3ad190",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd.json
index d5215b327..70f709d04 100644
--- a/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd.json
@@ -2,7 +2,7 @@
     "callcodecall_10_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa69012cee412f90a45cc60f2da894c1d96f70c6393fb80fbbb2d0dc382f41413",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa69012cee412f90a45cc60f2da894c1d96f70c6393fb80fbbb2d0dc382f41413",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x6232a655eb075819b41b8c54e2c83c8730b5f42ff7f3820a58c13cf9ce1aa981",
+                    "hash" : "0xa69012cee412f90a45cc60f2da894c1d96f70c6393fb80fbbb2d0dc382f41413",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xa69012cee412f90a45cc60f2da894c1d96f70c6393fb80fbbb2d0dc382f41413",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x6232a655eb075819b41b8c54e2c83c8730b5f42ff7f3820a58c13cf9ce1aa981",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xa69012cee412f90a45cc60f2da894c1d96f70c6393fb80fbbb2d0dc382f41413",
+                    "hash" : "0x6232a655eb075819b41b8c54e2c83c8730b5f42ff7f3820a58c13cf9ce1aa981",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100.json b/GeneralStateTests/stCallCodes/callcodecallcall_100.json
index d6cd1f3cb..9a6361209 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_100.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_100.json
@@ -2,7 +2,7 @@
     "callcodecallcall_100" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x6101c3095dc2c0ec49cd5f06b3e9210a4c1e3a26c6fb5449ccad86e6102a247f",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x6101c3095dc2c0ec49cd5f06b3e9210a4c1e3a26c6fb5449ccad86e6102a247f",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xe9985e3c4b096bca71be68fe77a32bcb50eb2e96aaa63108daebefe1145c214f",
+                    "hash" : "0x6101c3095dc2c0ec49cd5f06b3e9210a4c1e3a26c6fb5449ccad86e6102a247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x6101c3095dc2c0ec49cd5f06b3e9210a4c1e3a26c6fb5449ccad86e6102a247f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xe9985e3c4b096bca71be68fe77a32bcb50eb2e96aaa63108daebefe1145c214f",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x6101c3095dc2c0ec49cd5f06b3e9210a4c1e3a26c6fb5449ccad86e6102a247f",
+                    "hash" : "0xe9985e3c4b096bca71be68fe77a32bcb50eb2e96aaa63108daebefe1145c214f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE.json
index e9053c81a..6f3f51524 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE.json
@@ -2,7 +2,7 @@
     "callcodecallcall_100_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x62dfd5d90ea8066ca0b7f75bfa2d14e169bea39f763ea774df9ba23ded9c3022",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x62dfd5d90ea8066ca0b7f75bfa2d14e169bea39f763ea774df9ba23ded9c3022",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xa97379ff11a8f6bd9d3ae4f08d89c39768ce1c9ddd45df89e2c292a7d07d7c7d",
+                    "hash" : "0x62dfd5d90ea8066ca0b7f75bfa2d14e169bea39f763ea774df9ba23ded9c3022",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x62dfd5d90ea8066ca0b7f75bfa2d14e169bea39f763ea774df9ba23ded9c3022",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xa97379ff11a8f6bd9d3ae4f08d89c39768ce1c9ddd45df89e2c292a7d07d7c7d",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x62dfd5d90ea8066ca0b7f75bfa2d14e169bea39f763ea774df9ba23ded9c3022",
+                    "hash" : "0xa97379ff11a8f6bd9d3ae4f08d89c39768ce1c9ddd45df89e2c292a7d07d7c7d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter.json
index 937a9cecd..764bec622 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter.json
@@ -2,7 +2,7 @@
     "callcodecallcall_100_OOGMAfter" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMAfterFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x278c6d69454c759028bab28462a540d7f0d8affdf3be9ab83ad873942f4d7169",
+                    "hash" : "0x1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x278c6d69454c759028bab28462a540d7f0d8affdf3be9ab83ad873942f4d7169",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
+                    "hash" : "0x278c6d69454c759028bab28462a540d7f0d8affdf3be9ab83ad873942f4d7169",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore.json
index 392dc6715..cc217b37f 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore.json
@@ -2,7 +2,7 @@
     "callcodecallcall_100_OOGMBefore" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMBeforeFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x2126825d2ed836fe96dbebc0ea713b3dc090876d6e2fac93b6d6ec1b2616d72f",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x2126825d2ed836fe96dbebc0ea713b3dc090876d6e2fac93b6d6ec1b2616d72f",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x8902ce31717fb761ac67ebbe8ac240ca6f886a65b2ccbf57e00d9afe10b4d6c8",
+                    "hash" : "0x2126825d2ed836fe96dbebc0ea713b3dc090876d6e2fac93b6d6ec1b2616d72f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x2126825d2ed836fe96dbebc0ea713b3dc090876d6e2fac93b6d6ec1b2616d72f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x8902ce31717fb761ac67ebbe8ac240ca6f886a65b2ccbf57e00d9afe10b4d6c8",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x2126825d2ed836fe96dbebc0ea713b3dc090876d6e2fac93b6d6ec1b2616d72f",
+                    "hash" : "0x8902ce31717fb761ac67ebbe8ac240ca6f886a65b2ccbf57e00d9afe10b4d6c8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd.json
index 176dc264f..07d576d67 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd.json
@@ -2,7 +2,7 @@
     "callcodecallcall_100_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x6abce7355f6ea2faf8acaf28fa705fcc52e89c63e70397cb2c584fd07fd77d1d",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x6abce7355f6ea2faf8acaf28fa705fcc52e89c63e70397cb2c584fd07fd77d1d",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x8de9ffdf6b2b0f4048d30b61853c0ef89c4499a1d6a1846251d8d6d7cbddbd88",
+                    "hash" : "0x6abce7355f6ea2faf8acaf28fa705fcc52e89c63e70397cb2c584fd07fd77d1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x6abce7355f6ea2faf8acaf28fa705fcc52e89c63e70397cb2c584fd07fd77d1d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x8de9ffdf6b2b0f4048d30b61853c0ef89c4499a1d6a1846251d8d6d7cbddbd88",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x6abce7355f6ea2faf8acaf28fa705fcc52e89c63e70397cb2c584fd07fd77d1d",
+                    "hash" : "0x8de9ffdf6b2b0f4048d30b61853c0ef89c4499a1d6a1846251d8d6d7cbddbd88",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle.json
index d11a2dcff..b42be036e 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle.json
@@ -2,7 +2,7 @@
     "callcodecallcall_100_SuicideMiddle" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x294042dda3ede82ea72313a788267340fcf9aea60f81ca9ee880a2bc7b814d01",
+                    "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x294042dda3ede82ea72313a788267340fcf9aea60f81ca9ee880a2bc7b814d01",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
+                    "hash" : "0x294042dda3ede82ea72313a788267340fcf9aea60f81ca9ee880a2bc7b814d01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE.json
index 5ff3c14e9..adb9aa31b 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE.json
@@ -2,7 +2,7 @@
     "callcodecallcall_ABCB_RECURSIVE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xb45f7068d6c1f6400676563a22df1791b2bab70929f90b0d297e13f58db69932",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xb45f7068d6c1f6400676563a22df1791b2bab70929f90b0d297e13f58db69932",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xa8670ec8bd38fd68db357ce1257b4ba7e9892058ace8f14b056bec60429c24cc",
+                    "hash" : "0xb45f7068d6c1f6400676563a22df1791b2bab70929f90b0d297e13f58db69932",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xb45f7068d6c1f6400676563a22df1791b2bab70929f90b0d297e13f58db69932",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xa8670ec8bd38fd68db357ce1257b4ba7e9892058ace8f14b056bec60429c24cc",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xb45f7068d6c1f6400676563a22df1791b2bab70929f90b0d297e13f58db69932",
+                    "hash" : "0xa8670ec8bd38fd68db357ce1257b4ba7e9892058ace8f14b056bec60429c24cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101.json
index fab74912e..62ac8874a 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101.json
@@ -2,7 +2,7 @@
     "callcodecallcallcode_101" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xfcddf3901a324d38ceeb1cc330787d96710395e88fac155951f0232f38299c12",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xfcddf3901a324d38ceeb1cc330787d96710395e88fac155951f0232f38299c12",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x47f86a353d296fe9530a92d8d937ba8051749ad0093cc65b9909c5bd260ddbef",
+                    "hash" : "0xfcddf3901a324d38ceeb1cc330787d96710395e88fac155951f0232f38299c12",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xfcddf3901a324d38ceeb1cc330787d96710395e88fac155951f0232f38299c12",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x47f86a353d296fe9530a92d8d937ba8051749ad0093cc65b9909c5bd260ddbef",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xfcddf3901a324d38ceeb1cc330787d96710395e88fac155951f0232f38299c12",
+                    "hash" : "0x47f86a353d296fe9530a92d8d937ba8051749ad0093cc65b9909c5bd260ddbef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE.json
index f47965235..719bef99c 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE.json
@@ -2,7 +2,7 @@
     "callcodecallcallcode_101_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x22c6dcc5111557389dd022c1ca9e5ad86eaec11e97fa00ab10fee2100758a0d9",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x22c6dcc5111557389dd022c1ca9e5ad86eaec11e97fa00ab10fee2100758a0d9",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x76e969488ba038d1f803ac5bdc231914f22868a7791c19759cef1f98eb616036",
+                    "hash" : "0x22c6dcc5111557389dd022c1ca9e5ad86eaec11e97fa00ab10fee2100758a0d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x22c6dcc5111557389dd022c1ca9e5ad86eaec11e97fa00ab10fee2100758a0d9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x76e969488ba038d1f803ac5bdc231914f22868a7791c19759cef1f98eb616036",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x22c6dcc5111557389dd022c1ca9e5ad86eaec11e97fa00ab10fee2100758a0d9",
+                    "hash" : "0x76e969488ba038d1f803ac5bdc231914f22868a7791c19759cef1f98eb616036",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter.json
index 0114ef813..9f4f4270f 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter.json
@@ -2,7 +2,7 @@
     "callcodecallcallcode_101_OOGMAfter" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMAfterFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x9dadc649bd108ae1326e1f7d8a113435e18e38fa2e345ebbe8e3b6c57d17c0b6",
+                    "hash" : "0x9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x9dadc649bd108ae1326e1f7d8a113435e18e38fa2e345ebbe8e3b6c57d17c0b6",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
+                    "hash" : "0x9dadc649bd108ae1326e1f7d8a113435e18e38fa2e345ebbe8e3b6c57d17c0b6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore.json
index 97a7dd42a..4b991e58c 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore.json
@@ -2,7 +2,7 @@
     "callcodecallcallcode_101_OOGMBefore" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMBeforeFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xf116e4cbc705d6224d62d6ca9098a1964d1df0d6da36e193e011416bb8d94f14",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf116e4cbc705d6224d62d6ca9098a1964d1df0d6da36e193e011416bb8d94f14",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x0b2d2acfc533d00543a6357fc5c7719c9ed811cb06c83f14d89479b64f338e3e",
+                    "hash" : "0xf116e4cbc705d6224d62d6ca9098a1964d1df0d6da36e193e011416bb8d94f14",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xf116e4cbc705d6224d62d6ca9098a1964d1df0d6da36e193e011416bb8d94f14",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x0b2d2acfc533d00543a6357fc5c7719c9ed811cb06c83f14d89479b64f338e3e",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xf116e4cbc705d6224d62d6ca9098a1964d1df0d6da36e193e011416bb8d94f14",
+                    "hash" : "0x0b2d2acfc533d00543a6357fc5c7719c9ed811cb06c83f14d89479b64f338e3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd.json
index 56d9f4df8..0e49616c6 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd.json
@@ -2,7 +2,7 @@
     "callcodecallcallcode_101_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x561c60019939881e459c7fd927acb5744cc931c73e9b9b7e235c87fd18d98ba7",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x561c60019939881e459c7fd927acb5744cc931c73e9b9b7e235c87fd18d98ba7",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x36322aecd24ccc418a4542b24ef71f7a067927b59f62e71835e62f984f8a28e9",
+                    "hash" : "0x561c60019939881e459c7fd927acb5744cc931c73e9b9b7e235c87fd18d98ba7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x561c60019939881e459c7fd927acb5744cc931c73e9b9b7e235c87fd18d98ba7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x36322aecd24ccc418a4542b24ef71f7a067927b59f62e71835e62f984f8a28e9",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x561c60019939881e459c7fd927acb5744cc931c73e9b9b7e235c87fd18d98ba7",
+                    "hash" : "0x36322aecd24ccc418a4542b24ef71f7a067927b59f62e71835e62f984f8a28e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle.json
index ad2a6578c..ea60d9d10 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle.json
@@ -2,7 +2,7 @@
     "callcodecallcallcode_101_SuicideMiddle" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x294042dda3ede82ea72313a788267340fcf9aea60f81ca9ee880a2bc7b814d01",
+                    "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x294042dda3ede82ea72313a788267340fcf9aea60f81ca9ee880a2bc7b814d01",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
+                    "hash" : "0x294042dda3ede82ea72313a788267340fcf9aea60f81ca9ee880a2bc7b814d01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE.json
index b44e5d09c..40bc1f92a 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE.json
@@ -2,7 +2,7 @@
     "callcodecallcallcode_ABCB_RECURSIVE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x759ae0f12630eef1e0e1a1ca73ae87de55a9714833518c06b8642a272cc5c2e5",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x759ae0f12630eef1e0e1a1ca73ae87de55a9714833518c06b8642a272cc5c2e5",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x843fc7bc4ac97ee198931f09665467525e5846bf6674622420f0e0173b89bba4",
+                    "hash" : "0x759ae0f12630eef1e0e1a1ca73ae87de55a9714833518c06b8642a272cc5c2e5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x759ae0f12630eef1e0e1a1ca73ae87de55a9714833518c06b8642a272cc5c2e5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x843fc7bc4ac97ee198931f09665467525e5846bf6674622420f0e0173b89bba4",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x759ae0f12630eef1e0e1a1ca73ae87de55a9714833518c06b8642a272cc5c2e5",
+                    "hash" : "0x843fc7bc4ac97ee198931f09665467525e5846bf6674622420f0e0173b89bba4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcode_11.json b/GeneralStateTests/stCallCodes/callcodecallcode_11.json
index 99844f56a..29cdbf263 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcode_11.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcode_11.json
@@ -2,7 +2,7 @@
     "callcodecallcode_11" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xe4d27dbac78ab10c73b9dc9244e93e7b5b98b09822337eb3a26152bd342d09de",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xe4d27dbac78ab10c73b9dc9244e93e7b5b98b09822337eb3a26152bd342d09de",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x1e91f9f6bd10a082c5f0479183a3d41204222a29742643fc84dfa9a2de54aba0",
+                    "hash" : "0xe4d27dbac78ab10c73b9dc9244e93e7b5b98b09822337eb3a26152bd342d09de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xe4d27dbac78ab10c73b9dc9244e93e7b5b98b09822337eb3a26152bd342d09de",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x1e91f9f6bd10a082c5f0479183a3d41204222a29742643fc84dfa9a2de54aba0",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xe4d27dbac78ab10c73b9dc9244e93e7b5b98b09822337eb3a26152bd342d09de",
+                    "hash" : "0x1e91f9f6bd10a082c5f0479183a3d41204222a29742643fc84dfa9a2de54aba0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE.json
index 9ac0cc58d..72a2ad646 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE.json
@@ -2,7 +2,7 @@
     "callcodecallcode_11_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xdd98eee45410d0bca7437ef275cfa194e6a0a7505797781461e3c8bf1298d919",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xdd98eee45410d0bca7437ef275cfa194e6a0a7505797781461e3c8bf1298d919",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xdb627612dc00ed5e1bebb241a2b7afd3673ced5f63aa54f857dd0019e678be46",
+                    "hash" : "0xdd98eee45410d0bca7437ef275cfa194e6a0a7505797781461e3c8bf1298d919",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xdd98eee45410d0bca7437ef275cfa194e6a0a7505797781461e3c8bf1298d919",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xdb627612dc00ed5e1bebb241a2b7afd3673ced5f63aa54f857dd0019e678be46",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xdd98eee45410d0bca7437ef275cfa194e6a0a7505797781461e3c8bf1298d919",
+                    "hash" : "0xdb627612dc00ed5e1bebb241a2b7afd3673ced5f63aa54f857dd0019e678be46",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd.json
index b8077ff69..6e5b8b276 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd.json
@@ -2,7 +2,7 @@
     "callcodecallcode_11_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x2405ebb0ff8e784419ab77d26cb0da6398bb3c6dfc7e810152a56432ff1ba246",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x2405ebb0ff8e784419ab77d26cb0da6398bb3c6dfc7e810152a56432ff1ba246",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x77a4a1939bcb8b911d5b69a23096e346391cca0cefd06ef641b170fe26b76a15",
+                    "hash" : "0x2405ebb0ff8e784419ab77d26cb0da6398bb3c6dfc7e810152a56432ff1ba246",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x2405ebb0ff8e784419ab77d26cb0da6398bb3c6dfc7e810152a56432ff1ba246",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x77a4a1939bcb8b911d5b69a23096e346391cca0cefd06ef641b170fe26b76a15",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x2405ebb0ff8e784419ab77d26cb0da6398bb3c6dfc7e810152a56432ff1ba246",
+                    "hash" : "0x77a4a1939bcb8b911d5b69a23096e346391cca0cefd06ef641b170fe26b76a15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110.json
index 8dea2cae2..08ec87bab 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110.json
@@ -2,7 +2,7 @@
     "callcodecallcodecall_110" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x4c09d7c4e380b4d9608607bf3761894db8b08deca148748f2c1b1fe9118c904e",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x4c09d7c4e380b4d9608607bf3761894db8b08deca148748f2c1b1fe9118c904e",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x8c09b408926871f45ed297bfcd62b07c7533028974f674f4339db37bd9bb377d",
+                    "hash" : "0x4c09d7c4e380b4d9608607bf3761894db8b08deca148748f2c1b1fe9118c904e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x4c09d7c4e380b4d9608607bf3761894db8b08deca148748f2c1b1fe9118c904e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x8c09b408926871f45ed297bfcd62b07c7533028974f674f4339db37bd9bb377d",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x4c09d7c4e380b4d9608607bf3761894db8b08deca148748f2c1b1fe9118c904e",
+                    "hash" : "0x8c09b408926871f45ed297bfcd62b07c7533028974f674f4339db37bd9bb377d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE.json
index f4d2e2b1c..4852f03f6 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE.json
@@ -2,7 +2,7 @@
     "callcodecallcodecall_110_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xea8c792c901a221fb7a84a561ce7ca9e91790ba5a7811949b9ee02442d02d3db",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xea8c792c901a221fb7a84a561ce7ca9e91790ba5a7811949b9ee02442d02d3db",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xb52e03c0be692b82645ba31689fa02476182151b640932e8f1f1542e2effc2df",
+                    "hash" : "0xea8c792c901a221fb7a84a561ce7ca9e91790ba5a7811949b9ee02442d02d3db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xea8c792c901a221fb7a84a561ce7ca9e91790ba5a7811949b9ee02442d02d3db",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xb52e03c0be692b82645ba31689fa02476182151b640932e8f1f1542e2effc2df",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xea8c792c901a221fb7a84a561ce7ca9e91790ba5a7811949b9ee02442d02d3db",
+                    "hash" : "0xb52e03c0be692b82645ba31689fa02476182151b640932e8f1f1542e2effc2df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter.json
index 74792758d..e47f9e128 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter.json
@@ -2,7 +2,7 @@
     "callcodecallcodecall_110_OOGMAfter" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMAfterFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x961d5c285a8e9cfd352cd1a30ff61cc7afe45d8474265fc2b63c6c9c67296b90",
+                    "hash" : "0x36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x961d5c285a8e9cfd352cd1a30ff61cc7afe45d8474265fc2b63c6c9c67296b90",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
+                    "hash" : "0x961d5c285a8e9cfd352cd1a30ff61cc7afe45d8474265fc2b63c6c9c67296b90",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore.json
index f1a71cbcc..2260f037d 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore.json
@@ -2,7 +2,7 @@
     "callcodecallcodecall_110_OOGMBefore" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMBeforeFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xc29b4e1dbb2e6aadb5534ac43bca93822b3fae633e395f5f448f6c4cccc2ec61",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xc29b4e1dbb2e6aadb5534ac43bca93822b3fae633e395f5f448f6c4cccc2ec61",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x0e376cf2634acda351764523c146b31455f32a40abe4ec2218b24b48c730f573",
+                    "hash" : "0xc29b4e1dbb2e6aadb5534ac43bca93822b3fae633e395f5f448f6c4cccc2ec61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xc29b4e1dbb2e6aadb5534ac43bca93822b3fae633e395f5f448f6c4cccc2ec61",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x0e376cf2634acda351764523c146b31455f32a40abe4ec2218b24b48c730f573",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xc29b4e1dbb2e6aadb5534ac43bca93822b3fae633e395f5f448f6c4cccc2ec61",
+                    "hash" : "0x0e376cf2634acda351764523c146b31455f32a40abe4ec2218b24b48c730f573",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd.json
index b994125e6..89b3ee920 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd.json
@@ -2,7 +2,7 @@
     "callcodecallcodecall_110_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xd9678be89a85362b600713a7df23c1721e4263aa37de2b67c3a1fb88173ddedd",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xd9678be89a85362b600713a7df23c1721e4263aa37de2b67c3a1fb88173ddedd",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x58797699a95dcbbc5692efe394ff177bb2bff2ac3a6846cb9480eeb49a4efaec",
+                    "hash" : "0xd9678be89a85362b600713a7df23c1721e4263aa37de2b67c3a1fb88173ddedd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xd9678be89a85362b600713a7df23c1721e4263aa37de2b67c3a1fb88173ddedd",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x58797699a95dcbbc5692efe394ff177bb2bff2ac3a6846cb9480eeb49a4efaec",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xd9678be89a85362b600713a7df23c1721e4263aa37de2b67c3a1fb88173ddedd",
+                    "hash" : "0x58797699a95dcbbc5692efe394ff177bb2bff2ac3a6846cb9480eeb49a4efaec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle.json
index b5724c5eb..f94f14d97 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle.json
@@ -2,7 +2,7 @@
     "callcodecallcodecall_110_SuicideMiddle" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xddf1a3d22daf33c4a641fdf43b83399fbcbeaf8532792161e2e0fb0638640ad0",
+                    "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xddf1a3d22daf33c4a641fdf43b83399fbcbeaf8532792161e2e0fb0638640ad0",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522",
+                    "hash" : "0xddf1a3d22daf33c4a641fdf43b83399fbcbeaf8532792161e2e0fb0638640ad0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE.json
index a7641a2a3..ff4506940 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE.json
@@ -2,7 +2,7 @@
     "callcodecallcodecall_ABCB_RECURSIVE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xcfc2b7464213422aa1bddca1d1742be8aa306fd41952e88ecc6a043efdb6c027",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xcfc2b7464213422aa1bddca1d1742be8aa306fd41952e88ecc6a043efdb6c027",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x2bba4d9c82761de3e6014ee9ed7d1f97fd6e4c6819034126d611e8a273509a1b",
+                    "hash" : "0xcfc2b7464213422aa1bddca1d1742be8aa306fd41952e88ecc6a043efdb6c027",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xcfc2b7464213422aa1bddca1d1742be8aa306fd41952e88ecc6a043efdb6c027",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x2bba4d9c82761de3e6014ee9ed7d1f97fd6e4c6819034126d611e8a273509a1b",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xcfc2b7464213422aa1bddca1d1742be8aa306fd41952e88ecc6a043efdb6c027",
+                    "hash" : "0x2bba4d9c82761de3e6014ee9ed7d1f97fd6e4c6819034126d611e8a273509a1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111.json
index 46e165fe6..4abf173b4 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111.json
@@ -2,7 +2,7 @@
     "callcodecallcodecallcode_111" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xf4e9023a998d6eecdf641d51e5920f242564d47de4d1bd892bef8f3b0e9431f6",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf4e9023a998d6eecdf641d51e5920f242564d47de4d1bd892bef8f3b0e9431f6",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x30318df71268d521be11e6603e58f1895ee8a08ff83fbcffdf7b516bbf603f9a",
+                    "hash" : "0xf4e9023a998d6eecdf641d51e5920f242564d47de4d1bd892bef8f3b0e9431f6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xf4e9023a998d6eecdf641d51e5920f242564d47de4d1bd892bef8f3b0e9431f6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x30318df71268d521be11e6603e58f1895ee8a08ff83fbcffdf7b516bbf603f9a",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xf4e9023a998d6eecdf641d51e5920f242564d47de4d1bd892bef8f3b0e9431f6",
+                    "hash" : "0x30318df71268d521be11e6603e58f1895ee8a08ff83fbcffdf7b516bbf603f9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE.json
index 1314ad4c0..5791b2960 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE.json
@@ -2,7 +2,7 @@
     "callcodecallcodecallcode_111_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xdf1be3ee9f2feaf6ad531942194ac1a21e2584628ddfc8c5cb3ed1f27f9e1236",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xdf1be3ee9f2feaf6ad531942194ac1a21e2584628ddfc8c5cb3ed1f27f9e1236",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x3299b2945c527e8915e7cddf86273d80c4fd08b40e6961036d5eb102f5370f1d",
+                    "hash" : "0xdf1be3ee9f2feaf6ad531942194ac1a21e2584628ddfc8c5cb3ed1f27f9e1236",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xdf1be3ee9f2feaf6ad531942194ac1a21e2584628ddfc8c5cb3ed1f27f9e1236",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x3299b2945c527e8915e7cddf86273d80c4fd08b40e6961036d5eb102f5370f1d",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xdf1be3ee9f2feaf6ad531942194ac1a21e2584628ddfc8c5cb3ed1f27f9e1236",
+                    "hash" : "0x3299b2945c527e8915e7cddf86273d80c4fd08b40e6961036d5eb102f5370f1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter.json
index 0bb01177a..1efd771d6 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter.json
@@ -2,7 +2,7 @@
     "callcodecallcodecallcode_111_OOGMAfter" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMAfterFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x6b91bfc795dca3991ec5721c8ea8a823e6dd446688e27285d8d0500bba8ab56c",
+                    "hash" : "0x2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x6b91bfc795dca3991ec5721c8ea8a823e6dd446688e27285d8d0500bba8ab56c",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
+                    "hash" : "0x6b91bfc795dca3991ec5721c8ea8a823e6dd446688e27285d8d0500bba8ab56c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore.json
index 16f2c0fba..6361142db 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore.json
@@ -2,7 +2,7 @@
     "callcodecallcodecallcode_111_OOGMBefore" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMBeforeFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xd8691751e00a60bf1e08b382b2e4d1e34af74710687e2f2a70deb77a46cbad54",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xd8691751e00a60bf1e08b382b2e4d1e34af74710687e2f2a70deb77a46cbad54",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x719bf7118658117cc1ef6d2fc778e3a1257c0c5ce8a260dae629440cf839ad78",
+                    "hash" : "0xd8691751e00a60bf1e08b382b2e4d1e34af74710687e2f2a70deb77a46cbad54",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xd8691751e00a60bf1e08b382b2e4d1e34af74710687e2f2a70deb77a46cbad54",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x719bf7118658117cc1ef6d2fc778e3a1257c0c5ce8a260dae629440cf839ad78",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xd8691751e00a60bf1e08b382b2e4d1e34af74710687e2f2a70deb77a46cbad54",
+                    "hash" : "0x719bf7118658117cc1ef6d2fc778e3a1257c0c5ce8a260dae629440cf839ad78",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd.json
index d58fe2f9d..dc072af0b 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd.json
@@ -2,7 +2,7 @@
     "callcodecallcodecallcode_111_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x792734d18e18b7ecacb4500cbbdda6d00e956ce2952cb1e25847e2ae1bb9e7e6",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x792734d18e18b7ecacb4500cbbdda6d00e956ce2952cb1e25847e2ae1bb9e7e6",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x403b618a588daef088c707e25def251aa42c083092904234db5cccfff1689a7e",
+                    "hash" : "0x792734d18e18b7ecacb4500cbbdda6d00e956ce2952cb1e25847e2ae1bb9e7e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x792734d18e18b7ecacb4500cbbdda6d00e956ce2952cb1e25847e2ae1bb9e7e6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x403b618a588daef088c707e25def251aa42c083092904234db5cccfff1689a7e",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x792734d18e18b7ecacb4500cbbdda6d00e956ce2952cb1e25847e2ae1bb9e7e6",
+                    "hash" : "0x403b618a588daef088c707e25def251aa42c083092904234db5cccfff1689a7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle.json
index ca8dc1748..73d1cbc5b 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle.json
@@ -2,7 +2,7 @@
     "callcodecallcodecallcode_111_SuicideMiddle" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xddf1a3d22daf33c4a641fdf43b83399fbcbeaf8532792161e2e0fb0638640ad0",
+                    "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xddf1a3d22daf33c4a641fdf43b83399fbcbeaf8532792161e2e0fb0638640ad0",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522",
+                    "hash" : "0xddf1a3d22daf33c4a641fdf43b83399fbcbeaf8532792161e2e0fb0638640ad0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE.json
index bb2f2ed71..50fb63506 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE.json
@@ -2,7 +2,7 @@
     "callcodecallcodecallcode_ABCB_RECURSIVE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xd7eb40ab8620545d410fc73953746a87439728298371a90e302b2ef531afaa17",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xd7eb40ab8620545d410fc73953746a87439728298371a90e302b2ef531afaa17",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xa62ec476ec7b2c034e5ddb7d512640e509e8f000c306f596881163fb6ac48ad0",
+                    "hash" : "0xd7eb40ab8620545d410fc73953746a87439728298371a90e302b2ef531afaa17",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xd7eb40ab8620545d410fc73953746a87439728298371a90e302b2ef531afaa17",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xa62ec476ec7b2c034e5ddb7d512640e509e8f000c306f596881163fb6ac48ad0",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xd7eb40ab8620545d410fc73953746a87439728298371a90e302b2ef531afaa17",
+                    "hash" : "0xa62ec476ec7b2c034e5ddb7d512640e509e8f000c306f596881163fb6ac48ad0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,