diff --git a/lib/6to5/transformation/transformers/es6-let-scoping.js b/lib/6to5/transformation/transformers/es6-block-scoping.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es6-let-scoping.js
rename to lib/6to5/transformation/transformers/es6-block-scoping.js
diff --git a/test/fixtures/transformation/es6-let-scoping/exec-block-scoped-2/exec.js b/test/fixtures/transformation/es6-block-scoping/exec-block-scoped-2/exec.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/exec-block-scoped-2/exec.js
rename to test/fixtures/transformation/es6-block-scoping/exec-block-scoped-2/exec.js
diff --git a/test/fixtures/transformation/es6-let-scoping/exec-block-scoped/exec.js b/test/fixtures/transformation/es6-block-scoping/exec-block-scoped/exec.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/exec-block-scoped/exec.js
rename to test/fixtures/transformation/es6-block-scoping/exec-block-scoped/exec.js
diff --git a/test/fixtures/transformation/es6-let-scoping/exec-collision-array-comprehension/exec.js b/test/fixtures/transformation/es6-block-scoping/exec-collision-array-comprehension/exec.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/exec-collision-array-comprehension/exec.js
rename to test/fixtures/transformation/es6-block-scoping/exec-collision-array-comprehension/exec.js
diff --git a/test/fixtures/transformation/es6-let-scoping/exec-collision-array-comprehension/options.json b/test/fixtures/transformation/es6-block-scoping/exec-collision-array-comprehension/options.json
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/exec-collision-array-comprehension/options.json
rename to test/fixtures/transformation/es6-block-scoping/exec-collision-array-comprehension/options.json
diff --git a/test/fixtures/transformation/es6-let-scoping/exec-collision-for/exec.js b/test/fixtures/transformation/es6-block-scoping/exec-collision-for/exec.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/exec-collision-for/exec.js
rename to test/fixtures/transformation/es6-block-scoping/exec-collision-for/exec.js
diff --git a/test/fixtures/transformation/es6-let-scoping/exec-destructuring-defaults/exec.js b/test/fixtures/transformation/es6-block-scoping/exec-destructuring-defaults/exec.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/exec-destructuring-defaults/exec.js
rename to test/fixtures/transformation/es6-block-scoping/exec-destructuring-defaults/exec.js
diff --git a/test/fixtures/transformation/es6-let-scoping/exec-duplicate-function-scope/exec.js b/test/fixtures/transformation/es6-block-scoping/exec-duplicate-function-scope/exec.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/exec-duplicate-function-scope/exec.js
rename to test/fixtures/transformation/es6-block-scoping/exec-duplicate-function-scope/exec.js
diff --git a/test/fixtures/transformation/es6-let-scoping/exec-duplicate-in-upper-scope/exec.js b/test/fixtures/transformation/es6-block-scoping/exec-duplicate-in-upper-scope/exec.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/exec-duplicate-in-upper-scope/exec.js
rename to test/fixtures/transformation/es6-block-scoping/exec-duplicate-in-upper-scope/exec.js
diff --git a/test/fixtures/transformation/es6-let-scoping/exec-for-loop-head/exec.js b/test/fixtures/transformation/es6-block-scoping/exec-for-loop-head/exec.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/exec-for-loop-head/exec.js
rename to test/fixtures/transformation/es6-block-scoping/exec-for-loop-head/exec.js
diff --git a/test/fixtures/transformation/es6-let-scoping/for-break-continue-return/actual.js b/test/fixtures/transformation/es6-block-scoping/for-break-continue-return/actual.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/for-break-continue-return/actual.js
rename to test/fixtures/transformation/es6-block-scoping/for-break-continue-return/actual.js
diff --git a/test/fixtures/transformation/es6-let-scoping/for-break-continue-return/expected.js b/test/fixtures/transformation/es6-block-scoping/for-break-continue-return/expected.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/for-break-continue-return/expected.js
rename to test/fixtures/transformation/es6-block-scoping/for-break-continue-return/expected.js
diff --git a/test/fixtures/transformation/es6-let-scoping/for-break/actual.js b/test/fixtures/transformation/es6-block-scoping/for-break/actual.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/for-break/actual.js
rename to test/fixtures/transformation/es6-block-scoping/for-break/actual.js
diff --git a/test/fixtures/transformation/es6-let-scoping/for-break/expected.js b/test/fixtures/transformation/es6-block-scoping/for-break/expected.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/for-break/expected.js
rename to test/fixtures/transformation/es6-block-scoping/for-break/expected.js
diff --git a/test/fixtures/transformation/es6-let-scoping/for-continue/actual.js b/test/fixtures/transformation/es6-block-scoping/for-continue/actual.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/for-continue/actual.js
rename to test/fixtures/transformation/es6-block-scoping/for-continue/actual.js
diff --git a/test/fixtures/transformation/es6-let-scoping/for-continue/expected.js b/test/fixtures/transformation/es6-block-scoping/for-continue/expected.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/for-continue/expected.js
rename to test/fixtures/transformation/es6-block-scoping/for-continue/expected.js
diff --git a/test/fixtures/transformation/es6-let-scoping/for-return-undefined/actual.js b/test/fixtures/transformation/es6-block-scoping/for-return-undefined/actual.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/for-return-undefined/actual.js
rename to test/fixtures/transformation/es6-block-scoping/for-return-undefined/actual.js
diff --git a/test/fixtures/transformation/es6-let-scoping/for-return-undefined/expected.js b/test/fixtures/transformation/es6-block-scoping/for-return-undefined/expected.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/for-return-undefined/expected.js
rename to test/fixtures/transformation/es6-block-scoping/for-return-undefined/expected.js
diff --git a/test/fixtures/transformation/es6-let-scoping/for-return/actual.js b/test/fixtures/transformation/es6-block-scoping/for-return/actual.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/for-return/actual.js
rename to test/fixtures/transformation/es6-block-scoping/for-return/actual.js
diff --git a/test/fixtures/transformation/es6-let-scoping/for-return/expected.js b/test/fixtures/transformation/es6-block-scoping/for-return/expected.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/for-return/expected.js
rename to test/fixtures/transformation/es6-block-scoping/for-return/expected.js
diff --git a/test/fixtures/transformation/es6-let-scoping/function/actual.js b/test/fixtures/transformation/es6-block-scoping/function/actual.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/function/actual.js
rename to test/fixtures/transformation/es6-block-scoping/function/actual.js
diff --git a/test/fixtures/transformation/es6-let-scoping/function/expected.js b/test/fixtures/transformation/es6-block-scoping/function/expected.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/function/expected.js
rename to test/fixtures/transformation/es6-block-scoping/function/expected.js
diff --git a/test/fixtures/transformation/es6-let-scoping/hoisting/actual.js b/test/fixtures/transformation/es6-block-scoping/hoisting/actual.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/hoisting/actual.js
rename to test/fixtures/transformation/es6-block-scoping/hoisting/actual.js
diff --git a/test/fixtures/transformation/es6-let-scoping/hoisting/expected.js b/test/fixtures/transformation/es6-block-scoping/hoisting/expected.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/hoisting/expected.js
rename to test/fixtures/transformation/es6-block-scoping/hoisting/expected.js
diff --git a/test/fixtures/transformation/es6-let-scoping/loop-initializer-default/actual.js b/test/fixtures/transformation/es6-block-scoping/loop-initializer-default/actual.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/loop-initializer-default/actual.js
rename to test/fixtures/transformation/es6-block-scoping/loop-initializer-default/actual.js
diff --git a/test/fixtures/transformation/es6-let-scoping/loop-initializer-default/expected.js b/test/fixtures/transformation/es6-block-scoping/loop-initializer-default/expected.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/loop-initializer-default/expected.js
rename to test/fixtures/transformation/es6-block-scoping/loop-initializer-default/expected.js
diff --git a/test/fixtures/transformation/es6-let-scoping/program/actual.js b/test/fixtures/transformation/es6-block-scoping/program/actual.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/program/actual.js
rename to test/fixtures/transformation/es6-block-scoping/program/actual.js
diff --git a/test/fixtures/transformation/es6-let-scoping/program/expected.js b/test/fixtures/transformation/es6-block-scoping/program/expected.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/program/expected.js
rename to test/fixtures/transformation/es6-block-scoping/program/expected.js
diff --git a/test/fixtures/transformation/es6-let-scoping/temporal-dead-zone/actual.js b/test/fixtures/transformation/es6-block-scoping/temporal-dead-zone/actual.js
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/temporal-dead-zone/actual.js
rename to test/fixtures/transformation/es6-block-scoping/temporal-dead-zone/actual.js
diff --git a/test/fixtures/transformation/es6-let-scoping/temporal-dead-zone/options.json b/test/fixtures/transformation/es6-block-scoping/temporal-dead-zone/options.json
similarity index 100%
rename from test/fixtures/transformation/es6-let-scoping/temporal-dead-zone/options.json
rename to test/fixtures/transformation/es6-block-scoping/temporal-dead-zone/options.json