split metropolis

24 files changed, 486 insertions, 198 deletions

diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL.json
index ae86b799c..f236195d9 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL.json
@@ -2,7 +2,7 @@
     "ZeroValue_CALL" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xdfacd1d7556cf17b7c9375eea01cac37b8b207ab4b246db055b6347cf856419d",
+                    "hash" : "0xb808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xb808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x61f7fa4930e73b4e1f5423909928473dec0f0d70875373680109967f15b52303",
+                    "hash" : "0xdfacd1d7556cf17b7c9375eea01cac37b8b207ab4b246db055b6347cf856419d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xb808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x61f7fa4930e73b4e1f5423909928473dec0f0d70875373680109967f15b52303",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xb808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
+                    "hash" : "0x61f7fa4930e73b4e1f5423909928473dec0f0d70875373680109967f15b52303",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE.json
index 02816f0fe..f45cffe9c 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE.json
@@ -2,7 +2,7 @@
     "ZeroValue_CALLCODE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x1531bd9ebfed425c01ab97871c2f5415683b614160c0de07e95ca46a3f8222e3",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x1531bd9ebfed425c01ab97871c2f5415683b614160c0de07e95ca46a3f8222e3",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x0a4c2fa1b508e3612c10290e2b44da1d0600ea0e820312e1115ba01752768e30",
+                    "hash" : "0x1531bd9ebfed425c01ab97871c2f5415683b614160c0de07e95ca46a3f8222e3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x1531bd9ebfed425c01ab97871c2f5415683b614160c0de07e95ca46a3f8222e3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x0a4c2fa1b508e3612c10290e2b44da1d0600ea0e820312e1115ba01752768e30",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x1531bd9ebfed425c01ab97871c2f5415683b614160c0de07e95ca46a3f8222e3",
+                    "hash" : "0x0a4c2fa1b508e3612c10290e2b44da1d0600ea0e820312e1115ba01752768e30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty.json
index 9d497701b..d1ea85e15 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty.json
@@ -2,7 +2,7 @@
     "ZeroValue_CALLCODE_ToEmpty" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODE_ToEmptyFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x1c57ca04dea8d4f09c81c54593838c45cf059d13dcfb9f9d70dca2bc1ad285e9",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x1c57ca04dea8d4f09c81c54593838c45cf059d13dcfb9f9d70dca2bc1ad285e9",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xfa0fd787f0cc5744ae24855e4b55d9c814880b4e0b319adf5bd143b769fd2759",
+                    "hash" : "0x1c57ca04dea8d4f09c81c54593838c45cf059d13dcfb9f9d70dca2bc1ad285e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x1c57ca04dea8d4f09c81c54593838c45cf059d13dcfb9f9d70dca2bc1ad285e9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xfa0fd787f0cc5744ae24855e4b55d9c814880b4e0b319adf5bd143b769fd2759",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x1c57ca04dea8d4f09c81c54593838c45cf059d13dcfb9f9d70dca2bc1ad285e9",
+                    "hash" : "0xfa0fd787f0cc5744ae24855e4b55d9c814880b4e0b319adf5bd143b769fd2759",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalance.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalance.json
index e16e71164..aec6ac011 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalance.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalance.json
@@ -2,7 +2,7 @@
     "ZeroValue_CALLCODE_ToNonZeroBalance" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalanceFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x163b02c31b242f2b5281a276f808990f7004c5b50d017838b51d26895d496742",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x163b02c31b242f2b5281a276f808990f7004c5b50d017838b51d26895d496742",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xf206b067c1e166803ecb77d2ed7cfc21ce5a38121c1e50df7123dd3df120e0a7",
