replace SUICIDE with SELFDESTRUCT

14 files changed, 124 insertions, 124 deletions

diff --git a/src/StateTestsFiller/EIP158/EIP150/stChangedTestsFiller.json b/src/StateTestsFiller/EIP158/EIP150/stChangedTestsFiller.json
index dee375034..7dcf29885 100644
--- a/src/StateTestsFiller/EIP158/EIP150/stChangedTestsFiller.json
+++ b/src/StateTestsFiller/EIP158/EIP150/stChangedTestsFiller.json
@@ -2334,7 +2334,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/src/StateTestsFiller/EIP158/EIP150/stEIPSpecificTestFiller.json b/src/StateTestsFiller/EIP158/EIP150/stEIPSpecificTestFiller.json
index 86fb47b85..a2a165a4d 100644
--- a/src/StateTestsFiller/EIP158/EIP150/stEIPSpecificTestFiller.json
+++ b/src/StateTestsFiller/EIP158/EIP150/stEIPSpecificTestFiller.json
@@ -529,7 +529,7 @@
                 "balance" : "0",
 		"nonce" : "0",
 		"code" : "Suicide to not existing account",
-		"code" : "{ (SUICIDE 0x2000000000000000000000000000000000000115) }",
+		"code" : "{ (SELFDESTRUCT 0x2000000000000000000000000000000000000115) }",
 		"storage": {
 		}
             }
@@ -586,7 +586,7 @@
                 "balance" : "0",
 		"nonce" : "0",
 		"code" : "Suicide to existing account",
-		"code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             }
diff --git a/src/StateTestsFiller/EIP158/Homestead/stCallCodesFiller.json b/src/StateTestsFiller/EIP158/Homestead/stCallCodesFiller.json
index b0ff7a237..80ca25ae3 100644
--- a/src/StateTestsFiller/EIP158/Homestead/stCallCodesFiller.json
+++ b/src/StateTestsFiller/EIP158/Homestead/stCallCodesFiller.json
@@ -3167,7 +3167,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3233,7 +3233,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3303,7 +3303,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3368,7 +3368,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3444,7 +3444,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3513,7 +3513,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3579,7 +3579,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3647,7 +3647,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3706,7 +3706,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3765,7 +3765,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3828,7 +3828,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3891,7 +3891,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3960,7 +3960,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4030,7 +4030,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4106,7 +4106,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4185,7 +4185,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4255,7 +4255,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4333,7 +4333,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4410,7 +4410,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4487,7 +4487,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/EIP158/Homestead/stCallCreateCallCodeTestFiller.json b/src/StateTestsFiller/EIP158/Homestead/stCallCreateCallCodeTestFiller.json
index b96b47839..dd5a297fa 100644
--- a/src/StateTestsFiller/EIP158/Homestead/stCallCreateCallCodeTestFiller.json
+++ b/src/StateTestsFiller/EIP158/Homestead/stCallCreateCallCodeTestFiller.json
@@ -976,7 +976,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x01 ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x01 ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1015,7 +1015,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0xf4 ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0xf4 ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1054,7 +1054,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x56 ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x56 ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1096,7 +1096,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1135,7 +1135,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SUICIDE (CREATE 1 0 64)) }",
+                "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SELFDESTRUCT (CREATE 1 0 64)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1174,7 +1174,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1000000000000000024 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1000000000000000024 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1208,7 +1208,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesCallCodeFiller.json b/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesCallCodeFiller.json
index fb629328b..c5fdfda65 100644
--- a/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesCallCodeFiller.json
+++ b/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesCallCodeFiller.json
@@ -2963,7 +2963,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3041,7 +3041,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3124,7 +3124,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3209,7 +3209,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3293,7 +3293,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3370,7 +3370,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3451,7 +3451,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 2 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 2 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3524,7 +3524,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3589,7 +3589,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3655,7 +3655,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3742,7 +3742,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3822,7 +3822,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3892,7 +3892,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3969,7 +3969,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4052,7 +4052,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4130,7 +4130,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4208,7 +4208,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesFiller.json b/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesFiller.json
index 77539dadc..cf39d2df4 100644
--- a/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesFiller.json
+++ b/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesFiller.json
@@ -2947,7 +2947,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3025,7 +3025,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3107,7 +3107,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3191,7 +3191,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3277,7 +3277,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3354,7 +3354,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3434,7 +3434,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3506,7 +3506,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3571,7 +3571,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3637,7 +3637,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3720,7 +3720,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3799,7 +3799,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3869,7 +3869,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3947,7 +3947,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4025,7 +4025,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4103,7 +4103,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4181,7 +4181,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/EIP158/Homestead/stRefundTestFiller.json b/src/StateTestsFiller/EIP158/Homestead/stRefundTestFiller.json
index 4efb1cd77..4ade48d12 100644
--- a/src/StateTestsFiller/EIP158/Homestead/stRefundTestFiller.json
+++ b/src/StateTestsFiller/EIP158/Homestead/stRefundTestFiller.json
@@ -468,7 +468,7 @@
             "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                 "storage" : {}
             }
          },
