split metropolis

54 files changed, 2674 insertions, 406 deletions

diff --git a/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG.json b/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG.json
index 1e20978ac..528c17eef 100644
--- a/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG.json
+++ b/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG.json
@@ -2,7 +2,7 @@
     "ContractStoreClearsOOG" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/ContractStoreClearsOOGFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xd58cdfde7bf06a7f91ab36dc0fb0710ba8a9275390553616ff29f7366882bb26",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xd58cdfde7bf06a7f91ab36dc0fb0710ba8a9275390553616ff29f7366882bb26",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xd58cdfde7bf06a7f91ab36dc0fb0710ba8a9275390553616ff29f7366882bb26",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xd58cdfde7bf06a7f91ab36dc0fb0710ba8a9275390553616ff29f7366882bb26",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xd58cdfde7bf06a7f91ab36dc0fb0710ba8a9275390553616ff29f7366882bb26",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xd58cdfde7bf06a7f91ab36dc0fb0710ba8a9275390553616ff29f7366882bb26",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/ContractStoreClearsSuccess.json b/GeneralStateTests/stTransactionTest/ContractStoreClearsSuccess.json
index 3ff9961e6..44e5b4139 100644
--- a/GeneralStateTests/stTransactionTest/ContractStoreClearsSuccess.json
+++ b/GeneralStateTests/stTransactionTest/ContractStoreClearsSuccess.json
@@ -2,7 +2,7 @@
     "ContractStoreClearsSuccess" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/ContractStoreClearsSuccessFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x11cb0174dafbaca661204a3a104acf1d96d4f100b2d3db8bfec25cc7e595b545",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x11cb0174dafbaca661204a3a104acf1d96d4f100b2d3db8bfec25cc7e595b545",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x11cb0174dafbaca661204a3a104acf1d96d4f100b2d3db8bfec25cc7e595b545",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x11cb0174dafbaca661204a3a104acf1d96d4f100b2d3db8bfec25cc7e595b545",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x11cb0174dafbaca661204a3a104acf1d96d4f100b2d3db8bfec25cc7e595b545",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x11cb0174dafbaca661204a3a104acf1d96d4f100b2d3db8bfec25cc7e595b545",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/CreateMessageReverted.json b/GeneralStateTests/stTransactionTest/CreateMessageReverted.json
index 504498e1f..e866cba1d 100644
--- a/GeneralStateTests/stTransactionTest/CreateMessageReverted.json
+++ b/GeneralStateTests/stTransactionTest/CreateMessageReverted.json
@@ -2,7 +2,7 @@
     "CreateMessageReverted" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/CreateMessageRevertedFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x6f792258c5a1e152c931e3af3e0ef180ad7ed52c1f84380f2beb660177e22c24",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x6f792258c5a1e152c931e3af3e0ef180ad7ed52c1f84380f2beb660177e22c24",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x6f792258c5a1e152c931e3af3e0ef180ad7ed52c1f84380f2beb660177e22c24",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x6f792258c5a1e152c931e3af3e0ef180ad7ed52c1f84380f2beb660177e22c24",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x6f792258c5a1e152c931e3af3e0ef180ad7ed52c1f84380f2beb660177e22c24",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x6f792258c5a1e152c931e3af3e0ef180ad7ed52c1f84380f2beb660177e22c24",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/CreateMessageSuccess.json b/GeneralStateTests/stTransactionTest/CreateMessageSuccess.json
index b665f386d..4037d1c8b 100644
--- a/GeneralStateTests/stTransactionTest/CreateMessageSuccess.json
+++ b/GeneralStateTests/stTransactionTest/CreateMessageSuccess.json
@@ -2,7 +2,7 @@
     "CreateMessageSuccess" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/CreateMessageSuccessFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x558f7514aaadbe5e4b69005a110606c5bf1f764279c780141c1f1ecf8f53c382",
+                    "hash" : "0x08c7dbdb0a5e0632c0c52b1bb4f89b154c719aa2acf88a54588cd67416005b3b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x08c7dbdb0a5e0632c0c52b1bb4f89b154c719aa2acf88a54588cd67416005b3b",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x558f7514aaadbe5e4b69005a110606c5bf1f764279c780141c1f1ecf8f53c382",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x08c7dbdb0a5e0632c0c52b1bb4f89b154c719aa2acf88a54588cd67416005b3b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x558f7514aaadbe5e4b69005a110606c5bf1f764279c780141c1f1ecf8f53c382",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x08c7dbdb0a5e0632c0c52b1bb4f89b154c719aa2acf88a54588cd67416005b3b",
+                    "hash" : "0x558f7514aaadbe5e4b69005a110606c5bf1f764279c780141c1f1ecf8f53c382",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/CreateTransactionReverted.json b/GeneralStateTests/stTransactionTest/CreateTransactionReverted.json
index 921845dc2..d170f3b74 100644
--- a/GeneralStateTests/stTransactionTest/CreateTransactionReverted.json
+++ b/GeneralStateTests/stTransactionTest/CreateTransactionReverted.json
@@ -2,7 +2,7 @@
     "CreateTransactionReverted" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionRevertedFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x9b14f6a3389ec380ae31529f0b6c4ba09010cd9553c900c7c0bb47207ff47177",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x9b14f6a3389ec380ae31529f0b6c4ba09010cd9553c900c7c0bb47207ff47177",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x9b14f6a3389ec380ae31529f0b6c4ba09010cd9553c900c7c0bb47207ff47177",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x9b14f6a3389ec380ae31529f0b6c4ba09010cd9553c900c7c0bb47207ff47177",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x9b14f6a3389ec380ae31529f0b6c4ba09010cd9553c900c7c0bb47207ff47177",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x9b14f6a3389ec380ae31529f0b6c4ba09010cd9553c900c7c0bb47207ff47177",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json b/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json
index eed034b59..20d3010bd 100644
--- a/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json
+++ b/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json
@@ -2,7 +2,7 @@
     "CreateTransactionSuccess" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionSuccessFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xa0b82485d35279240c14e3d39dc992f4fe8af2e630902afe6c45c58f58ee2011",