+                    "hash" : "0x163b02c31b242f2b5281a276f808990f7004c5b50d017838b51d26895d496742",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x163b02c31b242f2b5281a276f808990f7004c5b50d017838b51d26895d496742",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xf206b067c1e166803ecb77d2ed7cfc21ce5a38121c1e50df7123dd3df120e0a7",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x163b02c31b242f2b5281a276f808990f7004c5b50d017838b51d26895d496742",
+                    "hash" : "0xf206b067c1e166803ecb77d2ed7cfc21ce5a38121c1e50df7123dd3df120e0a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKey.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKey.json
index 299fea851..e817abba1 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKey.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKey.json
@@ -2,7 +2,7 @@
     "ZeroValue_CALLCODE_ToOneStorageKey" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKeyFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xc06118bf09f1b8f7cff1c7640ddee0147caa17c484d6b0c1b94a96f39034b38e",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xc06118bf09f1b8f7cff1c7640ddee0147caa17c484d6b0c1b94a96f39034b38e",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x009c8b80e40f842626dcf0b4d7a05bd54a039f3e21c50a05edea2144d30169cb",
+                    "hash" : "0xc06118bf09f1b8f7cff1c7640ddee0147caa17c484d6b0c1b94a96f39034b38e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xc06118bf09f1b8f7cff1c7640ddee0147caa17c484d6b0c1b94a96f39034b38e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x009c8b80e40f842626dcf0b4d7a05bd54a039f3e21c50a05edea2144d30169cb",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xc06118bf09f1b8f7cff1c7640ddee0147caa17c484d6b0c1b94a96f39034b38e",
+                    "hash" : "0x009c8b80e40f842626dcf0b4d7a05bd54a039f3e21c50a05edea2144d30169cb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToEmpty.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToEmpty.json
index ec3295ca4..3a4aef039 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToEmpty.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToEmpty.json
@@ -2,7 +2,7 @@
     "ZeroValue_CALL_ToEmpty" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x1e91deccdb8f3af8f85ed11bc5cf3f2deea60b114a04a0bd34829e26da45eece",
+                    "hash" : "0xb808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xb808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xf6a72a25e46d8dc29d154d9beb4546d71235a5c4a088d26ef0f2b5c703dd9e57",
+                    "hash" : "0x1e91deccdb8f3af8f85ed11bc5cf3f2deea60b114a04a0bd34829e26da45eece",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xb808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xf6a72a25e46d8dc29d154d9beb4546d71235a5c4a088d26ef0f2b5c703dd9e57",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xb808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
+                    "hash" : "0xf6a72a25e46d8dc29d154d9beb4546d71235a5c4a088d26ef0f2b5c703dd9e57",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalance.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalance.json
index 204320e94..b8a22b037 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalance.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalance.json
@@ -2,7 +2,7 @@
     "ZeroValue_CALL_ToNonZeroBalance" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xffc52cb4d510f33372bc113a57c816df81c51806dd9e65cc221fca292a5ec0c2",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xffc52cb4d510f33372bc113a57c816df81c51806dd9e65cc221fca292a5ec0c2",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x65c98cc8bec8d2874e5cfbdc4d945214f7d47ab09442a3938f8270b478102182",
+                    "hash" : "0xffc52cb4d510f33372bc113a57c816df81c51806dd9e65cc221fca292a5ec0c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xffc52cb4d510f33372bc113a57c816df81c51806dd9e65cc221fca292a5ec0c2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x65c98cc8bec8d2874e5cfbdc4d945214f7d47ab09442a3938f8270b478102182",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xffc52cb4d510f33372bc113a57c816df81c51806dd9e65cc221fca292a5ec0c2",
+                    "hash" : "0x65c98cc8bec8d2874e5cfbdc4d945214f7d47ab09442a3938f8270b478102182",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKey.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKey.json
index 98b564798..0c4b70197 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKey.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKey.json
@@ -2,7 +2,7 @@
     "ZeroValue_CALL_ToOneStorageKey" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x01395d03b9f31ec90c2d7d4a100b2e947d06276261708ce7a935b6fd1307743b",
