4 files changed, 16 insertions, 16 deletions
diff --git a/StateTests/EIP158/stNonZeroCallsTest.json b/StateTests/EIP158/stNonZeroCallsTest.json
index 728005b2f..3824a7b03 100644
--- a/StateTests/EIP158/stNonZeroCallsTest.json
+++ b/StateTests/EIP158/stNonZeroCallsTest.json
@@ -916,7 +916,7 @@
             "value" : "0x00"
         }
     },
-    "NonZeroValue_SUICIDE" : {
+    "NonZeroValue_SELFDESTRUCT" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -978,7 +978,7 @@
             "value" : "0x00"
         }
     },
-    "NonZeroValue_SUICIDE_ToEmpty" : {
+    "NonZeroValue_SELFDESTRUCT_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -1047,7 +1047,7 @@
             "value" : "0x00"
         }
     },
-    "NonZeroValue_SUICIDE_ToNonNonZeroBalance" : {
+    "NonZeroValue_SELFDESTRUCT_ToNonNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -1116,7 +1116,7 @@
             "value" : "0x00"
         }
     },
-    "NonZeroValue_SUICIDE_ToOneStorageKey" : {
+    "NonZeroValue_SELFDESTRUCT_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
diff --git a/StateTests/EIP158/stZeroCallsRevertTest.json b/StateTests/EIP158/stZeroCallsRevertTest.json
index fbd6034d1..92aad3827 100644
--- a/StateTests/EIP158/stZeroCallsRevertTest.json
+++ b/StateTests/EIP158/stZeroCallsRevertTest.json
@@ -875,7 +875,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -951,7 +951,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_ToEmpty_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -1041,7 +1041,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -1131,7 +1131,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
diff --git a/StateTests/EIP158/stZeroCallsTest.json b/StateTests/EIP158/stZeroCallsTest.json
index ba311b336..4fe6af7d1 100644
--- a/StateTests/EIP158/stZeroCallsTest.json
+++ b/StateTests/EIP158/stZeroCallsTest.json
@@ -896,7 +896,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE" : {
+    "ZeroValue_SELFDESTRUCT" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -951,7 +951,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_ToEmpty" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -1013,7 +1013,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_ToNonZeroBalance" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -1082,7 +1082,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_ToOneStorageKey" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
diff --git a/StateTests/Homestead/stZeroCallsRevertTest.json b/StateTests/Homestead/stZeroCallsRevertTest.json
index 8e57301c0..385168b9d 100644
--- a/StateTests/Homestead/stZeroCallsRevertTest.json
+++ b/StateTests/Homestead/stZeroCallsRevertTest.json
@@ -875,7 +875,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -951,7 +951,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_ToEmpty_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -1041,7 +1041,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -1131,7 +1131,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",