+                    "hash" : "0x1059918f27d169135bee2387b01c9b62a0ebbd145c07d0a2651a7cd20af3b2e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x1059918f27d169135bee2387b01c9b62a0ebbd145c07d0a2651a7cd20af3b2e0",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x7d12ba0d5a88efcfc293ed4a5f877db891be20380c0483f1800f19786c35dce2",
+                    "hash" : "0xa0b82485d35279240c14e3d39dc992f4fe8af2e630902afe6c45c58f58ee2011",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xa0b82485d35279240c14e3d39dc992f4fe8af2e630902afe6c45c58f58ee2011",
+                    "hash" : "0x1059918f27d169135bee2387b01c9b62a0ebbd145c07d0a2651a7cd20af3b2e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x1059918f27d169135bee2387b01c9b62a0ebbd145c07d0a2651a7cd20af3b2e0",
+                    "hash" : "0x7d12ba0d5a88efcfc293ed4a5f877db891be20380c0483f1800f19786c35dce2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xa0b82485d35279240c14e3d39dc992f4fe8af2e630902afe6c45c58f58ee2011",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/EmptyTransaction.json b/GeneralStateTests/stTransactionTest/EmptyTransaction.json
index 6acdf798b..9daaf8dcb 100644
--- a/GeneralStateTests/stTransactionTest/EmptyTransaction.json
+++ b/GeneralStateTests/stTransactionTest/EmptyTransaction.json
@@ -2,7 +2,7 @@
     "EmptyTransaction" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransactionFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/EmptyTransaction2.json b/GeneralStateTests/stTransactionTest/EmptyTransaction2.json
index 5d1d45d9f..f7ad2115a 100644
--- a/GeneralStateTests/stTransactionTest/EmptyTransaction2.json
+++ b/GeneralStateTests/stTransactionTest/EmptyTransaction2.json
@@ -2,7 +2,7 @@
     "EmptyTransaction2" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction2Filler.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x7c9b70b846a70a1731baf76adc6ffc016628cdabb8b5e9b4ab84f5134dc6ac89",
+                    "hash" : "0x2d2b88bc228443c611081f7db686b82a1beebe9d0fc79ce5e9604666e0b39fd0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x2d2b88bc228443c611081f7db686b82a1beebe9d0fc79ce5e9604666e0b39fd0",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x7c9b70b846a70a1731baf76adc6ffc016628cdabb8b5e9b4ab84f5134dc6ac89",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x2d2b88bc228443c611081f7db686b82a1beebe9d0fc79ce5e9604666e0b39fd0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x7c9b70b846a70a1731baf76adc6ffc016628cdabb8b5e9b4ab84f5134dc6ac89",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x2d2b88bc228443c611081f7db686b82a1beebe9d0fc79ce5e9604666e0b39fd0",
+                    "hash" : "0x7c9b70b846a70a1731baf76adc6ffc016628cdabb8b5e9b4ab84f5134dc6ac89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/EmptyTransaction3.json b/GeneralStateTests/stTransactionTest/EmptyTransaction3.json
index bed399f02..46be63027 100644
--- a/GeneralStateTests/stTransactionTest/EmptyTransaction3.json
+++ b/GeneralStateTests/stTransactionTest/EmptyTransaction3.json
@@ -2,7 +2,7 @@
     "EmptyTransaction3" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction3Filler.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
+                    "hash" : "0x01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xcf29b86efa1b7f5f999ef519fcc921062924d5c14d78baf491252fbf5a0d85b8",
+                    "hash" : "0x53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
+                    "hash" : "0x01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
+                    "hash" : "0xcf29b86efa1b7f5f999ef519fcc921062924d5c14d78baf491252fbf5a0d85b8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/HighGasLimit.json b/GeneralStateTests/stTransactionTest/HighGasLimit.json
index b130edbd0..02d1c61ea 100644
--- a/GeneralStateTests/stTransactionTest/HighGasLimit.json
+++ b/GeneralStateTests/stTransactionTest/HighGasLimit.json
@@ -2,7 +2,7 @@
     "HighGasLimit" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/HighGasLimitFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x21c449a88c31cdfc758f8cfcdd080f1bb23d184737c62abd5192d079b5d69a30",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x21c449a88c31cdfc758f8cfcdd080f1bb23d184737c62abd5192d079b5d69a30",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x21c449a88c31cdfc758f8cfcdd080f1bb23d184737c62abd5192d079b5d69a30",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x21c449a88c31cdfc758f8cfcdd080f1bb23d184737c62abd5192d079b5d69a30",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x21c449a88c31cdfc758f8cfcdd080f1bb23d184737c62abd5192d079b5d69a30",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x21c449a88c31cdfc758f8cfcdd080f1bb23d184737c62abd5192d079b5d69a30",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit.json b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit.json
index 8129323a2..9a878e15b 100644
--- a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit.json
+++ b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit.json
@@ -2,7 +2,7 @@
     "InternalCallHittingGasLimit" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/InternalCallHittingGasLimitFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x6930ba06a213125880c1a12a18ad56614bbb8d56d94599781965c83379db8ce2",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x6930ba06a213125880c1a12a18ad56614bbb8d56d94599781965c83379db8ce2",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x6930ba06a213125880c1a12a18ad56614bbb8d56d94599781965c83379db8ce2",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x6930ba06a213125880c1a12a18ad56614bbb8d56d94599781965c83379db8ce2",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x6930ba06a213125880c1a12a18ad56614bbb8d56d94599781965c83379db8ce2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x6930ba06a213125880c1a12a18ad56614bbb8d56d94599781965c83379db8ce2",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json
index 48a83fb88..028a36bef 100644
--- a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json
+++ b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json
@@ -2,7 +2,7 @@
     "InternalCallHittingGasLimit2" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/InternalCallHittingGasLimit2Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x0f98867b36ce229df56a98e1454b81797def675ab7b1ff78b9bd95922be5a07e",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x0f98867b36ce229df56a98e1454b81797def675ab7b1ff78b9bd95922be5a07e",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x1313600c23f63593b77fc8aca5a6fc20ef894a44e323554f65f2939af28d5e27",
+                    "hash" : "0x0f98867b36ce229df56a98e1454b81797def675ab7b1ff78b9bd95922be5a07e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x0f98867b36ce229df56a98e1454b81797def675ab7b1ff78b9bd95922be5a07e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x1313600c23f63593b77fc8aca5a6fc20ef894a44e323554f65f2939af28d5e27",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x0f98867b36ce229df56a98e1454b81797def675ab7b1ff78b9bd95922be5a07e",
+                    "hash" : "0x1313600c23f63593b77fc8aca5a6fc20ef894a44e323554f65f2939af28d5e27",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess.json b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess.json
index 8e1869ebc..d9c7b5adb 100644
--- a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess.json
+++ b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess.json
@@ -2,7 +2,7 @@
     "InternalCallHittingGasLimitSuccess" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/InternalCallHittingGasLimitSuccessFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x2766392b322e4bc9ec7c60c6699445acdc7c66d4fe3cec79f4ddd852f16f8e68",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x2766392b322e4bc9ec7c60c6699445acdc7c66d4fe3cec79f4ddd852f16f8e68",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x679ac548468089b4ada3dab4ada7c97b8ea6c6bf46bdaf117b7cf0ad1c7c2a83",