+                    "hash" : "0xb808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xb808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x71736a4f0de8af6d14f42ccca3faff1536604a48ca3e97376f9962f0344e0e85",
+                    "hash" : "0x01395d03b9f31ec90c2d7d4a100b2e947d06276261708ce7a935b6fd1307743b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xb808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x71736a4f0de8af6d14f42ccca3faff1536604a48ca3e97376f9962f0344e0e85",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xb808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
+                    "hash" : "0x71736a4f0de8af6d14f42ccca3faff1536604a48ca3e97376f9962f0344e0e85",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL.json
index 3568ee1f3..e1bcc2643 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL.json
@@ -2,7 +2,7 @@
     "ZeroValue_DELEGATECALL" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALLFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xfc6b89839d9f355e819b53cb0a689c082319d3a1209e9beb0a34ff30af987600",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xfc6b89839d9f355e819b53cb0a689c082319d3a1209e9beb0a34ff30af987600",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x5499d1bed1bcab78441cfb64cc6918016069aa1de79479a11113e98d9cde7fa9",
+                    "hash" : "0xfc6b89839d9f355e819b53cb0a689c082319d3a1209e9beb0a34ff30af987600",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x521bc80cdaf4081a8429a79e37d0bc6528f0fac7c0ac195da4a1dbd41cd1abb8",
+                    "hash" : "0xfc6b89839d9f355e819b53cb0a689c082319d3a1209e9beb0a34ff30af987600",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xfc6b89839d9f355e819b53cb0a689c082319d3a1209e9beb0a34ff30af987600",
+                    "hash" : "0x5499d1bed1bcab78441cfb64cc6918016069aa1de79479a11113e98d9cde7fa9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x521bc80cdaf4081a8429a79e37d0bc6528f0fac7c0ac195da4a1dbd41cd1abb8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmpty.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmpty.json
index b1ffb93b4..6a22ec3f6 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmpty.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmpty.json
@@ -2,7 +2,7 @@
     "ZeroValue_DELEGATECALL_ToEmpty" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmptyFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x2679e492e89edbb16b20be31663b8d783e92a85db08be2e2fcddfe0beb6ba088",
+                    "hash" : "0x55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xdd53adf5f25628ca817be7df8e5a57b5446689ed145a4ac46abf3a45013fe2af",
+                    "hash" : "0x55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916",
+                    "hash" : "0x2679e492e89edbb16b20be31663b8d783e92a85db08be2e2fcddfe0beb6ba088",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xdd53adf5f25628ca817be7df8e5a57b5446689ed145a4ac46abf3a45013fe2af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalance.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalance.json
index beae4d67d..acd462ad7 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalance.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalance.json
@@ -2,7 +2,7 @@
     "ZeroValue_DELEGATECALL_ToNonZeroBalance" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalanceFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x490c7a4c7f7de525caa617975740e598c8b5d67fdf0b1299a85cbabd29b42d0a",
+                    "hash" : "0xa0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xf5814da69510fc59eb19ff9a78e870ed05d7e529ac9ccbe17a7a46db4e4369a0",
+                    "hash" : "0xa0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xa0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3",
+                    "hash" : "0x490c7a4c7f7de525caa617975740e598c8b5d67fdf0b1299a85cbabd29b42d0a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xf5814da69510fc59eb19ff9a78e870ed05d7e529ac9ccbe17a7a46db4e4369a0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKey.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKey.json
index 80bec6587..7ccc5a6ca 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKey.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKey.json
@@ -2,7 +2,7 @@
     "ZeroValue_DELEGATECALL_ToOneStorageKey" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKeyFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xf17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xb910ee1c13f68cb2c31ebf954a3682dacc4b2bc55eb576f6c42f44d9853d7e80",
+                    "hash" : "0xf17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x6baf84679c6338c00371b0e3246c4feaf08e07db41e1e0d191069ae5611645e5",
+                    "hash" : "0xf17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xf17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2",
+                    "hash" : "0xb910ee1c13f68cb2c31ebf954a3682dacc4b2bc55eb576f6c42f44d9853d7e80",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x6baf84679c6338c00371b0e3246c4feaf08e07db41e1e0d191069ae5611645e5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE.json
index efa4c9ae8..b260705c0 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE.json
@@ -2,7 +2,7 @@
     "ZeroValue_SUICIDE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDEFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x38f336065869eadc6334a266aa91a7a00f90e339c44cdd6c1f91b1a1eefb39e3",
