diff --git a/test/language/expressions/compound-assignment/11.13.2-6-15-s.js b/test/language/expressions/compound-assignment/add-arguments-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-15-s.js
rename to test/language/expressions/compound-assignment/add-arguments-strict.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-4-s.js b/test/language/expressions/compound-assignment/add-eval-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-4-s.js
rename to test/language/expressions/compound-assignment/add-eval-strict.js
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A1_T4.js b/test/language/expressions/compound-assignment/add-whitespace.js
similarity index 100%
rename from test/language/expressions/compound-assignment/S11.13.2_A1_T4.js
rename to test/language/expressions/compound-assignment/add-whitespace.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-20-s.js b/test/language/expressions/compound-assignment/and-arguments-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-20-s.js
rename to test/language/expressions/compound-assignment/and-arguments-strict.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-9-s.js b/test/language/expressions/compound-assignment/and-eval-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-9-s.js
rename to test/language/expressions/compound-assignment/and-eval-strict.js
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A1_T9.js b/test/language/expressions/compound-assignment/and-whitespace.js
similarity index 100%
rename from test/language/expressions/compound-assignment/S11.13.2_A1_T9.js
rename to test/language/expressions/compound-assignment/and-whitespace.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-13-s.js b/test/language/expressions/compound-assignment/div-arguments-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-13-s.js
rename to test/language/expressions/compound-assignment/div-arguments-strict.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-2-s.js b/test/language/expressions/compound-assignment/div-eval-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-2-s.js
rename to test/language/expressions/compound-assignment/div-eval-strict.js
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A1_T2.js b/test/language/expressions/compound-assignment/div-whitespace.js
similarity index 100%
rename from test/language/expressions/compound-assignment/S11.13.2_A1_T2.js
rename to test/language/expressions/compound-assignment/div-whitespace.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-17-s.js b/test/language/expressions/compound-assignment/lshift-arguments-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-17-s.js
rename to test/language/expressions/compound-assignment/lshift-arguments-strict.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-6-s.js b/test/language/expressions/compound-assignment/lshift-eval-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-6-s.js
rename to test/language/expressions/compound-assignment/lshift-eval-strict.js
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A1_T6.js b/test/language/expressions/compound-assignment/lshift-whitespace.js
similarity index 100%
rename from test/language/expressions/compound-assignment/S11.13.2_A1_T6.js
rename to test/language/expressions/compound-assignment/lshift-whitespace.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-14-s.js b/test/language/expressions/compound-assignment/mod-arguments-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-14-s.js
rename to test/language/expressions/compound-assignment/mod-arguments-strict.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-3-s.js b/test/language/expressions/compound-assignment/mod-eval-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-3-s.js
rename to test/language/expressions/compound-assignment/mod-eval-strict.js
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A1_T3.js b/test/language/expressions/compound-assignment/mod-whitespace.js
similarity index 100%
rename from test/language/expressions/compound-assignment/S11.13.2_A1_T3.js
rename to test/language/expressions/compound-assignment/mod-whitespace.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-12-s.js b/test/language/expressions/compound-assignment/mult-arguments-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-12-s.js
rename to test/language/expressions/compound-assignment/mult-arguments-strict.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-1-s.js b/test/language/expressions/compound-assignment/mult-eval-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-1-s.js
rename to test/language/expressions/compound-assignment/mult-eval-strict.js
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A1_T1.js b/test/language/expressions/compound-assignment/mult-whitespace.js
similarity index 100%
rename from test/language/expressions/compound-assignment/S11.13.2_A1_T1.js
rename to test/language/expressions/compound-assignment/mult-whitespace.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-22-s.js b/test/language/expressions/compound-assignment/or-arguments-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-22-s.js
rename to test/language/expressions/compound-assignment/or-arguments-strict.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-11-s.js b/test/language/expressions/compound-assignment/or-eval-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-11-s.js
rename to test/language/expressions/compound-assignment/or-eval-strict.js
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A1_T11.js b/test/language/expressions/compound-assignment/or-whitespace.js
similarity index 100%
rename from test/language/expressions/compound-assignment/S11.13.2_A1_T11.js
rename to test/language/expressions/compound-assignment/or-whitespace.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-18-s.js b/test/language/expressions/compound-assignment/srshift-arguments-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-18-s.js
rename to test/language/expressions/compound-assignment/srshift-arguments-strict.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-7-s.js b/test/language/expressions/compound-assignment/srshift-eval-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-7-s.js
rename to test/language/expressions/compound-assignment/srshift-eval-strict.js
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A1_T7.js b/test/language/expressions/compound-assignment/srshift-whitespace.js
similarity index 100%
rename from test/language/expressions/compound-assignment/S11.13.2_A1_T7.js
rename to test/language/expressions/compound-assignment/srshift-whitespace.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-16-s.js b/test/language/expressions/compound-assignment/sub-arguments-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-16-s.js
rename to test/language/expressions/compound-assignment/sub-arguments-strict.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-5-s.js b/test/language/expressions/compound-assignment/sub-eval-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-5-s.js
rename to test/language/expressions/compound-assignment/sub-eval-strict.js
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A1_T5.js b/test/language/expressions/compound-assignment/sub-whitespace.js
similarity index 100%
rename from test/language/expressions/compound-assignment/S11.13.2_A1_T5.js
rename to test/language/expressions/compound-assignment/sub-whitespace.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-19-s.js b/test/language/expressions/compound-assignment/urshift-arguments-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-19-s.js
rename to test/language/expressions/compound-assignment/urshift-arguments-strict.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-8-s.js b/test/language/expressions/compound-assignment/urshift-eval-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-8-s.js
rename to test/language/expressions/compound-assignment/urshift-eval-strict.js
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A1_T8.js b/test/language/expressions/compound-assignment/urshift-whitespace.js
similarity index 100%
rename from test/language/expressions/compound-assignment/S11.13.2_A1_T8.js
rename to test/language/expressions/compound-assignment/urshift-whitespace.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-21-s.js b/test/language/expressions/compound-assignment/xor-arguments-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-21-s.js
rename to test/language/expressions/compound-assignment/xor-arguments-strict.js
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-10-s.js b/test/language/expressions/compound-assignment/xor-eval-strict.js
similarity index 100%
rename from test/language/expressions/compound-assignment/11.13.2-6-10-s.js
rename to test/language/expressions/compound-assignment/xor-eval-strict.js
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A1_T10.js b/test/language/expressions/compound-assignment/xor-whitespace.js
similarity index 100%
rename from test/language/expressions/compound-assignment/S11.13.2_A1_T10.js
rename to test/language/expressions/compound-assignment/xor-whitespace.js