+                    "hash" : "0x2766392b322e4bc9ec7c60c6699445acdc7c66d4fe3cec79f4ddd852f16f8e68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x2766392b322e4bc9ec7c60c6699445acdc7c66d4fe3cec79f4ddd852f16f8e68",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x679ac548468089b4ada3dab4ada7c97b8ea6c6bf46bdaf117b7cf0ad1c7c2a83",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x2766392b322e4bc9ec7c60c6699445acdc7c66d4fe3cec79f4ddd852f16f8e68",
+                    "hash" : "0x679ac548468089b4ada3dab4ada7c97b8ea6c6bf46bdaf117b7cf0ad1c7c2a83",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/InternlCallStoreClearsOOG.json b/GeneralStateTests/stTransactionTest/InternlCallStoreClearsOOG.json
index 301370628..808e7e79e 100644
--- a/GeneralStateTests/stTransactionTest/InternlCallStoreClearsOOG.json
+++ b/GeneralStateTests/stTransactionTest/InternlCallStoreClearsOOG.json
@@ -2,7 +2,7 @@
     "InternlCallStoreClearsOOG" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/InternlCallStoreClearsOOGFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xc9e68239859ea35d4730ef47b0d8c9df5dfceb5d45f75b13c5cd4ad4790c797a",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xc9e68239859ea35d4730ef47b0d8c9df5dfceb5d45f75b13c5cd4ad4790c797a",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x2ad48fd172154544728a6ab6729ced747f40205158e83444b5e59697fc83cc3e",
+                    "hash" : "0xc9e68239859ea35d4730ef47b0d8c9df5dfceb5d45f75b13c5cd4ad4790c797a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xc9e68239859ea35d4730ef47b0d8c9df5dfceb5d45f75b13c5cd4ad4790c797a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x2ad48fd172154544728a6ab6729ced747f40205158e83444b5e59697fc83cc3e",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xc9e68239859ea35d4730ef47b0d8c9df5dfceb5d45f75b13c5cd4ad4790c797a",
+                    "hash" : "0x2ad48fd172154544728a6ab6729ced747f40205158e83444b5e59697fc83cc3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/InternlCallStoreClearsSucces.json b/GeneralStateTests/stTransactionTest/InternlCallStoreClearsSucces.json
index b9d2a87d4..5beb7c7a0 100644
--- a/GeneralStateTests/stTransactionTest/InternlCallStoreClearsSucces.json
+++ b/GeneralStateTests/stTransactionTest/InternlCallStoreClearsSucces.json
@@ -2,7 +2,7 @@
     "InternlCallStoreClearsSucces" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/InternlCallStoreClearsSuccesFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x7405ca6ab4131e0ca94db673e5a959548010ef11f7f2bd0b0bd317bea2ffff89",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x7405ca6ab4131e0ca94db673e5a959548010ef11f7f2bd0b0bd317bea2ffff89",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x2adbd104f00ce42e212bb8d44a4f34c4702a60e7cde64507bba7da169c6dd22a",
+                    "hash" : "0x7405ca6ab4131e0ca94db673e5a959548010ef11f7f2bd0b0bd317bea2ffff89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x7405ca6ab4131e0ca94db673e5a959548010ef11f7f2bd0b0bd317bea2ffff89",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x2adbd104f00ce42e212bb8d44a4f34c4702a60e7cde64507bba7da169c6dd22a",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x7405ca6ab4131e0ca94db673e5a959548010ef11f7f2bd0b0bd317bea2ffff89",
+                    "hash" : "0x2adbd104f00ce42e212bb8d44a4f34c4702a60e7cde64507bba7da169c6dd22a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/OverflowGasRequire.json b/GeneralStateTests/stTransactionTest/OverflowGasRequire.json
index e4f4039de..0ffb0bd63 100644
--- a/GeneralStateTests/stTransactionTest/OverflowGasRequire.json
+++ b/GeneralStateTests/stTransactionTest/OverflowGasRequire.json
@@ -2,7 +2,7 @@
     "OverflowGasRequire" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/OverflowGasRequireFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/OverflowGasRequire2.json b/GeneralStateTests/stTransactionTest/OverflowGasRequire2.json
index 8f1578610..85fd13f7c 100644
--- a/GeneralStateTests/stTransactionTest/OverflowGasRequire2.json
+++ b/GeneralStateTests/stTransactionTest/OverflowGasRequire2.json
@@ -2,7 +2,7 @@
     "OverflowGasRequire2" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/OverflowGasRequire2Filler.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x928134bdccde9e51f4a737d2d227f8109915db01191585aad9341b3de67f83bb",
+                    "hash" : "0x7f450a15a566a5af02d0cfd23bada4f0f6963d85c1a20f33eb8dffe2b55262f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x7f450a15a566a5af02d0cfd23bada4f0f6963d85c1a20f33eb8dffe2b55262f2",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x928134bdccde9e51f4a737d2d227f8109915db01191585aad9341b3de67f83bb",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x7f450a15a566a5af02d0cfd23bada4f0f6963d85c1a20f33eb8dffe2b55262f2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x928134bdccde9e51f4a737d2d227f8109915db01191585aad9341b3de67f83bb",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x7f450a15a566a5af02d0cfd23bada4f0f6963d85c1a20f33eb8dffe2b55262f2",
+                    "hash" : "0x928134bdccde9e51f4a737d2d227f8109915db01191585aad9341b3de67f83bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/RefundOverflow.json b/GeneralStateTests/stTransactionTest/RefundOverflow.json
index 79b860000..5de4411ee 100644
--- a/GeneralStateTests/stTransactionTest/RefundOverflow.json
+++ b/GeneralStateTests/stTransactionTest/RefundOverflow.json
@@ -2,7 +2,7 @@
     "RefundOverflow" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflowFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/RefundOverflow2.json b/GeneralStateTests/stTransactionTest/RefundOverflow2.json
index a5f1ed3b5..d39534fe8 100644
--- a/GeneralStateTests/stTransactionTest/RefundOverflow2.json
+++ b/GeneralStateTests/stTransactionTest/RefundOverflow2.json
@@ -2,7 +2,7 @@
     "RefundOverflow2" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflow2Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOG.json b/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOG.json
index 4604a46f6..523311ed8 100644
--- a/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOG.json
+++ b/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOG.json
@@ -2,7 +2,7 @@
     "StoreClearsAndInternlCallStoreClearsOOG" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOGFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xe34a15a4c108a728623ec726686e2712d79af48fb40a609d96d421bdaa83e402",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xe34a15a4c108a728623ec726686e2712d79af48fb40a609d96d421bdaa83e402",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x860acf740a21f4aa3656c5d77e74502a3dba158b1abc35e74b2d0a8143382a7e",
