split metropolis

58 files changed, 1214 insertions, 518 deletions

diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001.json
index 67aea4bd4..ff5f5b502 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x76b5f8584be3e265db1cb00ec75e9222d08221b9df73138094c698fa2ecf6807",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x76b5f8584be3e265db1cb00ec75e9222d08221b9df73138094c698fa2ecf6807",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x4b4dd8277a751c3b68f63e63e99aedcac6e14ed41912e6ded7fe18226b0d1cea",
+                    "hash" : "0x76b5f8584be3e265db1cb00ec75e9222d08221b9df73138094c698fa2ecf6807",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xc3a1d582d201a1e0bec05b10a62eed64cabe23531ac87e33c8a2ac563910104e",
+                    "hash" : "0x76b5f8584be3e265db1cb00ec75e9222d08221b9df73138094c698fa2ecf6807",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x76b5f8584be3e265db1cb00ec75e9222d08221b9df73138094c698fa2ecf6807",
+                    "hash" : "0x4b4dd8277a751c3b68f63e63e99aedcac6e14ed41912e6ded7fe18226b0d1cea",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xc3a1d582d201a1e0bec05b10a62eed64cabe23531ac87e33c8a2ac563910104e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGE.json
index f99aeae77..502d54a46 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x27fd103b518e62155f72dc94bc3fd4a5828f3b0e50e8214d565da908bc6d6eae",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x27fd103b518e62155f72dc94bc3fd4a5828f3b0e50e8214d565da908bc6d6eae",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x8bfd99232c43915d3204298146dee2dab5be51559b9e2464ecc9b018c91cd998",
+                    "hash" : "0x27fd103b518e62155f72dc94bc3fd4a5828f3b0e50e8214d565da908bc6d6eae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xe2999ab775829c7a7f1e781bdc6f396daeb7b809b4bebd3471b251d136a4e83e",
+                    "hash" : "0x27fd103b518e62155f72dc94bc3fd4a5828f3b0e50e8214d565da908bc6d6eae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x27fd103b518e62155f72dc94bc3fd4a5828f3b0e50e8214d565da908bc6d6eae",
+                    "hash" : "0x8bfd99232c43915d3204298146dee2dab5be51559b9e2464ecc9b018c91cd998",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xe2999ab775829c7a7f1e781bdc6f396daeb7b809b4bebd3471b251d136a4e83e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfter.json
index c2e7733e5..28184cb42 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfterFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x59f3975264b93f4097b183f9ed5dfda26667e2feb0ef6c0938dd9f49e97fdbdc",
+                    "hash" : "0xa17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xef211f7b041d3ef77a8575136a6364fd7ec5975ec2fedac3668d61ed1d9ff93e",
+                    "hash" : "0xa17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xa17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
+                    "hash" : "0x59f3975264b93f4097b183f9ed5dfda26667e2feb0ef6c0938dd9f49e97fdbdc",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xef211f7b041d3ef77a8575136a6364fd7ec5975ec2fedac3668d61ed1d9ff93e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBefore.json
index 4adba2d3d..c6e25845e 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBeforeFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xfa8ea8b5f31fcbe1671779794d1a8f40ac5e17c80bd2fc238a0aebd64a08459e",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xfa8ea8b5f31fcbe1671779794d1a8f40ac5e17c80bd2fc238a0aebd64a08459e",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x89756fb72b4debba20c92e7af6fd5d37923614fdc071135f7f4f493c927e298a",
+                    "hash" : "0xfa8ea8b5f31fcbe1671779794d1a8f40ac5e17c80bd2fc238a0aebd64a08459e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xfa8ea8b5f31fcbe1671779794d1a8f40ac5e17c80bd2fc238a0aebd64a08459e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x89756fb72b4debba20c92e7af6fd5d37923614fdc071135f7f4f493c927e298a",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xfa8ea8b5f31fcbe1671779794d1a8f40ac5e17c80bd2fc238a0aebd64a08459e",
+                    "hash" : "0x89756fb72b4debba20c92e7af6fd5d37923614fdc071135f7f4f493c927e298a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEnd.json
index 80382f772..82adac3ac 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xd0b64ffa7b6b20189b5b8ddfcac6f7751e2db9e5a6319289e8393360b399ef3a",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xd0b64ffa7b6b20189b5b8ddfcac6f7751e2db9e5a6319289e8393360b399ef3a",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x0c880ada7adb2626c08ab5449f60489e1ed272c19de0d44092962f366644995f",
+                    "hash" : "0xd0b64ffa7b6b20189b5b8ddfcac6f7751e2db9e5a6319289e8393360b399ef3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x518b1641c608b5dc5be73761b5d874d44bbfe4c94feeb583712412d671f723ca",
+                    "hash" : "0xd0b64ffa7b6b20189b5b8ddfcac6f7751e2db9e5a6319289e8393360b399ef3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xd0b64ffa7b6b20189b5b8ddfcac6f7751e2db9e5a6319289e8393360b399ef3a",
+                    "hash" : "0x0c880ada7adb2626c08ab5449f60489e1ed272c19de0d44092962f366644995f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x518b1641c608b5dc5be73761b5d874d44bbfe4c94feeb583712412d671f723ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle.json
index d5395326f..ed5a5d591 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVE.json
index 33cf21e07..e99fa9c01 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x00aefdf2557f665cdb2328e30a9e703985b5c427ad9a24e111b9bd36b8c73571",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x00aefdf2557f665cdb2328e30a9e703985b5c427ad9a24e111b9bd36b8c73571",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x57f5cb02223fc5088ccf1424e7f6580dbf33736871eb6e21dbe935a25cb8fcce",
+                    "hash" : "0x00aefdf2557f665cdb2328e30a9e703985b5c427ad9a24e111b9bd36b8c73571",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x4147efecb96df3d57d5ca561c9c2d56d454908d62cdfcce7eaeecc06f674a15c",
+                    "hash" : "0x00aefdf2557f665cdb2328e30a9e703985b5c427ad9a24e111b9bd36b8c73571",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x00aefdf2557f665cdb2328e30a9e703985b5c427ad9a24e111b9bd36b8c73571",
+                    "hash" : "0x57f5cb02223fc5088ccf1424e7f6580dbf33736871eb6e21dbe935a25cb8fcce",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x4147efecb96df3d57d5ca561c9c2d56d454908d62cdfcce7eaeecc06f674a15c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01.json
index 621a37146..f08153bb1 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcode_01Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x2565cba5a627c072ece8ca1b220e2881bf20c4b8ee5197e71cc8f2143cca2ad8",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x2565cba5a627c072ece8ca1b220e2881bf20c4b8ee5197e71cc8f2143cca2ad8",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x9969d29090f0acdfc1d3d449fa4f0137fdfed134326a87a18c8a5c7f9e51db6e",
+                    "hash" : "0x2565cba5a627c072ece8ca1b220e2881bf20c4b8ee5197e71cc8f2143cca2ad8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xbf3420a5296914baaea4264444382a16cefed59df3ea7a4e578fe145165c8462",
+                    "hash" : "0x2565cba5a627c072ece8ca1b220e2881bf20c4b8ee5197e71cc8f2143cca2ad8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x2565cba5a627c072ece8ca1b220e2881bf20c4b8ee5197e71cc8f2143cca2ad8",
+                    "hash" : "0x9969d29090f0acdfc1d3d449fa4f0137fdfed134326a87a18c8a5c7f9e51db6e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xbf3420a5296914baaea4264444382a16cefed59df3ea7a4e578fe145165c8462",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGE.json
index 9ecaae649..cf13ea413 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xcba87c3ca6dea43accecde7d7bb6869168172533bb2cdcf6675d898d7d20bd19",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xcba87c3ca6dea43accecde7d7bb6869168172533bb2cdcf6675d898d7d20bd19",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xd6e92f864b605abedc77221dba97086bae3856df17aa9ebc605a4ea47e1ccbad",
+                    "hash" : "0xcba87c3ca6dea43accecde7d7bb6869168172533bb2cdcf6675d898d7d20bd19",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x1488e41eb05d14faacd98ac3721273e5204dfe898b810c67bc0a95ef957bf19c",
+                    "hash" : "0xcba87c3ca6dea43accecde7d7bb6869168172533bb2cdcf6675d898d7d20bd19",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xcba87c3ca6dea43accecde7d7bb6869168172533bb2cdcf6675d898d7d20bd19",
+                    "hash" : "0xd6e92f864b605abedc77221dba97086bae3856df17aa9ebc605a4ea47e1ccbad",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x1488e41eb05d14faacd98ac3721273e5204dfe898b810c67bc0a95ef957bf19c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEnd.json
index dfd4e34e0..5933de154 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x6cdabb1d1e4e89cc6c0a89463dabb952b94a2384c251bb1e3cd14766a39af351",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x6cdabb1d1e4e89cc6c0a89463dabb952b94a2384c251bb1e3cd14766a39af351",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x9ef2bba4092f8640ce36e2a2a7255edcd055bd777d40b8112efba66fdfb85b7e",
+                    "hash" : "0x6cdabb1d1e4e89cc6c0a89463dabb952b94a2384c251bb1e3cd14766a39af351",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x0cf1cd9a7849fc8458041e8a5b61de5a0f216cb46d7ddd81150adf71cc020b17",
+                    "hash" : "0x6cdabb1d1e4e89cc6c0a89463dabb952b94a2384c251bb1e3cd14766a39af351",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x6cdabb1d1e4e89cc6c0a89463dabb952b94a2384c251bb1e3cd14766a39af351",
+                    "hash" : "0x9ef2bba4092f8640ce36e2a2a7255edcd055bd777d40b8112efba66fdfb85b7e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x0cf1cd9a7849fc8458041e8a5b61de5a0f216cb46d7ddd81150adf71cc020b17",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010.json
index ef769f502..0beb3e4b6 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa0f23a81222fb5355119b536185264b63eec497f08529bffafaa233ed0a4788b",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa0f23a81222fb5355119b536185264b63eec497f08529bffafaa233ed0a4788b",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xc734fb74138bf68c4ba9168cfeb17463b0edd6bbcdd10279e910280127628249",
+                    "hash" : "0xa0f23a81222fb5355119b536185264b63eec497f08529bffafaa233ed0a4788b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x7ea720933b432c49edbd0fc898ad77183180145720148227884ecebc0bb1dc7b",
+                    "hash" : "0xa0f23a81222fb5355119b536185264b63eec497f08529bffafaa233ed0a4788b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xa0f23a81222fb5355119b536185264b63eec497f08529bffafaa233ed0a4788b",
+                    "hash" : "0xc734fb74138bf68c4ba9168cfeb17463b0edd6bbcdd10279e910280127628249",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x7ea720933b432c49edbd0fc898ad77183180145720148227884ecebc0bb1dc7b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGE.json
index 00444db7f..8ad0180e9 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xdf6cbac7fc17feddb3bf7f923d12b5ce81e25ab70dcac2f31c4038cd16fd4c71",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xdf6cbac7fc17feddb3bf7f923d12b5ce81e25ab70dcac2f31c4038cd16fd4c71",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x1ef2aeaaf97a680b1facf49a4eeb975af2f064af0cfc0247456a9fa728299599",
+                    "hash" : "0xdf6cbac7fc17feddb3bf7f923d12b5ce81e25ab70dcac2f31c4038cd16fd4c71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xf764a37a456d088da38d0cb216679fd7d98e25ef701d7b43045450017d343dcf",
+                    "hash" : "0xdf6cbac7fc17feddb3bf7f923d12b5ce81e25ab70dcac2f31c4038cd16fd4c71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xdf6cbac7fc17feddb3bf7f923d12b5ce81e25ab70dcac2f31c4038cd16fd4c71",
+                    "hash" : "0x1ef2aeaaf97a680b1facf49a4eeb975af2f064af0cfc0247456a9fa728299599",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xf764a37a456d088da38d0cb216679fd7d98e25ef701d7b43045450017d343dcf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfter.json
index 62ab0017e..d1efb458c 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfterFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xde101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xde101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xdd76ee8ba39a7071c313c6482b98e2db641023bf18a796e77cf2eb4758a18549",
+                    "hash" : "0xde101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xde101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xdd76ee8ba39a7071c313c6482b98e2db641023bf18a796e77cf2eb4758a18549",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xde101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
+                    "hash" : "0xdd76ee8ba39a7071c313c6482b98e2db641023bf18a796e77cf2eb4758a18549",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBefore.json
index f02d2da1d..84def5070 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBeforeFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x1e925d4e5f55bb8978bb79f00fe154b6783cbe3f7c86ce73a81b3ddc6632e2bd",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x1e925d4e5f55bb8978bb79f00fe154b6783cbe3f7c86ce73a81b3ddc6632e2bd",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x3f9173190b1d98b598134751fcbd26bf8bc1a1c84adb5a52367fe481604f709a",
+                    "hash" : "0x1e925d4e5f55bb8978bb79f00fe154b6783cbe3f7c86ce73a81b3ddc6632e2bd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x21ffc10aa60a9578527ffd543d69ebacb5cff9f39cdbe70a1c89b8ce14b45f5a",
+                    "hash" : "0x1e925d4e5f55bb8978bb79f00fe154b6783cbe3f7c86ce73a81b3ddc6632e2bd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x1e925d4e5f55bb8978bb79f00fe154b6783cbe3f7c86ce73a81b3ddc6632e2bd",
+                    "hash" : "0x3f9173190b1d98b598134751fcbd26bf8bc1a1c84adb5a52367fe481604f709a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x21ffc10aa60a9578527ffd543d69ebacb5cff9f39cdbe70a1c89b8ce14b45f5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEnd.json
index 91b80f48c..9d0961cbd 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x14f76494a1acee67b8abc22aafd236664aa063bc57fcdc806369965bd9d636ab",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x14f76494a1acee67b8abc22aafd236664aa063bc57fcdc806369965bd9d636ab",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x53d9ec0ba038f05b87797047791541f6b68d6902dd84e917a9cc1358190873e1",
+                    "hash" : "0x14f76494a1acee67b8abc22aafd236664aa063bc57fcdc806369965bd9d636ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xca62c6b192b47460c49bcc57dd6a0f6b7d853e0943a322d21aac4031061b241e",
+                    "hash" : "0x14f76494a1acee67b8abc22aafd236664aa063bc57fcdc806369965bd9d636ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x14f76494a1acee67b8abc22aafd236664aa063bc57fcdc806369965bd9d636ab",
+                    "hash" : "0x53d9ec0ba038f05b87797047791541f6b68d6902dd84e917a9cc1358190873e1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xca62c6b192b47460c49bcc57dd6a0f6b7d853e0943a322d21aac4031061b241e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddle.json
index ef59b61cc..94a6444d0 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddleFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x0790915f009aad54c0077bb9142d9d262b9ae250515a4b382218b6aea2b14c18",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x0790915f009aad54c0077bb9142d9d262b9ae250515a4b382218b6aea2b14c18",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x6d21e47580c9b8a9622c64cf98eff46fb9dfa0a5228ae511acb6c0a5caacd2b8",
+                    "hash" : "0x0790915f009aad54c0077bb9142d9d262b9ae250515a4b382218b6aea2b14c18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x6b0e71c38986244674302f43b4e100b7b48c1e0fbf4da59aad11f4fe871295b1",
+                    "hash" : "0x0790915f009aad54c0077bb9142d9d262b9ae250515a4b382218b6aea2b14c18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x0790915f009aad54c0077bb9142d9d262b9ae250515a4b382218b6aea2b14c18",
+                    "hash" : "0x6d21e47580c9b8a9622c64cf98eff46fb9dfa0a5228ae511acb6c0a5caacd2b8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x6b0e71c38986244674302f43b4e100b7b48c1e0fbf4da59aad11f4fe871295b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVE.json
index a752bc6d9..8063d9831 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x9a91ed9259c40134fc63ee43e31838c34c278097e0444d41205c7b2e1d6dee61",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x9a91ed9259c40134fc63ee43e31838c34c278097e0444d41205c7b2e1d6dee61",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xfce8a4c134d08c91c07360181a10147fae16719e4601b046fd42f08af898e2bf",
+                    "hash" : "0x9a91ed9259c40134fc63ee43e31838c34c278097e0444d41205c7b2e1d6dee61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xee3561b235b4068db77139423e4c0924089edef1c0d6a2fee982ab56be33d0a5",
+                    "hash" : "0x9a91ed9259c40134fc63ee43e31838c34c278097e0444d41205c7b2e1d6dee61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x9a91ed9259c40134fc63ee43e31838c34c278097e0444d41205c7b2e1d6dee61",
+                    "hash" : "0xfce8a4c134d08c91c07360181a10147fae16719e4601b046fd42f08af898e2bf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xee3561b235b4068db77139423e4c0924089edef1c0d6a2fee982ab56be33d0a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011.json
index de49eec07..d2503ab4a 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa76cb747cf1f203265688de53807caeba3a997ddbef949753236eb7b8d9af62d",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa76cb747cf1f203265688de53807caeba3a997ddbef949753236eb7b8d9af62d",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xf7761ec943b56776102dc01050059bfca1c3b842d68e09f484a0e98d45a28033",
+                    "hash" : "0xa76cb747cf1f203265688de53807caeba3a997ddbef949753236eb7b8d9af62d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xed05a91aa638e472c45034ad455b0bd7279c2316e7bd69bf1fbc5f311dc6c785",
+                    "hash" : "0xa76cb747cf1f203265688de53807caeba3a997ddbef949753236eb7b8d9af62d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xa76cb747cf1f203265688de53807caeba3a997ddbef949753236eb7b8d9af62d",
+                    "hash" : "0xf7761ec943b56776102dc01050059bfca1c3b842d68e09f484a0e98d45a28033",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xed05a91aa638e472c45034ad455b0bd7279c2316e7bd69bf1fbc5f311dc6c785",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGE.json
index 6df81d15a..6b8e66731 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x22145358b2fc36dd15d6e6ec01f466be5b153616d93a8fa37262d0e5bd32ce71",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x22145358b2fc36dd15d6e6ec01f466be5b153616d93a8fa37262d0e5bd32ce71",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x19234d55fac3e6bf9b077f71f9da732f807b689401bbbc96f705ade59d84db12",
+                    "hash" : "0x22145358b2fc36dd15d6e6ec01f466be5b153616d93a8fa37262d0e5bd32ce71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x5ca0140fdbcc77fd2d4e5cb5094d9d7857245569ef7d3caaae6537a7ca4d2c69",
+                    "hash" : "0x22145358b2fc36dd15d6e6ec01f466be5b153616d93a8fa37262d0e5bd32ce71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x22145358b2fc36dd15d6e6ec01f466be5b153616d93a8fa37262d0e5bd32ce71",
+                    "hash" : "0x19234d55fac3e6bf9b077f71f9da732f807b689401bbbc96f705ade59d84db12",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x5ca0140fdbcc77fd2d4e5cb5094d9d7857245569ef7d3caaae6537a7ca4d2c69",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfter.json
index af28a459d..6479e77de 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfterFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x2026f1fd527a64566ff84ec9ec0a5b0fe32e86a96055762ad278bcc761d7dc0f",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x2026f1fd527a64566ff84ec9ec0a5b0fe32e86a96055762ad278bcc761d7dc0f",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xe42eebbc9e79bdfd97d94f2c4d03b9cad5bb7f41ea1a0a2e109ecc4fff9e5787",
+                    "hash" : "0x2026f1fd527a64566ff84ec9ec0a5b0fe32e86a96055762ad278bcc761d7dc0f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x2026f1fd527a64566ff84ec9ec0a5b0fe32e86a96055762ad278bcc761d7dc0f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xe42eebbc9e79bdfd97d94f2c4d03b9cad5bb7f41ea1a0a2e109ecc4fff9e5787",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x2026f1fd527a64566ff84ec9ec0a5b0fe32e86a96055762ad278bcc761d7dc0f",
+                    "hash" : "0xe42eebbc9e79bdfd97d94f2c4d03b9cad5bb7f41ea1a0a2e109ecc4fff9e5787",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBefore.json
index ff6798acf..f69e9a057 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBeforeFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xf2a3d3622932fbceeba665a47e9bfdbd5610bcde67cb98acb802a283ca706fa2",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf2a3d3622932fbceeba665a47e9bfdbd5610bcde67cb98acb802a283ca706fa2",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x56b30b7c2c95a4affe227d945def7919d5f05556848701eaf3ec095c413ae54a",
+                    "hash" : "0xf2a3d3622932fbceeba665a47e9bfdbd5610bcde67cb98acb802a283ca706fa2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xc616036740ee42d9795fec7bf0180491d355ff07f1b5205a99bdb5a41cdf3f15",
+                    "hash" : "0xf2a3d3622932fbceeba665a47e9bfdbd5610bcde67cb98acb802a283ca706fa2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xf2a3d3622932fbceeba665a47e9bfdbd5610bcde67cb98acb802a283ca706fa2",
+                    "hash" : "0x56b30b7c2c95a4affe227d945def7919d5f05556848701eaf3ec095c413ae54a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xc616036740ee42d9795fec7bf0180491d355ff07f1b5205a99bdb5a41cdf3f15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEnd.json
index 69a6d97d1..f42a1fe66 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x5e789dd56f8f1de89beb0a5fb4e05f89698202dca811b25a8aa149165713699a",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x5e789dd56f8f1de89beb0a5fb4e05f89698202dca811b25a8aa149165713699a",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x0a836282c514c3f376236b757ba9929da905ea0cfca9a61d1419dc96f726da65",
+                    "hash" : "0x5e789dd56f8f1de89beb0a5fb4e05f89698202dca811b25a8aa149165713699a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x25e77c53b764f5230036afaecf946cc5311e5244467f3bff2e6a42f479dd793e",
+                    "hash" : "0x5e789dd56f8f1de89beb0a5fb4e05f89698202dca811b25a8aa149165713699a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x5e789dd56f8f1de89beb0a5fb4e05f89698202dca811b25a8aa149165713699a",
+                    "hash" : "0x0a836282c514c3f376236b757ba9929da905ea0cfca9a61d1419dc96f726da65",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x25e77c53b764f5230036afaecf946cc5311e5244467f3bff2e6a42f479dd793e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddle.json
index bcaf76add..78033d2a5 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x0790915f009aad54c0077bb9142d9d262b9ae250515a4b382218b6aea2b14c18",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x0790915f009aad54c0077bb9142d9d262b9ae250515a4b382218b6aea2b14c18",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x6d21e47580c9b8a9622c64cf98eff46fb9dfa0a5228ae511acb6c0a5caacd2b8",
+                    "hash" : "0x0790915f009aad54c0077bb9142d9d262b9ae250515a4b382218b6aea2b14c18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x6b0e71c38986244674302f43b4e100b7b48c1e0fbf4da59aad11f4fe871295b1",
+                    "hash" : "0x0790915f009aad54c0077bb9142d9d262b9ae250515a4b382218b6aea2b14c18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x0790915f009aad54c0077bb9142d9d262b9ae250515a4b382218b6aea2b14c18",
+                    "hash" : "0x6d21e47580c9b8a9622c64cf98eff46fb9dfa0a5228ae511acb6c0a5caacd2b8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x6b0e71c38986244674302f43b4e100b7b48c1e0fbf4da59aad11f4fe871295b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVE.json
index 09d41dfc3..8f9c37e48 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x0c68792192282aedd7ce980b75830b9582f44bc9b9ae24be9680320b70ad0f17",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x0c68792192282aedd7ce980b75830b9582f44bc9b9ae24be9680320b70ad0f17",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xdfa4e08d9a120b6dcb2a14844ca8d00a154a9e588603e783b553fa3df063ddf7",
+                    "hash" : "0x0c68792192282aedd7ce980b75830b9582f44bc9b9ae24be9680320b70ad0f17",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xf1918b697d3297f9bd7be6eaacae14630b9b1bf8a478e716dca790c54fc12355",
+                    "hash" : "0x0c68792192282aedd7ce980b75830b9582f44bc9b9ae24be9680320b70ad0f17",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x0c68792192282aedd7ce980b75830b9582f44bc9b9ae24be9680320b70ad0f17",
+                    "hash" : "0xdfa4e08d9a120b6dcb2a14844ca8d00a154a9e588603e783b553fa3df063ddf7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xf1918b697d3297f9bd7be6eaacae14630b9b1bf8a478e716dca790c54fc12355",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10.json
index 847c4c03e..f07598393 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecall_10Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x0ff88770616fd51250d60cd6163dd123e42f58685a20fccca6b874f8d807e64c",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x0ff88770616fd51250d60cd6163dd123e42f58685a20fccca6b874f8d807e64c",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xb10034a1bbbfe4d21459c00db5fe2ded004f038b3557262885a31ccc2bf03147",
+                    "hash" : "0x0ff88770616fd51250d60cd6163dd123e42f58685a20fccca6b874f8d807e64c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x14201ae7e42e0800fda4e5c8299db59f28b853db1a97a14e9bbd55e7a384164c",
+                    "hash" : "0x0ff88770616fd51250d60cd6163dd123e42f58685a20fccca6b874f8d807e64c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x0ff88770616fd51250d60cd6163dd123e42f58685a20fccca6b874f8d807e64c",
+                    "hash" : "0xb10034a1bbbfe4d21459c00db5fe2ded004f038b3557262885a31ccc2bf03147",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x14201ae7e42e0800fda4e5c8299db59f28b853db1a97a14e9bbd55e7a384164c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGE.json
index 89335c490..135e269ab 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x02c20b6694a45cddffc38dbbffb40819e3b3904784ed15acc5f7ce88582cc64e",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x02c20b6694a45cddffc38dbbffb40819e3b3904784ed15acc5f7ce88582cc64e",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x8b06f4df4a83ee0b53f9c9a301bda642cb2116c60c170e88d1010627f97f5757",
+                    "hash" : "0x02c20b6694a45cddffc38dbbffb40819e3b3904784ed15acc5f7ce88582cc64e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xe0609054e39ad070b2bbc6a650716b386d29944e883e30836b8a6f159f9cae2c",
+                    "hash" : "0x02c20b6694a45cddffc38dbbffb40819e3b3904784ed15acc5f7ce88582cc64e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x02c20b6694a45cddffc38dbbffb40819e3b3904784ed15acc5f7ce88582cc64e",
+                    "hash" : "0x8b06f4df4a83ee0b53f9c9a301bda642cb2116c60c170e88d1010627f97f5757",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xe0609054e39ad070b2bbc6a650716b386d29944e883e30836b8a6f159f9cae2c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEnd.json
index de825a24c..8e694d671 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xae008399897a350a11206d6a3942bf642a274150a334c3769341974bd3867745",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xae008399897a350a11206d6a3942bf642a274150a334c3769341974bd3867745",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x4ba1494e431b8bb9c88a83b4812c409a2c7b6a1e9816212d93ec1d1eb9efda43",
+                    "hash" : "0xae008399897a350a11206d6a3942bf642a274150a334c3769341974bd3867745",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x8bed167b8eb08a83ca46c378c06f909749a11e9b073f4f82fe04fb3e27279dc8",
+                    "hash" : "0xae008399897a350a11206d6a3942bf642a274150a334c3769341974bd3867745",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xae008399897a350a11206d6a3942bf642a274150a334c3769341974bd3867745",
+                    "hash" : "0x4ba1494e431b8bb9c88a83b4812c409a2c7b6a1e9816212d93ec1d1eb9efda43",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x8bed167b8eb08a83ca46c378c06f909749a11e9b073f4f82fe04fb3e27279dc8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100.json
index caaad5ecd..d80e1256f 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xc7cf67a17215ed6eac0f53120c0afbd264489e23fe456fa88fd794e3dd620fbb",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xc7cf67a17215ed6eac0f53120c0afbd264489e23fe456fa88fd794e3dd620fbb",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xd40df4466e98a878d279fee738896a4f8cffc30ff08e661ef60d0a0c31106c72",
+                    "hash" : "0xc7cf67a17215ed6eac0f53120c0afbd264489e23fe456fa88fd794e3dd620fbb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x55633632d687fcd5ab41330fa9d08a7166cd48b0b30fdc3bf8893ccb88a2f74c",
+                    "hash" : "0xc7cf67a17215ed6eac0f53120c0afbd264489e23fe456fa88fd794e3dd620fbb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xc7cf67a17215ed6eac0f53120c0afbd264489e23fe456fa88fd794e3dd620fbb",
+                    "hash" : "0xd40df4466e98a878d279fee738896a4f8cffc30ff08e661ef60d0a0c31106c72",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x55633632d687fcd5ab41330fa9d08a7166cd48b0b30fdc3bf8893ccb88a2f74c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGE.json
index 10285a618..4500e9586 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x102903e11c7d8ae08cfdfd314e0bc1e1e017fc8e303ef4588049ac220ca5a299",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x102903e11c7d8ae08cfdfd314e0bc1e1e017fc8e303ef4588049ac220ca5a299",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xaf01a3e2e2e25e1244eb8d0d5e1dc18ed02d78f731edeab25b46af592ee1bc2d",
+                    "hash" : "0x102903e11c7d8ae08cfdfd314e0bc1e1e017fc8e303ef4588049ac220ca5a299",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x54071d8f0252fa16559dc95a4c754456cb9d1eb0add820917f37dd9f66c89c60",
+                    "hash" : "0x102903e11c7d8ae08cfdfd314e0bc1e1e017fc8e303ef4588049ac220ca5a299",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x102903e11c7d8ae08cfdfd314e0bc1e1e017fc8e303ef4588049ac220ca5a299",
+                    "hash" : "0xaf01a3e2e2e25e1244eb8d0d5e1dc18ed02d78f731edeab25b46af592ee1bc2d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x54071d8f0252fa16559dc95a4c754456cb9d1eb0add820917f37dd9f66c89c60",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfter.json
index 0ada12a0c..739333fac 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfterFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xaf584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xaf584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xb62569cbaffe068e783d4870d965fa783b0dd7d06bded6838715228457cb3262",
+                    "hash" : "0xaf584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xaae346ca92f96acc0d6b144e16bf1690ff1c32d06bf5e595f6f23f3366925abd",
+                    "hash" : "0xaf584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xaf584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
+                    "hash" : "0xb62569cbaffe068e783d4870d965fa783b0dd7d06bded6838715228457cb3262",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xaae346ca92f96acc0d6b144e16bf1690ff1c32d06bf5e595f6f23f3366925abd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBefore.json
index e665255b9..6ba763075 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBeforeFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x6bba427dc57b4ecc5fa6a2032174a78fcf32830d9499dde6523973886371b09f",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x6bba427dc57b4ecc5fa6a2032174a78fcf32830d9499dde6523973886371b09f",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x842bf7ae887e7cb7dcfc2f6eabdd18646d8a2bda516f9fd562c19b6f56efa2db",
+                    "hash" : "0x6bba427dc57b4ecc5fa6a2032174a78fcf32830d9499dde6523973886371b09f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xcac5c264b70a1f8323b5d3e97d12c3d81d5c491b1e80ad650e3aa19fd56a4fc8",
+                    "hash" : "0x6bba427dc57b4ecc5fa6a2032174a78fcf32830d9499dde6523973886371b09f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x6bba427dc57b4ecc5fa6a2032174a78fcf32830d9499dde6523973886371b09f",
+                    "hash" : "0x842bf7ae887e7cb7dcfc2f6eabdd18646d8a2bda516f9fd562c19b6f56efa2db",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xcac5c264b70a1f8323b5d3e97d12c3d81d5c491b1e80ad650e3aa19fd56a4fc8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEnd.json
index db9dd9ac3..31f4d07fb 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x23378211710a61d42023e52ac4f3ced5520424913d83e6b83d702458a33101cd",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x23378211710a61d42023e52ac4f3ced5520424913d83e6b83d702458a33101cd",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x947f9731043ecfbe5a5ec562e35fe42aceb1af3fbc527f294c376c2d3e7f0188",
+                    "hash" : "0x23378211710a61d42023e52ac4f3ced5520424913d83e6b83d702458a33101cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x4f8f62adf90225d39a8aafaa24a7572e9fa7a219da75698eb4b39f75dae23370",
+                    "hash" : "0x23378211710a61d42023e52ac4f3ced5520424913d83e6b83d702458a33101cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x23378211710a61d42023e52ac4f3ced5520424913d83e6b83d702458a33101cd",
+                    "hash" : "0x947f9731043ecfbe5a5ec562e35fe42aceb1af3fbc527f294c376c2d3e7f0188",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x4f8f62adf90225d39a8aafaa24a7572e9fa7a219da75698eb4b39f75dae23370",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddle.json
index 8efc5fce7..0a4b5b877 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddleFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xe106c85fe7fd2b684377a93616b1c91ca1a015c87fbf00eda6e829a9b298127b",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xe106c85fe7fd2b684377a93616b1c91ca1a015c87fbf00eda6e829a9b298127b",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x2f33596d5f44d27a283f42ab80573b0c0679a747956947fa95cc834b29568a6d",
+                    "hash" : "0xe106c85fe7fd2b684377a93616b1c91ca1a015c87fbf00eda6e829a9b298127b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xadb05591af22edf890ca98b2f7c75c5aa422db762452c7dee6bdd768d09451da",
+                    "hash" : "0xe106c85fe7fd2b684377a93616b1c91ca1a015c87fbf00eda6e829a9b298127b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xe106c85fe7fd2b684377a93616b1c91ca1a015c87fbf00eda6e829a9b298127b",
+                    "hash" : "0x2f33596d5f44d27a283f42ab80573b0c0679a747956947fa95cc834b29568a6d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xadb05591af22edf890ca98b2f7c75c5aa422db762452c7dee6bdd768d09451da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVE.json
index 4c8dbe5ec..b2b15ae82 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xc71c3c72a86af0113389ac1e4a61aa898945cf5f7b9a025aea9bff4be67f860c",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xc71c3c72a86af0113389ac1e4a61aa898945cf5f7b9a025aea9bff4be67f860c",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x47556352d5416f990a6a0220c889d05e2d2a0f54432db3f86ad4905f7b7d44d9",
+                    "hash" : "0xc71c3c72a86af0113389ac1e4a61aa898945cf5f7b9a025aea9bff4be67f860c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x4289ba2d0ff2046af6580fb4a5183083d6fd88ce3c29cabd91c288069176c028",
+                    "hash" : "0xc71c3c72a86af0113389ac1e4a61aa898945cf5f7b9a025aea9bff4be67f860c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xc71c3c72a86af0113389ac1e4a61aa898945cf5f7b9a025aea9bff4be67f860c",
+                    "hash" : "0x47556352d5416f990a6a0220c889d05e2d2a0f54432db3f86ad4905f7b7d44d9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x4289ba2d0ff2046af6580fb4a5183083d6fd88ce3c29cabd91c288069176c028",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101.json
index 847be155b..7bc860879 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xfa8213e5be374f800e16897651e302474f1854eb3866ed981644222b3b1fe24a",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xfa8213e5be374f800e16897651e302474f1854eb3866ed981644222b3b1fe24a",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x9ebae797a3e14cbe9fe7a3cd3a8e0c1812b80bc4474b7c70e1b85835771f83dd",
+                    "hash" : "0xfa8213e5be374f800e16897651e302474f1854eb3866ed981644222b3b1fe24a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x4cacaa96bfe003df5eb59210ce7a3faadb45dd45b6dae415b38ff0bf8be9e083",
+                    "hash" : "0xfa8213e5be374f800e16897651e302474f1854eb3866ed981644222b3b1fe24a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xfa8213e5be374f800e16897651e302474f1854eb3866ed981644222b3b1fe24a",
+                    "hash" : "0x9ebae797a3e14cbe9fe7a3cd3a8e0c1812b80bc4474b7c70e1b85835771f83dd",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x4cacaa96bfe003df5eb59210ce7a3faadb45dd45b6dae415b38ff0bf8be9e083",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGE.json
index 99c335e11..44c0bae1d 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x715153239b646d65f629652a1019cd53344223e2ad15b413c6ea5cb0260dacf9",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x715153239b646d65f629652a1019cd53344223e2ad15b413c6ea5cb0260dacf9",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x0aafff502c7a40bac1d3f97bc989a050deba280ecc16f1acdc4e7afc6771427c",
+                    "hash" : "0x715153239b646d65f629652a1019cd53344223e2ad15b413c6ea5cb0260dacf9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x9c5d980fe2ee46663a7faf368c6d135baff3d4fa78522b1b441fa19e95b08865",
+                    "hash" : "0x715153239b646d65f629652a1019cd53344223e2ad15b413c6ea5cb0260dacf9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x715153239b646d65f629652a1019cd53344223e2ad15b413c6ea5cb0260dacf9",
+                    "hash" : "0x0aafff502c7a40bac1d3f97bc989a050deba280ecc16f1acdc4e7afc6771427c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x9c5d980fe2ee46663a7faf368c6d135baff3d4fa78522b1b441fa19e95b08865",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfter.json
index 723879f19..d14b0e9f9 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfterFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x6d479eeebd4394d608e4c0773568b4b397afc1528e762283fe0e412f9dd4cd61",
+                    "hash" : "0x72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xe992a79fb556b4ffabc16a460d25f8201d477ff4bccf72b91d505b74e5084069",
+                    "hash" : "0x72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
+                    "hash" : "0x6d479eeebd4394d608e4c0773568b4b397afc1528e762283fe0e412f9dd4cd61",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xe992a79fb556b4ffabc16a460d25f8201d477ff4bccf72b91d505b74e5084069",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBefore.json
index 6dc507cd9..f53d72208 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBeforeFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xe041950fb990326f0a02309d3cdf8bed86696119d56846e181c26c63d97c9faf",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xe041950fb990326f0a02309d3cdf8bed86696119d56846e181c26c63d97c9faf",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x5092376083f685f0fc65d383505ae3611a277aaa5791285bbe39afd35bd03c73",
+                    "hash" : "0xe041950fb990326f0a02309d3cdf8bed86696119d56846e181c26c63d97c9faf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x3ae5302a42daf536aa38dba4b188cf302e997e07fbe10bc2576c28241f52d7d8",
+                    "hash" : "0xe041950fb990326f0a02309d3cdf8bed86696119d56846e181c26c63d97c9faf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xe041950fb990326f0a02309d3cdf8bed86696119d56846e181c26c63d97c9faf",
+                    "hash" : "0x5092376083f685f0fc65d383505ae3611a277aaa5791285bbe39afd35bd03c73",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x3ae5302a42daf536aa38dba4b188cf302e997e07fbe10bc2576c28241f52d7d8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEnd.json
index 9636d397b..ed1c2be05 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x35cb1045a24a1a4811760a686caec7d70e026c4a338b3b9e5f97f9f5514abf50",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x35cb1045a24a1a4811760a686caec7d70e026c4a338b3b9e5f97f9f5514abf50",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xb61abe9090a96f92bcc332c452ed9534dd7603a6223e30be809cd394d112f044",
+                    "hash" : "0x35cb1045a24a1a4811760a686caec7d70e026c4a338b3b9e5f97f9f5514abf50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x7677407312741db39826ebb72c352c0bf8becab1f0f82a5e21258891182f138b",
+                    "hash" : "0x35cb1045a24a1a4811760a686caec7d70e026c4a338b3b9e5f97f9f5514abf50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x35cb1045a24a1a4811760a686caec7d70e026c4a338b3b9e5f97f9f5514abf50",
+                    "hash" : "0xb61abe9090a96f92bcc332c452ed9534dd7603a6223e30be809cd394d112f044",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x7677407312741db39826ebb72c352c0bf8becab1f0f82a5e21258891182f138b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddle.json
index b6902c5dc..8f4f1c2ef 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xe106c85fe7fd2b684377a93616b1c91ca1a015c87fbf00eda6e829a9b298127b",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xe106c85fe7fd2b684377a93616b1c91ca1a015c87fbf00eda6e829a9b298127b",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x2f33596d5f44d27a283f42ab80573b0c0679a747956947fa95cc834b29568a6d",
+                    "hash" : "0xe106c85fe7fd2b684377a93616b1c91ca1a015c87fbf00eda6e829a9b298127b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xadb05591af22edf890ca98b2f7c75c5aa422db762452c7dee6bdd768d09451da",
+                    "hash" : "0xe106c85fe7fd2b684377a93616b1c91ca1a015c87fbf00eda6e829a9b298127b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xe106c85fe7fd2b684377a93616b1c91ca1a015c87fbf00eda6e829a9b298127b",
+                    "hash" : "0x2f33596d5f44d27a283f42ab80573b0c0679a747956947fa95cc834b29568a6d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xadb05591af22edf890ca98b2f7c75c5aa422db762452c7dee6bdd768d09451da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVE.json
index b66d98fb8..4ba36414a 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x22a796e402ab3a4bd59e562faa7a7568200221b1230b1d6f37945cbcdd4c5760",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x22a796e402ab3a4bd59e562faa7a7568200221b1230b1d6f37945cbcdd4c5760",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xda6f304b6e4c2e696db384657ccec735d83bdf3d202fe019b5b5bebd16446734",
+                    "hash" : "0x22a796e402ab3a4bd59e562faa7a7568200221b1230b1d6f37945cbcdd4c5760",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x8e577c9142bb10a14fce4064aee95b80c33d5226c92f99a4eea0c9d9451f0d92",
+                    "hash" : "0x22a796e402ab3a4bd59e562faa7a7568200221b1230b1d6f37945cbcdd4c5760",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x22a796e402ab3a4bd59e562faa7a7568200221b1230b1d6f37945cbcdd4c5760",
+                    "hash" : "0xda6f304b6e4c2e696db384657ccec735d83bdf3d202fe019b5b5bebd16446734",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x8e577c9142bb10a14fce4064aee95b80c33d5226c92f99a4eea0c9d9451f0d92",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11.json
index 74605be30..7ba4e8cad 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x6bb5dcba63963fbecffe9dc14d5fdeda6dc28890fc919a514288050eb3688cd9",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x6bb5dcba63963fbecffe9dc14d5fdeda6dc28890fc919a514288050eb3688cd9",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xd20f21ffe89418f85b8316c0e28945dfd51b90df8d7484e01c0ca7559ea786e6",
+                    "hash" : "0x6bb5dcba63963fbecffe9dc14d5fdeda6dc28890fc919a514288050eb3688cd9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xad88e26cac530cf65bedbddc21bcd34c079dfb51c60cdb4584a522a154459f67",
+                    "hash" : "0x6bb5dcba63963fbecffe9dc14d5fdeda6dc28890fc919a514288050eb3688cd9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x6bb5dcba63963fbecffe9dc14d5fdeda6dc28890fc919a514288050eb3688cd9",
+                    "hash" : "0xd20f21ffe89418f85b8316c0e28945dfd51b90df8d7484e01c0ca7559ea786e6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xad88e26cac530cf65bedbddc21bcd34c079dfb51c60cdb4584a522a154459f67",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGE.json
index c6ed14deb..57c64f3fa 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x0e28cf3f4db47f3b35650b9458b37fd2c6ef988619e9357c7aad99c2ca509bb4",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x0e28cf3f4db47f3b35650b9458b37fd2c6ef988619e9357c7aad99c2ca509bb4",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x096698b31d54f0040cd099ba66b817a9f1ffc5a5bafa28ffa59a3d758923547a",
+                    "hash" : "0x0e28cf3f4db47f3b35650b9458b37fd2c6ef988619e9357c7aad99c2ca509bb4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xcd71afecf18c68473965101df3bee68f05e811bc3cc85263f2e873db0bab603e",
+                    "hash" : "0x0e28cf3f4db47f3b35650b9458b37fd2c6ef988619e9357c7aad99c2ca509bb4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x0e28cf3f4db47f3b35650b9458b37fd2c6ef988619e9357c7aad99c2ca509bb4",
+                    "hash" : "0x096698b31d54f0040cd099ba66b817a9f1ffc5a5bafa28ffa59a3d758923547a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xcd71afecf18c68473965101df3bee68f05e811bc3cc85263f2e873db0bab603e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEnd.json
index aec0b49b1..96d2b4af1 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xf13d84f79216159b8c1952beb0241a3fddabeecd458a1575d751fe3b95c44218",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf13d84f79216159b8c1952beb0241a3fddabeecd458a1575d751fe3b95c44218",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xe35649fa1eea660604dcabe69e77842e8a2f22da1dfdd6dea4c69d397b659a89",
+                    "hash" : "0xf13d84f79216159b8c1952beb0241a3fddabeecd458a1575d751fe3b95c44218",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x703f353348a2430256b3810b8e11fcf46575186df153666c0e2da48ccb9bcb05",
+                    "hash" : "0xf13d84f79216159b8c1952beb0241a3fddabeecd458a1575d751fe3b95c44218",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xf13d84f79216159b8c1952beb0241a3fddabeecd458a1575d751fe3b95c44218",
+                    "hash" : "0xe35649fa1eea660604dcabe69e77842e8a2f22da1dfdd6dea4c69d397b659a89",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x703f353348a2430256b3810b8e11fcf46575186df153666c0e2da48ccb9bcb05",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110.json
index eacb1a948..a990916b0 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x1a0c0ff79c7f1f7f7e275740abb2a04be4a4e8bef522a96ddbb07591fbd04510",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x1a0c0ff79c7f1f7f7e275740abb2a04be4a4e8bef522a96ddbb07591fbd04510",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x6d41af64bb9fb98da3c6d35833bbcf39ac155bc24f40f1dea53744fc6ce32f6f",
+                    "hash" : "0x1a0c0ff79c7f1f7f7e275740abb2a04be4a4e8bef522a96ddbb07591fbd04510",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x34bc5671ba91c86c180a49383698b999d1e1f479d30329efa94cfd0e35448d47",
+                    "hash" : "0x1a0c0ff79c7f1f7f7e275740abb2a04be4a4e8bef522a96ddbb07591fbd04510",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x1a0c0ff79c7f1f7f7e275740abb2a04be4a4e8bef522a96ddbb07591fbd04510",
+                    "hash" : "0x6d41af64bb9fb98da3c6d35833bbcf39ac155bc24f40f1dea53744fc6ce32f6f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x34bc5671ba91c86c180a49383698b999d1e1f479d30329efa94cfd0e35448d47",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGE.json
index 2240b6f75..927523256 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x942ff284bea2f09e71ed2cf10386123723970b326007af4100816600c6fd940b",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x942ff284bea2f09e71ed2cf10386123723970b326007af4100816600c6fd940b",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x2179e2c822fec12f40fd3939cd1d1dde923e5463e69746602dbf007893158b57",
+                    "hash" : "0x942ff284bea2f09e71ed2cf10386123723970b326007af4100816600c6fd940b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x6259572a4af0cbe466630c38041328c0a204eb18fe9819bfe68b326266e6c375",
+                    "hash" : "0x942ff284bea2f09e71ed2cf10386123723970b326007af4100816600c6fd940b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x942ff284bea2f09e71ed2cf10386123723970b326007af4100816600c6fd940b",
+                    "hash" : "0x2179e2c822fec12f40fd3939cd1d1dde923e5463e69746602dbf007893158b57",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x6259572a4af0cbe466630c38041328c0a204eb18fe9819bfe68b326266e6c375",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfter.json
index 5a5626ed0..4441178a9 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfterFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x7f80cbb5991fa0786b95a163abe66f6ed0b4e9a59ea334c8b9c849dfd8578cb4",
+                    "hash" : "0x19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x9c301320a19121eac101086d4959324be54a0409be44ca96a9a6047bb76a74a7",
+                    "hash" : "0x19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
+                    "hash" : "0x7f80cbb5991fa0786b95a163abe66f6ed0b4e9a59ea334c8b9c849dfd8578cb4",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x9c301320a19121eac101086d4959324be54a0409be44ca96a9a6047bb76a74a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBefore.json
index 093a2f750..3f480b045 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBeforeFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x133ce682dd8a338a8cf768f9b504ff61b6434a4167414fdcca4be5cd24a8e54a",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x133ce682dd8a338a8cf768f9b504ff61b6434a4167414fdcca4be5cd24a8e54a",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xbb0998a3e9e4e118719757faba690a274adf1f0cf9f8a6e5533e6d11c0d1b27d",
+                    "hash" : "0x133ce682dd8a338a8cf768f9b504ff61b6434a4167414fdcca4be5cd24a8e54a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xc6290af98244a3e14f3d37f222df9f51f92d8039f073830989f7fc9d8a889a29",
+                    "hash" : "0x133ce682dd8a338a8cf768f9b504ff61b6434a4167414fdcca4be5cd24a8e54a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x133ce682dd8a338a8cf768f9b504ff61b6434a4167414fdcca4be5cd24a8e54a",
+                    "hash" : "0xbb0998a3e9e4e118719757faba690a274adf1f0cf9f8a6e5533e6d11c0d1b27d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xc6290af98244a3e14f3d37f222df9f51f92d8039f073830989f7fc9d8a889a29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEnd.json
index 5e1cbd1f6..c795b39b5 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xe58fadd9d9e01b4d0f1c140f336f324ceb72d8982ac435f94cd4dcdafc9a058c",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xe58fadd9d9e01b4d0f1c140f336f324ceb72d8982ac435f94cd4dcdafc9a058c",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x1cfc452d676a580a2cc89ee8026c078aedf67e0d893b989372522c3b4c9ecea2",
+                    "hash" : "0xe58fadd9d9e01b4d0f1c140f336f324ceb72d8982ac435f94cd4dcdafc9a058c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x45afb1510d512c686b1e61b529e2881c6457a32aaf9671bddd5b7476f6067c2f",
+                    "hash" : "0xe58fadd9d9e01b4d0f1c140f336f324ceb72d8982ac435f94cd4dcdafc9a058c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xe58fadd9d9e01b4d0f1c140f336f324ceb72d8982ac435f94cd4dcdafc9a058c",
+                    "hash" : "0x1cfc452d676a580a2cc89ee8026c078aedf67e0d893b989372522c3b4c9ecea2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x45afb1510d512c686b1e61b529e2881c6457a32aaf9671bddd5b7476f6067c2f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddle.json
index d46dd57dc..872f26907 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x687ad44bee4e1068abc98c35dff3917fa0dc8ff8ccf85658cb69dbaa8e1b972d",
+                    "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x7fda4cd60dc6ec236dd59307b889261919971ef3903191d463357779686d2eee",
+                    "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
+                    "hash" : "0x687ad44bee4e1068abc98c35dff3917fa0dc8ff8ccf85658cb69dbaa8e1b972d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x7fda4cd60dc6ec236dd59307b889261919971ef3903191d463357779686d2eee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVE.json
index 576775a6d..f5626de02 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x3bf4b5a1ec47523ada015f3fb3f5df83f08c7d4b6d4fd10a2caa59181b2c739d",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x3bf4b5a1ec47523ada015f3fb3f5df83f08c7d4b6d4fd10a2caa59181b2c739d",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x0d23c7ca2e96fb608ab0650af3db13403b67f997a43078d6e411cfa944fc1db3",
+                    "hash" : "0x3bf4b5a1ec47523ada015f3fb3f5df83f08c7d4b6d4fd10a2caa59181b2c739d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xcb895ea3655a33ff3d5704b44e275f66152b105844eb4f4996fb2b590e683c08",
+                    "hash" : "0x3bf4b5a1ec47523ada015f3fb3f5df83f08c7d4b6d4fd10a2caa59181b2c739d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x3bf4b5a1ec47523ada015f3fb3f5df83f08c7d4b6d4fd10a2caa59181b2c739d",
+                    "hash" : "0x0d23c7ca2e96fb608ab0650af3db13403b67f997a43078d6e411cfa944fc1db3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xcb895ea3655a33ff3d5704b44e275f66152b105844eb4f4996fb2b590e683c08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111.json
index e364bfd5c..a93045711 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x9ff3154dfe3d0c682720f4c835db942af1a2c55e25f61177f8ae49cdddd7f0ca",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x9ff3154dfe3d0c682720f4c835db942af1a2c55e25f61177f8ae49cdddd7f0ca",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x3c7c4a2c96e4a91fc49264d9bd842f882be122d42e4eb990c90a5f5f52750277",
+                    "hash" : "0x9ff3154dfe3d0c682720f4c835db942af1a2c55e25f61177f8ae49cdddd7f0ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x51f06fc9b202094c1778e51163b46bb39c104a49a88009ec1651ae1451cadf59",
+                    "hash" : "0x9ff3154dfe3d0c682720f4c835db942af1a2c55e25f61177f8ae49cdddd7f0ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x9ff3154dfe3d0c682720f4c835db942af1a2c55e25f61177f8ae49cdddd7f0ca",
+                    "hash" : "0x3c7c4a2c96e4a91fc49264d9bd842f882be122d42e4eb990c90a5f5f52750277",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x51f06fc9b202094c1778e51163b46bb39c104a49a88009ec1651ae1451cadf59",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGE.json
index 39c940ccd..27b44dac3 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x7f855d94b94b43220456d5492c6fb79531a820f6b83a2c24adfa3fd2d7676a1e",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x7f855d94b94b43220456d5492c6fb79531a820f6b83a2c24adfa3fd2d7676a1e",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x267dd4b8573a2e7a012580cc949aa4972aad594a3c4a1cb193ea45d86bbe0cff",
+                    "hash" : "0x7f855d94b94b43220456d5492c6fb79531a820f6b83a2c24adfa3fd2d7676a1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xb1c13e1821d85f7aed07b1fb2883fd071f5c7b6d99766e40f7165d3b34e82969",
+                    "hash" : "0x7f855d94b94b43220456d5492c6fb79531a820f6b83a2c24adfa3fd2d7676a1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x7f855d94b94b43220456d5492c6fb79531a820f6b83a2c24adfa3fd2d7676a1e",
+                    "hash" : "0x267dd4b8573a2e7a012580cc949aa4972aad594a3c4a1cb193ea45d86bbe0cff",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xb1c13e1821d85f7aed07b1fb2883fd071f5c7b6d99766e40f7165d3b34e82969",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfter.json
index 510bdc977..35def2525 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfterFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x2b024b21c2daf897cc6913b84049c8e13b8919bd596cb7041d771e8c44262849",
+                    "hash" : "0x711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xb53d71ec73b762655d97cbd7e1b208ae64409ae2cd3d38574dec49d07d20109f",
+                    "hash" : "0x711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
+                    "hash" : "0x2b024b21c2daf897cc6913b84049c8e13b8919bd596cb7041d771e8c44262849",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xb53d71ec73b762655d97cbd7e1b208ae64409ae2cd3d38574dec49d07d20109f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBefore.json
index 84222a75c..5dac44fe7 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBeforeFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xb4dbea16de17b59147fa94280092aad3126e017f4a453a065186300d2448c803",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xb4dbea16de17b59147fa94280092aad3126e017f4a453a065186300d2448c803",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x4e3ad257e8d352958cea3ec50c3ffe9eb8864cec4cfccc5d9d5fae441c0a9977",
+                    "hash" : "0xb4dbea16de17b59147fa94280092aad3126e017f4a453a065186300d2448c803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x3f299a1af6b8063deb96c41f54078ebb5a5e2f78a5913b9d73c7e2c2f8755f38",
+                    "hash" : "0xb4dbea16de17b59147fa94280092aad3126e017f4a453a065186300d2448c803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xb4dbea16de17b59147fa94280092aad3126e017f4a453a065186300d2448c803",
+                    "hash" : "0x4e3ad257e8d352958cea3ec50c3ffe9eb8864cec4cfccc5d9d5fae441c0a9977",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x3f299a1af6b8063deb96c41f54078ebb5a5e2f78a5913b9d73c7e2c2f8755f38",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEnd.json
index 7fd5f42fc..0988f7cde 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xe76229fb92f8543f5c0e2c4d9469e0464988b089922ee520f260bb259f1f9c59",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xe76229fb92f8543f5c0e2c4d9469e0464988b089922ee520f260bb259f1f9c59",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x5e680aba2dfacfc5b1b323c8b133d44d7912b2a16515fc424d95fd0293872037",
+                    "hash" : "0xe76229fb92f8543f5c0e2c4d9469e0464988b089922ee520f260bb259f1f9c59",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x17f9ea5c8509ce2260e9f3f47eb17e0a4cb9308979170b4b4b9fe1f704a6d3d0",
+                    "hash" : "0xe76229fb92f8543f5c0e2c4d9469e0464988b089922ee520f260bb259f1f9c59",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xe76229fb92f8543f5c0e2c4d9469e0464988b089922ee520f260bb259f1f9c59",
+                    "hash" : "0x5e680aba2dfacfc5b1b323c8b133d44d7912b2a16515fc424d95fd0293872037",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x17f9ea5c8509ce2260e9f3f47eb17e0a4cb9308979170b4b4b9fe1f704a6d3d0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddle.json
index 7b49f6878..2dab0e611 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x687ad44bee4e1068abc98c35dff3917fa0dc8ff8ccf85658cb69dbaa8e1b972d",
+                    "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x7fda4cd60dc6ec236dd59307b889261919971ef3903191d463357779686d2eee",
+                    "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
+                    "hash" : "0x687ad44bee4e1068abc98c35dff3917fa0dc8ff8ccf85658cb69dbaa8e1b972d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x7fda4cd60dc6ec236dd59307b889261919971ef3903191d463357779686d2eee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json
index 043eb70bc..e4530a189 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x7534562771847b5e3213d441c5b7eaf174fe4f238bf44b5893525f441e031284",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x7534562771847b5e3213d441c5b7eaf174fe4f238bf44b5893525f441e031284",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x0829e05ae238200ab794bf1978f724286bceaf1a947662cf408ac5c65421157d",
+                    "hash" : "0x7534562771847b5e3213d441c5b7eaf174fe4f238bf44b5893525f441e031284",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x8502b9c5e0f229cb9c9f5eeacc11b9f136428645edc6e0627ed08c0ab578ac6c",
+                    "hash" : "0x7534562771847b5e3213d441c5b7eaf174fe4f238bf44b5893525f441e031284",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x7534562771847b5e3213d441c5b7eaf174fe4f238bf44b5893525f441e031284",
+                    "hash" : "0x0829e05ae238200ab794bf1978f724286bceaf1a947662cf408ac5c65421157d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x8502b9c5e0f229cb9c9f5eeacc11b9f136428645edc6e0627ed08c0ab578ac6c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,