+                    "hash" : "0x19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x538fd2955fc945ed3aee393e714e9e9e7bb829abc6faa1ba1faff59e2692d2f3",
+                    "hash" : "0x38f336065869eadc6334a266aa91a7a00f90e339c44cdd6c1f91b1a1eefb39e3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x538fd2955fc945ed3aee393e714e9e9e7bb829abc6faa1ba1faff59e2692d2f3",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
+                    "hash" : "0x538fd2955fc945ed3aee393e714e9e9e7bb829abc6faa1ba1faff59e2692d2f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty.json
index 3626046ce..31bb784dc 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty.json
@@ -2,7 +2,7 @@
     "ZeroValue_SUICIDE_ToEmpty" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToEmptyFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xaebf7d55408775cbde696a6532f08e2563f6c92e233df623981a9633a8dfd44a",
+                    "hash" : "0x19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x538fd2955fc945ed3aee393e714e9e9e7bb829abc6faa1ba1faff59e2692d2f3",
+                    "hash" : "0xaebf7d55408775cbde696a6532f08e2563f6c92e233df623981a9633a8dfd44a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x538fd2955fc945ed3aee393e714e9e9e7bb829abc6faa1ba1faff59e2692d2f3",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
+                    "hash" : "0x538fd2955fc945ed3aee393e714e9e9e7bb829abc6faa1ba1faff59e2692d2f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalance.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalance.json
index a01bafe60..edb22e927 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalance.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalance.json
@@ -2,7 +2,7 @@
     "ZeroValue_SUICIDE_ToNonZeroBalance" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa244bf2d8d80e6f9ae1907c208d9b0fa44ff56e067b68390aa23e2cf9fb41b92",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa244bf2d8d80e6f9ae1907c208d9b0fa44ff56e067b68390aa23e2cf9fb41b92",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x36edb47a1f2f613fe89c9b8f565b07f95d808bcaf466512c5aa796cc9e195166",
+                    "hash" : "0xa244bf2d8d80e6f9ae1907c208d9b0fa44ff56e067b68390aa23e2cf9fb41b92",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xa244bf2d8d80e6f9ae1907c208d9b0fa44ff56e067b68390aa23e2cf9fb41b92",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x36edb47a1f2f613fe89c9b8f565b07f95d808bcaf466512c5aa796cc9e195166",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xa244bf2d8d80e6f9ae1907c208d9b0fa44ff56e067b68390aa23e2cf9fb41b92",
+                    "hash" : "0x36edb47a1f2f613fe89c9b8f565b07f95d808bcaf466512c5aa796cc9e195166",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKey.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKey.json
index a4ec1ff7f..b7f2a6fc6 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKey.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKey.json
@@ -2,7 +2,7 @@
     "ZeroValue_SUICIDE_ToOneStorageKey" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKeyFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x78353ce80f19042d29504768c99fd8698ed4c336428c38589611245af4858cef",
+                    "hash" : "0x19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x7b1fa134637ab17a607e811c226549ee1d5d95f4a29cd09828821dd009c895ca",
+                    "hash" : "0x78353ce80f19042d29504768c99fd8698ed4c336428c38589611245af4858cef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x7b1fa134637ab17a607e811c226549ee1d5d95f4a29cd09828821dd009c895ca",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
+                    "hash" : "0x7b1fa134637ab17a607e811c226549ee1d5d95f4a29cd09828821dd009c895ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL.json
index fda8b36ce..333c52078 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL.json
@@ -2,7 +2,7 @@
     "ZeroValue_TransactionCALL" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
+                    "hash" : "0xf886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xf886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xf886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
+                    "hash" : "0x0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmpty.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmpty.json
index ea4348f52..cd1d783d1 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmpty.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmpty.json
@@ -2,7 +2,7 @@
     "ZeroValue_TransactionCALL_ToEmpty" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmptyFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