+                    "hash" : "0xe34a15a4c108a728623ec726686e2712d79af48fb40a609d96d421bdaa83e402",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xe34a15a4c108a728623ec726686e2712d79af48fb40a609d96d421bdaa83e402",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x860acf740a21f4aa3656c5d77e74502a3dba158b1abc35e74b2d0a8143382a7e",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xe34a15a4c108a728623ec726686e2712d79af48fb40a609d96d421bdaa83e402",
+                    "hash" : "0x860acf740a21f4aa3656c5d77e74502a3dba158b1abc35e74b2d0a8143382a7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccess.json b/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccess.json
index 29da17639..27707b02d 100644
--- a/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccess.json
+++ b/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccess.json
@@ -2,7 +2,7 @@
     "StoreClearsAndInternlCallStoreClearsSuccess" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccessFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x488534cbee9b940581e2e9d39c252750b6b3582e5a159e1593ae1f36e17168db",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x488534cbee9b940581e2e9d39c252750b6b3582e5a159e1593ae1f36e17168db",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xb5ae140f33246605ed01f44613b78305993d1edd4b87f62151f09146d9111c24",
+                    "hash" : "0x488534cbee9b940581e2e9d39c252750b6b3582e5a159e1593ae1f36e17168db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x488534cbee9b940581e2e9d39c252750b6b3582e5a159e1593ae1f36e17168db",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xb5ae140f33246605ed01f44613b78305993d1edd4b87f62151f09146d9111c24",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x488534cbee9b940581e2e9d39c252750b6b3582e5a159e1593ae1f36e17168db",
+                    "hash" : "0xb5ae140f33246605ed01f44613b78305993d1edd4b87f62151f09146d9111c24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json b/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json
index 291e31ed3..39bce2d35 100644
--- a/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json
+++ b/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json
@@ -2,7 +2,7 @@
     "StoreGasOnCreate" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/StoreGasOnCreateFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x981251c50c9eaf41a1b1c05b9e396999e16dda2117366dfc6435e930f9024a6b",
+                    "hash" : "0xf89245b6f80697b4b587dfbe85a9cc1fd2a9ef3b4d8fc4bac922c2c2a4de2974",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf89245b6f80697b4b587dfbe85a9cc1fd2a9ef3b4d8fc4bac922c2c2a4de2974",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xec303faac197a7d9d7602656492d111348e936d7cf5a58ee923b13db4028c53c",
+                    "hash" : "0x981251c50c9eaf41a1b1c05b9e396999e16dda2117366dfc6435e930f9024a6b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xf89245b6f80697b4b587dfbe85a9cc1fd2a9ef3b4d8fc4bac922c2c2a4de2974",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xec303faac197a7d9d7602656492d111348e936d7cf5a58ee923b13db4028c53c",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xf89245b6f80697b4b587dfbe85a9cc1fd2a9ef3b4d8fc4bac922c2c2a4de2974",
+                    "hash" : "0xec303faac197a7d9d7602656492d111348e936d7cf5a58ee923b13db4028c53c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCall.json b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCall.json
index 0611dbd68..cb149e11f 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCall.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCall.json
@@ -2,7 +2,7 @@
     "SuicidesAndInternlCallSuicidesBonusGasAtCall" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x38d59e131e4d4e76ec2c1fe16066a42649618c65eba3cf6c776ab41a09821c62",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x38d59e131e4d4e76ec2c1fe16066a42649618c65eba3cf6c776ab41a09821c62",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x9bdb18aab851bd449403247691c69d81c785cf22e6e8a0150c29cbe778e1c8da",
+                    "hash" : "0x38d59e131e4d4e76ec2c1fe16066a42649618c65eba3cf6c776ab41a09821c62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x38d59e131e4d4e76ec2c1fe16066a42649618c65eba3cf6c776ab41a09821c62",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x9bdb18aab851bd449403247691c69d81c785cf22e6e8a0150c29cbe778e1c8da",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x38d59e131e4d4e76ec2c1fe16066a42649618c65eba3cf6c776ab41a09821c62",
+                    "hash" : "0x9bdb18aab851bd449403247691c69d81c785cf22e6e8a0150c29cbe778e1c8da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailed.json b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailed.json
index 20f9aab81..d279390fa 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailed.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailed.json
@@ -2,7 +2,7 @@
     "SuicidesAndInternlCallSuicidesBonusGasAtCallFailed" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailedFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x67e8629b58470a4fe1c51cf03c7f0f6093f6dd3564c02879f0ae10830c179307",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x67e8629b58470a4fe1c51cf03c7f0f6093f6dd3564c02879f0ae10830c179307",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x7437f919a123aec38b460e95dc8d77c33c92d92dc68efc2fd2d541960f4192ad",
+                    "hash" : "0x67e8629b58470a4fe1c51cf03c7f0f6093f6dd3564c02879f0ae10830c179307",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x67e8629b58470a4fe1c51cf03c7f0f6093f6dd3564c02879f0ae10830c179307",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x7437f919a123aec38b460e95dc8d77c33c92d92dc68efc2fd2d541960f4192ad",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x67e8629b58470a4fe1c51cf03c7f0f6093f6dd3564c02879f0ae10830c179307",
+                    "hash" : "0x7437f919a123aec38b460e95dc8d77c33c92d92dc68efc2fd2d541960f4192ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesOOG.json b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesOOG.json
index 15de431cd..8d9f4cc28 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesOOG.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesOOG.json
@@ -2,7 +2,7 @@
     "SuicidesAndInternlCallSuicidesOOG" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesOOGFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xb9db1ad8faa2ab7375b7e3214d04e444c7bae2eaa9c6555e1506d5421f5b89be",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xb9db1ad8faa2ab7375b7e3214d04e444c7bae2eaa9c6555e1506d5421f5b89be",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xb9db1ad8faa2ab7375b7e3214d04e444c7bae2eaa9c6555e1506d5421f5b89be",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xb9db1ad8faa2ab7375b7e3214d04e444c7bae2eaa9c6555e1506d5421f5b89be",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xb9db1ad8faa2ab7375b7e3214d04e444c7bae2eaa9c6555e1506d5421f5b89be",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xb9db1ad8faa2ab7375b7e3214d04e444c7bae2eaa9c6555e1506d5421f5b89be",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json