@@ -520,7 +520,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
@@ -580,7 +580,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {}
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -628,7 +628,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
@@ -679,7 +679,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
@@ -739,7 +739,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
diff --git a/src/StateTestsFiller/EIP158/Homestead/stSystemOperationsTestFiller.json b/src/StateTestsFiller/EIP158/Homestead/stSystemOperationsTestFiller.json
index 202acbfef..c3d054071 100644
--- a/src/StateTestsFiller/EIP158/Homestead/stSystemOperationsTestFiller.json
+++ b/src/StateTestsFiller/EIP158/Homestead/stSystemOperationsTestFiller.json
@@ -1662,7 +1662,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+                "code" : "{ (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1702,7 +1702,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (CALLER) (SUICIDE (CALLER))}",
+                "code" : "{ [[0]] (CALLER) (SELFDESTRUCT (CALLER))}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1742,7 +1742,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (CALLER) (SUICIDE 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+                "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1781,7 +1781,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (CALLER) (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}",
+                "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1820,7 +1820,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (ORIGIN) (SUICIDE (ORIGIN))}",
+                "code" : "{ [[0]] (ORIGIN) (SELFDESTRUCT (ORIGIN))}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1859,7 +1859,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (ADDRESS) (SUICIDE (ADDRESS))}",
+                "code" : "{ [[0]] (ADDRESS) (SELFDESTRUCT (ADDRESS))}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1898,7 +1898,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}",
+                "code" : "{ (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1938,7 +1938,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE (ADDRESS) )}",
+                "code" : "{ (SELFDESTRUCT (ADDRESS) )}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -2526,7 +2526,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{  [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SUICIDE 0x945304eb96065b2a98b57a48a06ae28d285a71b5)  }",
+                "code" : "{  [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SELFDESTRUCT 0x945304eb96065b2a98b57a48a06ae28d285a71b5)  }",
                 "storage": {}
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -2582,7 +2582,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) (SUICIDE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ",
+                "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) (SELFDESTRUCT 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/EIP158/Homestead/stTransactionTestFiller.json b/src/StateTestsFiller/EIP158/Homestead/stTransactionTestFiller.json
index e03ba1729..b053617b3 100644
--- a/src/StateTestsFiller/EIP158/Homestead/stTransactionTestFiller.json
+++ b/src/StateTestsFiller/EIP158/Homestead/stTransactionTestFiller.json
@@ -1023,7 +1023,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10",
-                "code" : "{(CALL 35000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 35000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1031,7 +1031,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1077,7 +1077,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10",
-                "code" : "{(CALL 5000 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 5000 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1085,7 +1085,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1137,7 +1137,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10",
-                "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1145,7 +1145,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1192,7 +1192,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000",
-                "code" : "{(CALL 32000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 32000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1200,7 +1200,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1251,7 +1251,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10000",
-                "code" : "{(SUICIDE 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }",
+                "code" : "{(SELFDESTRUCT 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1259,7 +1259,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "1110",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1308,7 +1308,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000",
-                "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+                "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1356,7 +1356,7 @@
 
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000",
-                "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+                "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/EIP158/stCreateTestFiller.json b/src/StateTestsFiller/EIP158/stCreateTestFiller.json
index c8dc11898..6abe31d81 100644
--- a/src/StateTestsFiller/EIP158/stCreateTestFiller.json
+++ b/src/StateTestsFiller/EIP158/stCreateTestFiller.json
@@ -705,7 +705,7 @@
         },
         "transaction" :
         {
-	    "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+	    "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
             "data" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
             "gasLimit" : "100000",
             "gasPrice" : "1",
@@ -756,7 +756,7 @@
         },
         "transaction" :
         {
-	    "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+	    "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
             "data" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
             "gasLimit" : "100000",
             "gasPrice" : "1",
@@ -813,7 +813,7 @@
         },
         "transaction" :
         {
-	    "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0x6295ee1b4f6dd65047762f924ecd367c17eabf8f)}",
+	    "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0x6295ee1b4f6dd65047762f924ecd367c17eabf8f)}",
             "data" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf3600052736295ee1b4f6dd65047762f924ecd367c17eabf8fff",
             "gasLimit" : "100000",
             "gasPrice" : "1",
@@ -878,7 +878,7 @@
         },
         "transaction" :
         {
-	    "data" : "{ (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b) (CALL 60000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[0]]11 (RETURN 18 14)}",
+	    "data" : "{ (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b) (CALL 60000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[0]]11 (RETURN 18 14)}",
             "data" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273d94f5374fce5edbc8e2a8697c15331677e6ebf0bff6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150600b600055600e6012f3",
             "gasLimit" : "600000",
             "gasPrice" : "1",
diff --git a/src/StateTestsFiller/EIP158/stEIP158SpecificTestFiller.json b/src/StateTestsFiller/EIP158/stEIP158SpecificTestFiller.json
index 18a7fce16..52760effa 100644
--- a/src/StateTestsFiller/EIP158/stEIP158SpecificTestFiller.json
+++ b/src/StateTestsFiller/EIP158/stEIP158SpecificTestFiller.json
@@ -96,7 +96,7 @@
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             }
@@ -153,7 +153,7 @@
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             }
@@ -454,14 +454,14 @@
 	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) }",