+                    "hash" : "0xf886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xf886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xf886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
+                    "hash" : "0x0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalance.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalance.json
index 2fc945c55..71d3be819 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalance.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalance.json
@@ -2,7 +2,7 @@
     "ZeroValue_TransactionCALL_ToNonZeroBalance" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalanceFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x1ce545b3c5dab0c09d9c0ccda36f0216b629631696c3ae27565311ab587d0189",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x1ce545b3c5dab0c09d9c0ccda36f0216b629631696c3ae27565311ab587d0189",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x1ce545b3c5dab0c09d9c0ccda36f0216b629631696c3ae27565311ab587d0189",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x1ce545b3c5dab0c09d9c0ccda36f0216b629631696c3ae27565311ab587d0189",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x1ce545b3c5dab0c09d9c0ccda36f0216b629631696c3ae27565311ab587d0189",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x1ce545b3c5dab0c09d9c0ccda36f0216b629631696c3ae27565311ab587d0189",
                     "indexes" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKey.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKey.json
index 4f3289c74..99992aaa4 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKey.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKey.json
@@ -2,7 +2,7 @@
     "ZeroValue_TransactionCALL_ToOneStorageKey" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x9b25ff6ca484aa1f69fcf6b6b5683c856b6f79c34b8d807abdd0a5c37546cef8",
+                    "hash" : "0xf886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x9b25ff6ca484aa1f69fcf6b6b5683c856b6f79c34b8d807abdd0a5c37546cef8",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xf886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x9b25ff6ca484aa1f69fcf6b6b5683c856b6f79c34b8d807abdd0a5c37546cef8",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xf886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
+                    "hash" : "0x9b25ff6ca484aa1f69fcf6b6b5683c856b6f79c34b8d807abdd0a5c37546cef8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData.json
index b3947d757..45f5b3827 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData.json
@@ -2,7 +2,7 @@
     "ZeroValue_TransactionCALLwithData" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithDataFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
+                    "hash" : "0xa0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xa0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xa0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
+                    "hash" : "0x474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmpty.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmpty.json
index 484bac609..ab436f8f1 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmpty.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmpty.json
@@ -2,7 +2,7 @@
     "ZeroValue_TransactionCALLwithData_ToEmpty" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmptyFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
+                    "hash" : "0xa0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xa0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xa0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
+                    "hash" : "0x474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalance.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalance.json
index 5a60b9b6a..060d88028 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalance.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalance.json
@@ -2,7 +2,7 @@
     "ZeroValue_TransactionCALLwithData_ToNonZeroBalance" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalanceFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x9ce14b8df47f36966f2e8b15dbc18ef5fa597699e61998c19f9ecd994bc7faae",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x9ce14b8df47f36966f2e8b15dbc18ef5fa597699e61998c19f9ecd994bc7faae",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x9ce14b8df47f36966f2e8b15dbc18ef5fa597699e61998c19f9ecd994bc7faae",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x9ce14b8df47f36966f2e8b15dbc18ef5fa597699e61998c19f9ecd994bc7faae",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x9ce14b8df47f36966f2e8b15dbc18ef5fa597699e61998c19f9ecd994bc7faae",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x9ce14b8df47f36966f2e8b15dbc18ef5fa597699e61998c19f9ecd994bc7faae",
                     "indexes" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKey.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKey.json
index 8b9d97462..7fb5b9952 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKey.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKey.json
@@ -2,7 +2,7 @@
     "ZeroValue_TransactionCALLwithData_ToOneStorageKey" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKeyFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xfc10de5a9dc6f7e9d4429d443414be28fa0e935088d22c494cde43c7efe21178",
+                    "hash" : "0xa0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xfc10de5a9dc6f7e9d4429d443414be28fa0e935088d22c494cde43c7efe21178",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xa0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xfc10de5a9dc6f7e9d4429d443414be28fa0e935088d22c494cde43c7efe21178",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xa0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
+                    "hash" : "0xfc10de5a9dc6f7e9d4429d443414be28fa0e935088d22c494cde43c7efe21178",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,