index c39a2540c..a710d36b1 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json
@@ -2,7 +2,7 @@
     "SuicidesAndInternlCallSuicidesSuccess" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesSuccessFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x128115aec92c4018e4356912d56025520a6ef7fdaef2498b48c046fc5f1f957d",
                     "indexes" : {
@@ -36,7 +36,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x128115aec92c4018e4356912d56025520a6ef7fdaef2498b48c046fc5f1f957d",
                     "indexes" : {
@@ -58,9 +58,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xedcf939a1838a72b983b33625bb64aafe89e5dc0e6868f13f75aa8b8ed4676b5",
+                    "hash" : "0x128115aec92c4018e4356912d56025520a6ef7fdaef2498b48c046fc5f1f957d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -70,7 +70,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xedcf939a1838a72b983b33625bb64aafe89e5dc0e6868f13f75aa8b8ed4676b5",
+                    "hash" : "0xb09e2c82c72eab1acce2b3a97356325801b519b38bb3812e01a9f2e0b3f053cb",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -80,7 +80,29 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x128115aec92c4018e4356912d56025520a6ef7fdaef2498b48c046fc5f1f957d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xb09e2c82c72eab1acce2b3a97356325801b519b38bb3812e01a9f2e0b3f053cb",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xedcf939a1838a72b983b33625bb64aafe89e5dc0e6868f13f75aa8b8ed4676b5",
                     "indexes" : {
@@ -102,9 +124,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x128115aec92c4018e4356912d56025520a6ef7fdaef2498b48c046fc5f1f957d",
+                    "hash" : "0xedcf939a1838a72b983b33625bb64aafe89e5dc0e6868f13f75aa8b8ed4676b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -114,7 +136,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xb09e2c82c72eab1acce2b3a97356325801b519b38bb3812e01a9f2e0b3f053cb",
+                    "hash" : "0xedcf939a1838a72b983b33625bb64aafe89e5dc0e6868f13f75aa8b8ed4676b5",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyed.json b/GeneralStateTests/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyed.json
index 38357057f..7aa981636 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyed.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyed.json
@@ -2,7 +2,7 @@
     "SuicidesAndSendMoneyToItselfEtherDestroyed" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyedFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x8b093cfb172562c95fdc93897a0c9133270c68b3010ce4d586ce4247b706483f",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x8b093cfb172562c95fdc93897a0c9133270c68b3010ce4d586ce4247b706483f",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x6dd22dec58b209e1234c1fbfab5251329a95e1a708723ea9a5aad999967be8cd",
+                    "hash" : "0x8b093cfb172562c95fdc93897a0c9133270c68b3010ce4d586ce4247b706483f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x8b093cfb172562c95fdc93897a0c9133270c68b3010ce4d586ce4247b706483f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x6dd22dec58b209e1234c1fbfab5251329a95e1a708723ea9a5aad999967be8cd",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x8b093cfb172562c95fdc93897a0c9133270c68b3010ce4d586ce4247b706483f",
+                    "hash" : "0x6dd22dec58b209e1234c1fbfab5251329a95e1a708723ea9a5aad999967be8cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json b/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json
index 17805ed5a..a6ad1e7d4 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json
@@ -2,7 +2,7 @@
     "SuicidesMixingCoinbase" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xebb113c5ae196dafdbb9c9a8e77c02e7b1e6bb6faf4339ea869bb1d0a6b9559f",
                     "indexes" : {
@@ -36,7 +36,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xebb113c5ae196dafdbb9c9a8e77c02e7b1e6bb6faf4339ea869bb1d0a6b9559f",
                     "indexes" : {
@@ -58,9 +58,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x6b09010bb30d1549da181bece2a888b61748c94829410ceb38bccdf8bd226ee2",
+                    "hash" : "0xebb113c5ae196dafdbb9c9a8e77c02e7b1e6bb6faf4339ea869bb1d0a6b9559f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -70,7 +70,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x6b09010bb30d1549da181bece2a888b61748c94829410ceb38bccdf8bd226ee2",
+                    "hash" : "0x101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -80,7 +80,29 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xebb113c5ae196dafdbb9c9a8e77c02e7b1e6bb6faf4339ea869bb1d0a6b9559f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x6b09010bb30d1549da181bece2a888b61748c94829410ceb38bccdf8bd226ee2",
                     "indexes" : {
@@ -102,9 +124,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xebb113c5ae196dafdbb9c9a8e77c02e7b1e6bb6faf4339ea869bb1d0a6b9559f",
+                    "hash" : "0x6b09010bb30d1549da181bece2a888b61748c94829410ceb38bccdf8bd226ee2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -114,7 +136,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4",
+                    "hash" : "0x6b09010bb30d1549da181bece2a888b61748c94829410ceb38bccdf8bd226ee2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
diff --git a/GeneralStateTests/stTransactionTest/SuicidesStopAfterSuicide.json b/GeneralStateTests/stTransactionTest/SuicidesStopAfterSuicide.json
index 5a4374c8a..e4c10c8ff 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesStopAfterSuicide.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesStopAfterSuicide.json
@@ -2,7 +2,7 @@
     "SuicidesStopAfterSuicide" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/SuicidesStopAfterSuicideFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x8fa1ffcea85df2b5017dc0f74dc680bd0c308fdd19b0d74c2a8fcb4b99d27f61",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x8fa1ffcea85df2b5017dc0f74dc680bd0c308fdd19b0d74c2a8fcb4b99d27f61",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xdc9bf412e9770d2c1500b0be40f27b91d966320ea211c96f34faba0d4d7fb2c0",
+                    "hash" : "0x8fa1ffcea85df2b5017dc0f74dc680bd0c308fdd19b0d74c2a8fcb4b99d27f61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x8fa1ffcea85df2b5017dc0f74dc680bd0c308fdd19b0d74c2a8fcb4b99d27f61",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xdc9bf412e9770d2c1500b0be40f27b91d966320ea211c96f34faba0d4d7fb2c0",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x8fa1ffcea85df2b5017dc0f74dc680bd0c308fdd19b0d74c2a8fcb4b99d27f61",
+                    "hash" : "0xdc9bf412e9770d2c1500b0be40f27b91d966320ea211c96f34faba0d4d7fb2c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/TransactionDataCosts652.json b/GeneralStateTests/stTransactionTest/TransactionDataCosts652.json
index c4e6a7ab4..df4dc4edf 100644
--- a/GeneralStateTests/stTransactionTest/TransactionDataCosts652.json
+++ b/GeneralStateTests/stTransactionTest/TransactionDataCosts652.json
@@ -2,7 +2,7 @@
     "TransactionDataCosts652" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/TransactionDataCosts652Filler.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x2df913175b2031af6b36c9da0197f325e1c175b774b3338d86319a5bdf9ec257",
+                    "hash" : "0x8dca95be8393071025319ae78d7804a6ec176d716711c8bff783950d11cad4bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x8dca95be8393071025319ae78d7804a6ec176d716711c8bff783950d11cad4bb",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x2df913175b2031af6b36c9da0197f325e1c175b774b3338d86319a5bdf9ec257",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x8dca95be8393071025319ae78d7804a6ec176d716711c8bff783950d11cad4bb",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x2df913175b2031af6b36c9da0197f325e1c175b774b3338d86319a5bdf9ec257",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x8dca95be8393071025319ae78d7804a6ec176d716711c8bff783950d11cad4bb",
+                    "hash" : "0x2df913175b2031af6b36c9da0197f325e1c175b774b3338d86319a5bdf9ec257",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit.json b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit.json
index 695ffadf4..3af8ea04d 100644
--- a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit.json
+++ b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit.json
@@ -2,7 +2,7 @@
     "TransactionFromCoinbaseHittingBlockGasLimit" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimitFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x5438f629c851f45088db1f479003aa8517c0cbe106008db7a44f63ea4a1f3967",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x5438f629c851f45088db1f479003aa8517c0cbe106008db7a44f63ea4a1f3967",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x5438f629c851f45088db1f479003aa8517c0cbe106008db7a44f63ea4a1f3967",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x5438f629c851f45088db1f479003aa8517c0cbe106008db7a44f63ea4a1f3967",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x5438f629c851f45088db1f479003aa8517c0cbe106008db7a44f63ea4a1f3967",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x5438f629c851f45088db1f479003aa8517c0cbe106008db7a44f63ea4a1f3967",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1.json b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1.json
index f59071b99..9f1a85b20 100644
--- a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1.json
+++ b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1.json
@@ -2,7 +2,7 @@
     "TransactionFromCoinbaseHittingBlockGasLimit1" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseNotEnoughFounds.json b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseNotEnoughFounds.json
index c776cd358..09e8e08a5 100644
--- a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseNotEnoughFounds.json
+++ b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseNotEnoughFounds.json
@@ -2,7 +2,7 @@
     "TransactionFromCoinbaseNotEnoughFounds" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/TransactionFromCoinbaseNotEnoughFoundsFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionNonceCheck.json b/GeneralStateTests/stTransactionTest/TransactionNonceCheck.json
index 1e3f5c548..9ea7a87ef 100644
--- a/GeneralStateTests/stTransactionTest/TransactionNonceCheck.json
+++ b/GeneralStateTests/stTransactionTest/TransactionNonceCheck.json
@@ -2,7 +2,7 @@
     "TransactionNonceCheck" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheckFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xfdb4ec6fbe1f71e310dcbd7efaa690f8e6acf00bb5bf7940b39af182cd5f92aa",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xfdb4ec6fbe1f71e310dcbd7efaa690f8e6acf00bb5bf7940b39af182cd5f92aa",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xfdb4ec6fbe1f71e310dcbd7efaa690f8e6acf00bb5bf7940b39af182cd5f92aa",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xfdb4ec6fbe1f71e310dcbd7efaa690f8e6acf00bb5bf7940b39af182cd5f92aa",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xfdb4ec6fbe1f71e310dcbd7efaa690f8e6acf00bb5bf7940b39af182cd5f92aa",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xfdb4ec6fbe1f71e310dcbd7efaa690f8e6acf00bb5bf7940b39af182cd5f92aa",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionNonceCheck2.json b/GeneralStateTests/stTransactionTest/TransactionNonceCheck2.json
index f035ce6f8..683a5519b 100644
--- a/GeneralStateTests/stTransactionTest/TransactionNonceCheck2.json
+++ b/GeneralStateTests/stTransactionTest/TransactionNonceCheck2.json
@@ -2,7 +2,7 @@
     "TransactionNonceCheck2" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheck2Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json b/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json
index a48cdc348..77413e8da 100644
--- a/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json
+++ b/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json
@@ -2,7 +2,7 @@
     "TransactionSendingToEmpty" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/TransactionSendingToEmptyFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
+                    "hash" : "0x01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xcf29b86efa1b7f5f999ef519fcc921062924d5c14d78baf491252fbf5a0d85b8",
+                    "hash" : "0x53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
+                    "hash" : "0x01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
+                    "hash" : "0xcf29b86efa1b7f5f999ef519fcc921062924d5c14d78baf491252fbf5a0d85b8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/TransactionSendingToZero.json b/GeneralStateTests/stTransactionTest/TransactionSendingToZero.json
index 166c0dcc6..da665ddf5 100644
--- a/GeneralStateTests/stTransactionTest/TransactionSendingToZero.json
+++ b/GeneralStateTests/stTransactionTest/TransactionSendingToZero.json
@@ -2,7 +2,7 @@
     "TransactionSendingToZero" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/TransactionSendingToZeroFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xb7e0e61fec1cd4c8eee3e2f5e571716440f43a55bd2d2068fc276cb20c0bf5f4",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xb7e0e61fec1cd4c8eee3e2f5e571716440f43a55bd2d2068fc276cb20c0bf5f4",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xb7e0e61fec1cd4c8eee3e2f5e571716440f43a55bd2d2068fc276cb20c0bf5f4",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xb7e0e61fec1cd4c8eee3e2f5e571716440f43a55bd2d2068fc276cb20c0bf5f4",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xb7e0e61fec1cd4c8eee3e2f5e571716440f43a55bd2d2068fc276cb20c0bf5f4",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xb7e0e61fec1cd4c8eee3e2f5e571716440f43a55bd2d2068fc276cb20c0bf5f4",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionToAddressh160minusOne.json b/GeneralStateTests/stTransactionTest/TransactionToAddressh160minusOne.json
index e0ff5a7f8..abbfdd08b 100644
--- a/GeneralStateTests/stTransactionTest/TransactionToAddressh160minusOne.json
+++ b/GeneralStateTests/stTransactionTest/TransactionToAddressh160minusOne.json
@@ -2,7 +2,7 @@
     "TransactionToAddressh160minusOne" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/TransactionToAddressh160minusOneFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xc406c576c227c1f4e33a5044b87c619a494004546ce997d2b424d70609ac32c3",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xc406c576c227c1f4e33a5044b87c619a494004546ce997d2b424d70609ac32c3",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xc406c576c227c1f4e33a5044b87c619a494004546ce997d2b424d70609ac32c3",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xc406c576c227c1f4e33a5044b87c619a494004546ce997d2b424d70609ac32c3",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xc406c576c227c1f4e33a5044b87c619a494004546ce997d2b424d70609ac32c3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xc406c576c227c1f4e33a5044b87c619a494004546ce997d2b424d70609ac32c3",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionToItself.json b/GeneralStateTests/stTransactionTest/TransactionToItself.json
index b71a649b5..0cf549bdc 100644
--- a/GeneralStateTests/stTransactionTest/TransactionToItself.json
+++ b/GeneralStateTests/stTransactionTest/TransactionToItself.json
@@ -2,7 +2,7 @@
     "TransactionToItself" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/TransactionToItselfFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x387018dfa6e56ba2a1b7fc2641d6b3377fd589b23a4b8bde3966423afbd69cae",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x387018dfa6e56ba2a1b7fc2641d6b3377fd589b23a4b8bde3966423afbd69cae",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x387018dfa6e56ba2a1b7fc2641d6b3377fd589b23a4b8bde3966423afbd69cae",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x387018dfa6e56ba2a1b7fc2641d6b3377fd589b23a4b8bde3966423afbd69cae",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x387018dfa6e56ba2a1b7fc2641d6b3377fd589b23a4b8bde3966423afbd69cae",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x387018dfa6e56ba2a1b7fc2641d6b3377fd589b23a4b8bde3966423afbd69cae",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionToItselfNotEnoughFounds.json b/GeneralStateTests/stTransactionTest/TransactionToItselfNotEnoughFounds.json
index 129999ca3..f9544b5f9 100644
--- a/GeneralStateTests/stTransactionTest/TransactionToItselfNotEnoughFounds.json
+++ b/GeneralStateTests/stTransactionTest/TransactionToItselfNotEnoughFounds.json
@@ -2,7 +2,7 @@
     "TransactionToItselfNotEnoughFounds" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/TransactionToItselfNotEnoughFoundsFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCost.json b/GeneralStateTests/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCost.json
index f0f1db3c3..e19f36b34 100644
--- a/GeneralStateTests/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCost.json
+++ b/GeneralStateTests/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCost.json
@@ -2,7 +2,7 @@
     "UserTransactionGasLimitIsTooLowWhenZeroCost" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCostFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x5bbf78f4da91159120044b2cee74ebd400cc5a2b5f54e7d9833afa156ad35d6c",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x5bbf78f4da91159120044b2cee74ebd400cc5a2b5f54e7d9833afa156ad35d6c",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x5bbf78f4da91159120044b2cee74ebd400cc5a2b5f54e7d9833afa156ad35d6c",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x5bbf78f4da91159120044b2cee74ebd400cc5a2b5f54e7d9833afa156ad35d6c",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x5bbf78f4da91159120044b2cee74ebd400cc5a2b5f54e7d9833afa156ad35d6c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x5bbf78f4da91159120044b2cee74ebd400cc5a2b5f54e7d9833afa156ad35d6c",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json b/GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json
index 9c20b0e35..26ab57833 100644
--- a/GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json
+++ b/GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json
@@ -2,7 +2,7 @@
     "UserTransactionZeroCost" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionZeroCostFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xa2bff976f733022a4932ccfca0b8049b1569bfa83309e50b1fe698ec3d8e3c74",
+                    "hash" : "0x6fa96e06aa7cafbd86e0d99b4cbd4b2924eb3e5c8d66eccba3b11a2c93907652",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x6fa96e06aa7cafbd86e0d99b4cbd4b2924eb3e5c8d66eccba3b11a2c93907652",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xa2bff976f733022a4932ccfca0b8049b1569bfa83309e50b1fe698ec3d8e3c74",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x6fa96e06aa7cafbd86e0d99b4cbd4b2924eb3e5c8d66eccba3b11a2c93907652",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xa2bff976f733022a4932ccfca0b8049b1569bfa83309e50b1fe698ec3d8e3c74",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x6fa96e06aa7cafbd86e0d99b4cbd4b2924eb3e5c8d66eccba3b11a2c93907652",
+                    "hash" : "0xa2bff976f733022a4932ccfca0b8049b1569bfa83309e50b1fe698ec3d8e3c74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json b/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json
index 4034265b5..7a6dc43cd 100644
--- a/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json
+++ b/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json
@@ -2,7 +2,7 @@
     "UserTransactionZeroCostWithData" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionZeroCostWithDataFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba",
+                    "hash" : "0xa58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba",
+                    "hash" : "0xa58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -36,7 +36,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1",
                     "indexes" : {
@@ -58,7 +58,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba",
                     "indexes" : {
@@ -80,7 +80,29 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xa58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xa58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba",
                     "indexes" : {
@@ -102,9 +124,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xa58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1",
+                    "hash" : "0x3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -114,7 +136,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xa58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1",
+                    "hash" : "0x3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreate.json b/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreate.json
index d7f090412..8c7d91bcb 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreate.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreate.json
@@ -2,7 +2,7 @@
     "zeroSigTransacrionCreate" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransacrionCreateFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
@@ -136,7 +136,129 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
+                {
+                    "hash" : "0x0673ca46ef9ac57cee329d3a20161c6dd6b5722b59191335976819b2136e2682",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x0673ca46ef9ac57cee329d3a20161c6dd6b5722b59191335976819b2136e2682",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x8d486aa40ba989a61868aa75f97b3b7e722cec7963356ae46dde3e4b48b6b94d",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP150" : [
                 {
                     "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
@@ -258,7 +380,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP158" : [
                 {
                     "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
@@ -380,7 +502,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "Frontier" : [
                 {
                     "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
@@ -502,9 +624,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x0673ca46ef9ac57cee329d3a20161c6dd6b5722b59191335976819b2136e2682",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -534,7 +656,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x0673ca46ef9ac57cee329d3a20161c6dd6b5722b59191335976819b2136e2682",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -614,7 +736,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x8d486aa40ba989a61868aa75f97b3b7e722cec7963356ae46dde3e4b48b6b94d",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 3,
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreatePrice0.json b/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreatePrice0.json
index b369999bc..aa3d89c2e 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreatePrice0.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreatePrice0.json
@@ -2,7 +2,7 @@
     "zeroSigTransacrionCreatePrice0" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransacrionCreatePrice0Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
@@ -136,7 +136,129 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
+                {
+                    "hash" : "0xfb2ea6e0ff1e07388976b5a96337d9b1fcb37f5a01559b06823e70a022f1c2c9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xfb2ea6e0ff1e07388976b5a96337d9b1fcb37f5a01559b06823e70a022f1c2c9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xfb2ea6e0ff1e07388976b5a96337d9b1fcb37f5a01559b06823e70a022f1c2c9",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xfb2ea6e0ff1e07388976b5a96337d9b1fcb37f5a01559b06823e70a022f1c2c9",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP150" : [
                 {
                     "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
@@ -258,7 +380,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP158" : [
                 {
                     "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
@@ -380,7 +502,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "Frontier" : [
                 {
                     "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
@@ -502,9 +624,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xfb2ea6e0ff1e07388976b5a96337d9b1fcb37f5a01559b06823e70a022f1c2c9",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -534,7 +656,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xfb2ea6e0ff1e07388976b5a96337d9b1fcb37f5a01559b06823e70a022f1c2c9",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -584,7 +706,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xfb2ea6e0ff1e07388976b5a96337d9b1fcb37f5a01559b06823e70a022f1c2c9",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -614,7 +736,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xfb2ea6e0ff1e07388976b5a96337d9b1fcb37f5a01559b06823e70a022f1c2c9",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 3,
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransaction.json b/GeneralStateTests/stTransactionTest/zeroSigTransaction.json
index 82b4c0256..24d429ecb 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransaction.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransaction.json
@@ -2,7 +2,7 @@
     "zeroSigTransaction" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
@@ -256,7 +256,249 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
+                {
+                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP150" : [
                 {
                     "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
@@ -498,7 +740,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP158" : [
                 {
                     "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
@@ -740,7 +982,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "Frontier" : [
                 {
                     "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
@@ -982,9 +1224,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -1074,7 +1316,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -1104,7 +1346,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -1194,7 +1436,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransaction0Price.json b/GeneralStateTests/stTransactionTest/zeroSigTransaction0Price.json
index 01702c3b9..73ea5b153 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransaction0Price.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransaction0Price.json
@@ -2,7 +2,7 @@
     "zeroSigTransaction0Price" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransaction0PriceFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
@@ -176,7 +176,169 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
+                {
+                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP150" : [
                 {
                     "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
@@ -338,7 +500,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP158" : [
                 {
                     "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
@@ -500,7 +662,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "Frontier" : [
                 {
                     "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
@@ -662,9 +824,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -724,7 +886,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -744,7 +906,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -804,7 +966,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransactionInvChainID.json b/GeneralStateTests/stTransactionTest/zeroSigTransactionInvChainID.json
index f9d1bf974..5dbdcce78 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransactionInvChainID.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransactionInvChainID.json
@@ -2,7 +2,7 @@
     "zeroSigTransactionInvChainID" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionInvChainIDFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
@@ -136,7 +136,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
@@ -258,7 +258,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
@@ -380,7 +380,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
@@ -502,7 +502,129 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransactionInvNonce.json b/GeneralStateTests/stTransactionTest/zeroSigTransactionInvNonce.json
index bcf7c0c9b..d2cd90eeb 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransactionInvNonce.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransactionInvNonce.json
@@ -2,7 +2,7 @@
     "zeroSigTransactionInvNonce" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionInvNonceFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
@@ -136,7 +136,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
@@ -258,7 +258,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
@@ -380,7 +380,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
@@ -502,7 +502,129 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransactionInvNonce2.json b/GeneralStateTests/stTransactionTest/zeroSigTransactionInvNonce2.json
index b7e312f61..27e476dde 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransactionInvNonce2.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransactionInvNonce2.json
@@ -2,7 +2,7 @@
     "zeroSigTransactionInvNonce2" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionInvNonce2Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
@@ -136,7 +136,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
@@ -258,7 +258,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
@@ -380,7 +380,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
@@ -502,7 +502,129 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransactionOOG.json b/GeneralStateTests/stTransactionTest/zeroSigTransactionOOG.json
index 953b688f9..7a9f0f18e 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransactionOOG.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransactionOOG.json
@@ -2,7 +2,7 @@
     "zeroSigTransactionOOG" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionOOGFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
@@ -176,7 +176,169 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
+                {
+                    "hash" : "0x7bfed3b071d3fde42caf517a24c3a4361124eff0c63743de92b847eeb162d526",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xd506140af993cf273f1e9984a13cd06c1d469640180a5b5a78907e75ae230098",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x7bfed3b071d3fde42caf517a24c3a4361124eff0c63743de92b847eeb162d526",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x7bfed3b071d3fde42caf517a24c3a4361124eff0c63743de92b847eeb162d526",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x7bfed3b071d3fde42caf517a24c3a4361124eff0c63743de92b847eeb162d526",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP150" : [
                 {
                     "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
@@ -338,7 +500,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP158" : [
                 {
                     "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
@@ -500,7 +662,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "Frontier" : [
                 {
                     "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
@@ -662,9 +824,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x7bfed3b071d3fde42caf517a24c3a4361124eff0c63743de92b847eeb162d526",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -704,7 +866,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xd506140af993cf273f1e9984a13cd06c1d469640180a5b5a78907e75ae230098",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -724,7 +886,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x7bfed3b071d3fde42caf517a24c3a4361124eff0c63743de92b847eeb162d526",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -744,7 +906,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x7bfed3b071d3fde42caf517a24c3a4361124eff0c63743de92b847eeb162d526",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -804,7 +966,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x7bfed3b071d3fde42caf517a24c3a4361124eff0c63743de92b847eeb162d526",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransactionOrigin.json b/GeneralStateTests/stTransactionTest/zeroSigTransactionOrigin.json
index 1ea7b29ff..956ad3b82 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransactionOrigin.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransactionOrigin.json
@@ -2,7 +2,7 @@
     "zeroSigTransactionOrigin" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionOriginFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
                     "indexes" : {
@@ -136,7 +136,129 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
+                {
+                    "hash" : "0xf2399d4632dfd83a0e73d9612af1e7b9c251d135bc3aa2762a337f6f058bc780",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xf2399d4632dfd83a0e73d9612af1e7b9c251d135bc3aa2762a337f6f058bc780",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP150" : [
                 {
                     "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
                     "indexes" : {
@@ -258,7 +380,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP158" : [
                 {
                     "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
                     "indexes" : {
@@ -380,7 +502,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "Frontier" : [
                 {
                     "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
                     "indexes" : {
@@ -502,9 +624,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xf2399d4632dfd83a0e73d9612af1e7b9c251d135bc3aa2762a337f6f058bc780",
+                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -594,7 +716,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xf2399d4632dfd83a0e73d9612af1e7b9c251d135bc3aa2762a337f6f058bc780",
+                    "hash" : "0xd3c4d7538844e1ee5ffe42c00f13827eeee3fe619c9bd89b5dbbad7b713e106f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransactionToZero.json b/GeneralStateTests/stTransactionTest/zeroSigTransactionToZero.json
index 8714958d1..650023d33 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransactionToZero.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransactionToZero.json
@@ -2,7 +2,7 @@
     "zeroSigTransactionToZero" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionToZeroFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
@@ -256,7 +256,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
@@ -498,7 +498,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
@@ -740,7 +740,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
@@ -982,7 +982,249 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 3,
+                        "value" : 2
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransactionToZero2.json b/GeneralStateTests/stTransactionTest/zeroSigTransactionToZero2.json
index e901bfa38..ba63dd009 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransactionToZero2.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransactionToZero2.json
@@ -2,7 +2,7 @@
     "zeroSigTransactionToZero2" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionToZero2Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
                     "indexes" : {
@@ -196,7 +196,189 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
+                {
+                    "hash" : "0xb6b2051acd54464e50d02d05cb0ab705337e273629d075b4d692ba91dccfd946",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x2b9305b474b366b3d49b618a7861f3c08bfe13881dcb0b5416dd37842730ad82",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xbb83b7336c217b045b81eea2fdf484d903403c3d5f06f99c6ebdc5e2d07e9df5",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 2,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP150" : [
                 {
                     "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
                     "indexes" : {
@@ -378,7 +560,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP158" : [
                 {
                     "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
                     "indexes" : {
@@ -560,7 +742,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "Frontier" : [
                 {
                     "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
                     "indexes" : {
@@ -742,9 +924,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xb6b2051acd54464e50d02d05cb0ab705337e273629d075b4d692ba91dccfd946",
+                    "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -804,7 +986,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x2b9305b474b366b3d49b618a7861f3c08bfe13881dcb0b5416dd37842730ad82",
+                    "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -864,7 +1046,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xbb83b7336c217b045b81eea2fdf484d903403c3d5f06f99c6ebdc5e2d07e9df5",
+                    "hash" : "0x0328f2088fa252690e8de17ac980d00d786ebe12ffdf2940bbf76aebb69998af",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,