+		"code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
 		"storage": {
 		}
             },
 	    "e94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) }",
+		"code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
 		"storage": {
 		}
             }
diff --git a/src/StateTestsFiller/EIP158/stNonZeroCallsTestFiller.json b/src/StateTestsFiller/EIP158/stNonZeroCallsTestFiller.json
index 5d11d158a..b616f1e49 100644
--- a/src/StateTestsFiller/EIP158/stNonZeroCallsTestFiller.json
+++ b/src/StateTestsFiller/EIP158/stNonZeroCallsTestFiller.json
@@ -238,7 +238,7 @@
         }
     },
 
-    "NonZeroValue_SUICIDE" : {
+    "NonZeroValue_SELFDESTRUCT" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -270,7 +270,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             }
@@ -552,7 +552,7 @@
         }
     },
 
-    "NonZeroValue_SUICIDE_ToEmpty" : {
+    "NonZeroValue_SELFDESTRUCT_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -581,7 +581,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
@@ -860,7 +860,7 @@
         }
     },
 
-    "NonZeroValue_SUICIDE_ToNonNonZeroBalance" : {
+    "NonZeroValue_SELFDESTRUCT_ToNonNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -889,7 +889,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
@@ -1190,7 +1190,7 @@
         }
     },
 
-    "NonZeroValue_SUICIDE_ToOneStorageKey" : {
+    "NonZeroValue_SELFDESTRUCT_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -1222,7 +1222,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		    "0x00" : "0x01"
 		}
diff --git a/src/StateTestsFiller/EIP158/stZeroCallsRevertTestFiller.json b/src/StateTestsFiller/EIP158/stZeroCallsRevertTestFiller.json
index 357b3fef4..4b9d343ea 100644
--- a/src/StateTestsFiller/EIP158/stZeroCallsRevertTestFiller.json
+++ b/src/StateTestsFiller/EIP158/stZeroCallsRevertTestFiller.json
@@ -242,7 +242,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -281,7 +281,7 @@
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)  }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)  }",
 		"storage": {
 		}
             }
@@ -578,7 +578,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE_ToEmpty_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -617,7 +617,7 @@
 	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
@@ -913,7 +913,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -952,7 +952,7 @@
 	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
@@ -1257,7 +1257,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -1297,7 +1297,7 @@
 	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		    "0x00" : "0x01"
 		}
diff --git a/src/StateTestsFiller/EIP158/stZeroCallsTestFiller.json b/src/StateTestsFiller/EIP158/stZeroCallsTestFiller.json
index 6e6cf5cda..bd9243a48 100644
--- a/src/StateTestsFiller/EIP158/stZeroCallsTestFiller.json
+++ b/src/StateTestsFiller/EIP158/stZeroCallsTestFiller.json
@@ -229,7 +229,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE" : {
+    "ZeroValue_SELFDESTRUCT" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -258,7 +258,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             }
@@ -541,7 +541,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE_ToEmpty" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -570,7 +570,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
@@ -852,7 +852,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE_ToNonZeroBalance" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -881,7 +881,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
@@ -1172,7 +1172,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE_ToOneStorageKey" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -1201,7 +1201,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		    "0x00" : "0x01"
 		}