diff --git a/src/utils/base64.ts b/src/utils/base64.ts
index 6a8ec75c66f..13849e353c1 100644
--- a/src/utils/base64.ts
+++ b/src/utils/base64.ts
@@ -5,7 +5,7 @@ export function toBase64(num: number): string {
 	let outStr = '';
 	do {
 		const curDigit = num % base;
-		num = Math.floor(num / base);
+		num = (num / base) | 0;
 		outStr = chars[curDigit] + outStr;
 	} while (num !== 0);
 	return outStr;
diff --git a/src/utils/hashPlaceholders.ts b/src/utils/hashPlaceholders.ts
index 7b3cdfec9d4..65f452da167 100644
--- a/src/utils/hashPlaceholders.ts
+++ b/src/utils/hashPlaceholders.ts
@@ -1,13 +1,14 @@
+import { toBase64 } from './base64';
 import { errFailedValidation, error } from './error';
 
 // Four random characters from the private use area to minimize risk of conflicts
-const hashPlaceholderLeft = '_!~{';
+const hashPlaceholderLeft = '!~{';
 const hashPlaceholderRight = '}~';
 const hashPlaceholderOverhead = hashPlaceholderLeft.length + hashPlaceholderRight.length;
 
 // This is the size of a sha256
 export const maxHashSize = 64;
-export const defaultHashSize = 9;
+export const defaultHashSize = 8;
 
 export type HashPlaceholderGenerator = (optionName: string, hashSize?: number) => string;
 
@@ -21,7 +22,7 @@ export const getHashPlaceholderGenerator = (): HashPlaceholderGenerator => {
 				)
 			);
 		}
-		const placeholder = `${hashPlaceholderLeft}${String(++nextIndex).padStart(
+		const placeholder = `${hashPlaceholderLeft}${toBase64(++nextIndex).padStart(
 			hashSize - hashPlaceholderOverhead,
 			'0'
 		)}${hashPlaceholderRight}`;
@@ -32,13 +33,14 @@ export const getHashPlaceholderGenerator = (): HashPlaceholderGenerator => {
 				)
 			);
 		}
-		nextIndex++;
 		return placeholder;
 	};
 };
 
 const REPLACER_REGEX = new RegExp(
-	`${hashPlaceholderLeft}\\d{1,${maxHashSize - hashPlaceholderOverhead}}${hashPlaceholderRight}`,
+	`${hashPlaceholderLeft}[0-9a-zA-Z_$]{1,${
+		maxHashSize - hashPlaceholderOverhead
+	}}${hashPlaceholderRight}`,
 	'g'
 );
 
diff --git a/test/browser/samples/supports-hashes/_expected/dep-bd7339813.js b/test/browser/samples/supports-hashes/_expected/dep-bd733981.js
similarity index 100%
rename from test/browser/samples/supports-hashes/_expected/dep-bd7339813.js
rename to test/browser/samples/supports-hashes/_expected/dep-bd733981.js
diff --git a/test/browser/samples/supports-hashes/_expected/main-70712c1f.js b/test/browser/samples/supports-hashes/_expected/main-70712c1f.js
new file mode 100644
index 00000000000..697a036fc36
--- /dev/null
+++ b/test/browser/samples/supports-hashes/_expected/main-70712c1f.js
@@ -0,0 +1,3 @@
+import { foo } from './dep-bd733981.js';
+
+console.log(foo);
diff --git a/test/browser/samples/supports-hashes/_expected/main-acddd31e2.js b/test/browser/samples/supports-hashes/_expected/main-acddd31e2.js
deleted file mode 100644
index 47926819936..00000000000
--- a/test/browser/samples/supports-hashes/_expected/main-acddd31e2.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { foo } from './dep-bd7339813.js';
-
-console.log(foo);
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/foo-amd-0f9dc16c0.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/foo-amd-0f9dc16c.js
similarity index 100%
rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/foo-amd-0f9dc16c0.js
rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/foo-amd-0f9dc16c.js
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-f0570656.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-f0570656.js
new file mode 100644
index 00000000000..92eec8fa3bb
--- /dev/null
+++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-f0570656.js
@@ -0,0 +1,10 @@
+define(['exports', './foo-amd-0f9dc16c', './nested/bar-amd-f038b10c', './nested/baz-amd-d3de4cc0', './no-ext-amd-9d2c6ef6'], (function (exports, foo, bar, baz, noExt) { 'use strict';
+
+
+
+	exports.foo = foo;
+	exports.bar = bar;
+	exports.baz = baz;
+	exports.noExt = noExt;
+
+}));
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-f69d1abd2.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-f69d1abd2.js
deleted file mode 100644
index 14825bef9d8..00000000000
--- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-f69d1abd2.js
+++ /dev/null
@@ -1,10 +0,0 @@
-define(['exports', './foo-amd-0f9dc16c0', './nested/bar-amd-f038b10c1', './nested/baz-amd-d3de4cc00', './no-ext-amd-9d2c6ef6c'], (function (exports, foo, bar, baz, noExt) { 'use strict';
-
-
-
-	exports.foo = foo;
-	exports.bar = bar;
-	exports.baz = baz;
-	exports.noExt = noExt;
-
-}));
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/nested/bar-amd-f038b10c1.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/nested/bar-amd-f038b10c.js
similarity index 100%
rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/nested/bar-amd-f038b10c1.js
rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/nested/bar-amd-f038b10c.js
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/nested/baz-amd-d3de4cc00.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/nested/baz-amd-d3de4cc0.js
similarity index 100%
rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/nested/baz-amd-d3de4cc00.js
rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/nested/baz-amd-d3de4cc0.js
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/no-ext-amd-9d2c6ef6c.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/no-ext-amd-9d2c6ef6.js
similarity index 100%
rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/no-ext-amd-9d2c6ef6c.js
rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/no-ext-amd-9d2c6ef6.js
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/foo-cjs-0d5774b5e.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/foo-cjs-0d5774b5.js
similarity index 100%
rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/foo-cjs-0d5774b5e.js
rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/foo-cjs-0d5774b5.js
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-d34b04b0a.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-d34b04b0a.js
deleted file mode 100644
index 3fd5385bb0d..00000000000
--- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-d34b04b0a.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use strict';
-
-var foo = require('./foo-cjs-0d5774b5e.js');
-var bar = require('./nested/bar-cjs-abedc91d1.js');
-var baz = require('./nested/baz-cjs-4a9c02fc3.js');
-var noExt = require('./no-ext-cjs-500f8f81a.js');
-
-
-
-exports.foo = foo;
-exports.bar = bar;
-exports.baz = baz;
-exports.noExt = noExt;
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-e39bf23f.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-e39bf23f.js
new file mode 100644
index 00000000000..5feb8352e00
--- /dev/null
+++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-e39bf23f.js
@@ -0,0 +1,13 @@
+'use strict';
+
+var foo = require('./foo-cjs-0d5774b5.js');
+var bar = require('./nested/bar-cjs-abedc91d.js');
+var baz = require('./nested/baz-cjs-4a9c02fc.js');
+var noExt = require('./no-ext-cjs-500f8f81.js');
+
+
+
+exports.foo = foo;
+exports.bar = bar;
+exports.baz = baz;
+exports.noExt = noExt;
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/nested/bar-cjs-abedc91d1.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/nested/bar-cjs-abedc91d.js
similarity index 100%
rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/nested/bar-cjs-abedc91d1.js
rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/nested/bar-cjs-abedc91d.js
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/nested/baz-cjs-4a9c02fc3.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/nested/baz-cjs-4a9c02fc.js
similarity index 100%
rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/nested/baz-cjs-4a9c02fc3.js
rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/nested/baz-cjs-4a9c02fc.js
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/no-ext-cjs-500f8f81a.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/no-ext-cjs-500f8f81.js
similarity index 100%
rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/no-ext-cjs-500f8f81a.js
rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/no-ext-cjs-500f8f81.js
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/foo-es-3585f3eb4.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/foo-es-3585f3eb.js
similarity index 100%
rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/foo-es-3585f3eb4.js
rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/foo-es-3585f3eb.js
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/main-es-749628a00.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/main-es-749628a00.js
deleted file mode 100644
index 070fb421c0c..00000000000
--- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/main-es-749628a00.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as foo } from './foo-es-3585f3eb4.js';
-export { default as bar } from './nested/bar-es-bd5e2ae10.js';
-export { default as baz } from './nested/baz-es-a913ab4d6.js';
-export { default as noExt } from './no-ext-es-1f34b6e8e.js';
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/main-es-d43a43b5.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/main-es-d43a43b5.js
new file mode 100644
index 00000000000..dcc851a2a25
--- /dev/null
+++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/main-es-d43a43b5.js
@@ -0,0 +1,4 @@
+export { default as foo } from './foo-es-3585f3eb.js';
+export { default as bar } from './nested/bar-es-bd5e2ae1.js';
+export { default as baz } from './nested/baz-es-a913ab4d.js';
+export { default as noExt } from './no-ext-es-1f34b6e8.js';
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/bar-es-bd5e2ae10.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/bar-es-bd5e2ae1.js
similarity index 100%
rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/bar-es-bd5e2ae10.js
rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/bar-es-bd5e2ae1.js
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/baz-es-a913ab4d6.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/baz-es-a913ab4d.js
similarity index 100%
rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/baz-es-a913ab4d6.js
rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/baz-es-a913ab4d.js
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/no-ext-es-1f34b6e8e.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/no-ext-es-1f34b6e8.js
similarity index 100%
rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/no-ext-es-1f34b6e8e.js
rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/no-ext-es-1f34b6e8.js
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/foo-system-0e2d8e488.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/foo-system-0e2d8e48.js
similarity index 100%
rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/foo-system-0e2d8e488.js
rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/foo-system-0e2d8e48.js
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-0a3770769.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-5684b811.js
similarity index 65%
rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-0a3770769.js
rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-5684b811.js
index e41fed5daea..c41dd42ae82 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-0a3770769.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-5684b811.js
@@ -1,4 +1,4 @@
-System.register(['./foo-system-0e2d8e488.js', './nested/bar-system-a72f6c959.js', './nested/baz-system-71d114fda.js', './no-ext-system-0cf938a89.js'], (function (exports) {
+System.register(['./foo-system-0e2d8e48.js', './nested/bar-system-a72f6c95.js', './nested/baz-system-71d114fd.js', './no-ext-system-0cf938a8.js'], (function (exports) {
 	'use strict';
 	return {
 		setters: [function (module) {
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/nested/bar-system-a72f6c959.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/nested/bar-system-a72f6c95.js
similarity index 100%
rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/nested/bar-system-a72f6c959.js
rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/nested/bar-system-a72f6c95.js
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/nested/baz-system-71d114fda.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/nested/baz-system-71d114fd.js
similarity index 100%
rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/nested/baz-system-71d114fda.js
rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/nested/baz-system-71d114fd.js
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/no-ext-system-0cf938a89.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/no-ext-system-0cf938a8.js
similarity index 100%
rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/no-ext-system-0cf938a89.js
rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/no-ext-system-0cf938a8.js
diff --git a/test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/txt/b94d27b99-test.txt b/test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/txt/b94d27b9-test.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/txt/b94d27b99-test.txt
rename to test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/txt/b94d27b9-test.txt
diff --git a/test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/txt/b94d27b99-test.txt b/test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/txt/b94d27b9-test.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/txt/b94d27b99-test.txt
rename to test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/txt/b94d27b9-test.txt
diff --git a/test/chunking-form/samples/emit-file/asset-file-names/_expected/es/txt/b94d27b99-test.txt b/test/chunking-form/samples/emit-file/asset-file-names/_expected/es/txt/b94d27b9-test.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/asset-file-names/_expected/es/txt/b94d27b99-test.txt
rename to test/chunking-form/samples/emit-file/asset-file-names/_expected/es/txt/b94d27b9-test.txt
diff --git a/test/chunking-form/samples/emit-file/asset-file-names/_expected/system/txt/b94d27b99-test.txt b/test/chunking-form/samples/emit-file/asset-file-names/_expected/system/txt/b94d27b9-test.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/asset-file-names/_expected/system/txt/b94d27b99-test.txt
rename to test/chunking-form/samples/emit-file/asset-file-names/_expected/system/txt/b94d27b9-test.txt
diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-d0ca8c2ac.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-d0ca8c2a.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-d0ca8c2ac.txt
rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-d0ca8c2a.txt
diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-b94d27b99.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-b94d27b9.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-b94d27b99.txt
rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-b94d27b9.txt
diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-d0ca8c2ac.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-d0ca8c2a.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-d0ca8c2ac.txt
rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-d0ca8c2a.txt
diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-b94d27b99.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-b94d27b9.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-b94d27b99.txt
rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-b94d27b9.txt
diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-d0ca8c2ac.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-d0ca8c2a.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-d0ca8c2ac.txt
rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-d0ca8c2a.txt
diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-b94d27b99.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-b94d27b9.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-b94d27b99.txt
rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-b94d27b9.txt
diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-d0ca8c2ac.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-d0ca8c2a.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-d0ca8c2ac.txt
rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-d0ca8c2a.txt
diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-b94d27b99.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-b94d27b9.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-b94d27b99.txt
rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-b94d27b9.txt
diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/assets/asset-b94d27b99 b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/assets/asset-b94d27b9
similarity index 100%
rename from test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/assets/asset-b94d27b99
rename to test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/assets/asset-b94d27b9
diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/assets/asset-b94d27b99 b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/assets/asset-b94d27b9
similarity index 100%
rename from test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/assets/asset-b94d27b99
rename to test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/assets/asset-b94d27b9
diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/assets/asset-b94d27b99 b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/assets/asset-b94d27b9
similarity index 100%
rename from test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/assets/asset-b94d27b99
rename to test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/assets/asset-b94d27b9
diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/assets/asset-b94d27b99 b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/assets/asset-b94d27b9
similarity index 100%
rename from test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/assets/asset-b94d27b99
rename to test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/assets/asset-b94d27b9
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/banner-8c7ed2d9b.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/banner-8c7ed2d9.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/banner-8c7ed2d9b.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/banner-8c7ed2d9.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildEnd-6e08d9920.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildEnd-6e08d992.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildEnd-6e08d9920.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildEnd-6e08d992.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildStart-db9421f6f.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildStart-db9421f6.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildStart-db9421f6f.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildStart-db9421f6.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/footer-0301844cc.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/footer-0301844c.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/footer-0301844cc.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/footer-0301844c.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/generateBundle-5b9a4e566.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/generateBundle-5b9a4e56.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/generateBundle-5b9a4e566.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/generateBundle-5b9a4e56.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/intro-c432b372e.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/intro-c432b372.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/intro-c432b372e.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/intro-c432b372.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/load-0cf67fc72.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/load-0cf67fc7.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/load-0cf67fc72.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/load-0cf67fc7.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outro-1e5fe0468.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outro-1e5fe046.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outro-1e5fe0468.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outro-1e5fe046.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderChunk-aa9e49b7c.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderChunk-aa9e49b7.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderChunk-aa9e49b7c.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderChunk-aa9e49b7.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderStart-981aa2ea6.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderStart-981aa2ea.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderStart-981aa2ea6.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderStart-981aa2ea.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/resolveId-dd9bb7f89.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/resolveId-dd9bb7f8.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/resolveId-dd9bb7f89.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/resolveId-dd9bb7f8.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/transform-aa214ea38.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/transform-aa214ea3.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/transform-aa214ea38.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/transform-aa214ea3.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/banner-8c7ed2d9b.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/banner-8c7ed2d9.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/banner-8c7ed2d9b.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/banner-8c7ed2d9.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildEnd-6e08d9920.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildEnd-6e08d992.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildEnd-6e08d9920.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildEnd-6e08d992.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildStart-db9421f6f.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildStart-db9421f6.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildStart-db9421f6f.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildStart-db9421f6.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/footer-0301844cc.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/footer-0301844c.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/footer-0301844cc.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/footer-0301844c.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/generateBundle-5b9a4e566.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/generateBundle-5b9a4e56.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/generateBundle-5b9a4e566.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/generateBundle-5b9a4e56.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/intro-c432b372e.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/intro-c432b372.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/intro-c432b372e.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/intro-c432b372.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/load-0cf67fc72.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/load-0cf67fc7.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/load-0cf67fc72.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/load-0cf67fc7.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outro-1e5fe0468.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outro-1e5fe046.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outro-1e5fe0468.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outro-1e5fe046.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderChunk-aa9e49b7c.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderChunk-aa9e49b7.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderChunk-aa9e49b7c.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderChunk-aa9e49b7.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderStart-981aa2ea6.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderStart-981aa2ea.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderStart-981aa2ea6.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderStart-981aa2ea.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/resolveId-dd9bb7f89.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/resolveId-dd9bb7f8.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/resolveId-dd9bb7f89.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/resolveId-dd9bb7f8.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/transform-aa214ea38.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/transform-aa214ea3.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/transform-aa214ea38.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/transform-aa214ea3.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/banner-8c7ed2d9b.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/banner-8c7ed2d9.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/banner-8c7ed2d9b.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/banner-8c7ed2d9.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildEnd-6e08d9920.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildEnd-6e08d992.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildEnd-6e08d9920.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildEnd-6e08d992.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildStart-db9421f6f.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildStart-db9421f6.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildStart-db9421f6f.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildStart-db9421f6.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/footer-0301844cc.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/footer-0301844c.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/footer-0301844cc.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/footer-0301844c.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/generateBundle-5b9a4e566.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/generateBundle-5b9a4e56.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/generateBundle-5b9a4e566.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/generateBundle-5b9a4e56.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/intro-c432b372e.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/intro-c432b372.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/intro-c432b372e.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/intro-c432b372.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/load-0cf67fc72.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/load-0cf67fc7.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/load-0cf67fc72.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/load-0cf67fc7.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outro-1e5fe0468.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outro-1e5fe046.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outro-1e5fe0468.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outro-1e5fe046.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderChunk-aa9e49b7c.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderChunk-aa9e49b7.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderChunk-aa9e49b7c.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderChunk-aa9e49b7.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderStart-981aa2ea6.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderStart-981aa2ea.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderStart-981aa2ea6.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderStart-981aa2ea.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/resolveId-dd9bb7f89.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/resolveId-dd9bb7f8.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/resolveId-dd9bb7f89.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/resolveId-dd9bb7f8.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/transform-aa214ea38.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/transform-aa214ea3.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/transform-aa214ea38.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/transform-aa214ea3.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/banner-8c7ed2d9b.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/banner-8c7ed2d9.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/banner-8c7ed2d9b.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/banner-8c7ed2d9.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildEnd-6e08d9920.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildEnd-6e08d992.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildEnd-6e08d9920.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildEnd-6e08d992.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildStart-db9421f6f.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildStart-db9421f6.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildStart-db9421f6f.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildStart-db9421f6.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/footer-0301844cc.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/footer-0301844c.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/footer-0301844cc.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/footer-0301844c.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/generateBundle-5b9a4e566.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/generateBundle-5b9a4e56.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/generateBundle-5b9a4e566.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/generateBundle-5b9a4e56.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/intro-c432b372e.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/intro-c432b372.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/intro-c432b372e.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/intro-c432b372.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/load-0cf67fc72.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/load-0cf67fc7.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/load-0cf67fc72.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/load-0cf67fc7.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outro-1e5fe0468.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outro-1e5fe046.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outro-1e5fe0468.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outro-1e5fe046.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderChunk-aa9e49b7c.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderChunk-aa9e49b7.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderChunk-aa9e49b7c.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderChunk-aa9e49b7.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderStart-981aa2ea6.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderStart-981aa2ea.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderStart-981aa2ea6.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderStart-981aa2ea.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/resolveId-dd9bb7f89.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/resolveId-dd9bb7f8.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/resolveId-dd9bb7f89.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/resolveId-dd9bb7f8.txt
diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/transform-aa214ea38.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/transform-aa214ea3.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/transform-aa214ea38.txt
rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/transform-aa214ea3.txt
diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/amd/assets/test-b94d27b99.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/amd/assets/test-b94d27b9.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/amd/assets/test-b94d27b99.txt
rename to test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/amd/assets/test-b94d27b9.txt
diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/cjs/assets/test-b94d27b99.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/cjs/assets/test-b94d27b9.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/cjs/assets/test-b94d27b99.txt
rename to test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/cjs/assets/test-b94d27b9.txt
diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/es/assets/test-b94d27b99.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/es/assets/test-b94d27b9.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/es/assets/test-b94d27b99.txt
rename to test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/es/assets/test-b94d27b9.txt
diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/system/assets/test-b94d27b99.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/system/assets/test-b94d27b9.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/system/assets/test-b94d27b99.txt
rename to test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/system/assets/test-b94d27b9.txt
diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-87ce45a94-amd.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-87ce45a9-amd.js
similarity index 100%
rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-87ce45a94-amd.js
rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-87ce45a9-amd.js
diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-fe29c8a3f-amd.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-70ac024b-amd.js
similarity index 72%
rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-fe29c8a3f-amd.js
rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-70ac024b-amd.js
index 2562f27e360..bed6a1ef6b4 100644
--- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-fe29c8a3f-amd.js
+++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-70ac024b-amd.js
@@ -1,6 +1,6 @@
 define(['require'], (function (require) { 'use strict';
 
 	console.log('main');
-	new Promise(function (resolve, reject) { require(['./chunk-deb-87ce45a94-amd'], resolve, reject); }).then(console.log);
+	new Promise(function (resolve, reject) { require(['./chunk-deb-87ce45a9-amd'], resolve, reject); }).then(console.log);
 
 }));
diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/txt/b94d27b99-test.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/txt/b94d27b9-test.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/txt/b94d27b99-test.txt
rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/txt/b94d27b9-test.txt
diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-699056073-cjs.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-69905607-cjs.js
similarity index 100%
rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-699056073-cjs.js
rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-69905607-cjs.js
diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-8e6ad9437-cjs.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-780766d3-cjs.js
similarity index 69%
rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-8e6ad9437-cjs.js
rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-780766d3-cjs.js
index cb89e2adfe2..e28e6fa0c72 100644
--- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-8e6ad9437-cjs.js
+++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-780766d3-cjs.js
@@ -1,4 +1,4 @@
 'use strict';
 
 console.log('main');
-Promise.resolve().then(function () { return require('./chunk-deb-699056073-cjs.js'); }).then(console.log);
+Promise.resolve().then(function () { return require('./chunk-deb-69905607-cjs.js'); }).then(console.log);
diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/txt/b94d27b99-test.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/txt/b94d27b9-test.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/txt/b94d27b99-test.txt
rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/txt/b94d27b9-test.txt
diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/chunk-deb-9f85baf75-es.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/chunk-deb-9f85baf7-es.js
similarity index 100%
rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/chunk-deb-9f85baf75-es.js
rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/chunk-deb-9f85baf7-es.js
diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-080ad38c-es.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-080ad38c-es.js
new file mode 100644
index 00000000000..0e182cf5882
--- /dev/null
+++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-080ad38c-es.js
@@ -0,0 +1,2 @@
+console.log('main');
+import('./chunk-deb-9f85baf7-es.js').then(console.log);
diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-c380aad8d-es.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-c380aad8d-es.js
deleted file mode 100644
index d24cfb7097f..00000000000
--- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-c380aad8d-es.js
+++ /dev/null
@@ -1,2 +0,0 @@
-console.log('main');
-import('./chunk-deb-9f85baf75-es.js').then(console.log);
diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/txt/b94d27b99-test.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/txt/b94d27b9-test.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/txt/b94d27b99-test.txt
rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/txt/b94d27b9-test.txt
diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/chunk-deb-467d682b3-system.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/chunk-deb-467d682b-system.js
similarity index 100%
rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/chunk-deb-467d682b3-system.js
rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/chunk-deb-467d682b-system.js
diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-d64b39670-system.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-5d41b5c4-system.js
similarity index 66%
rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-d64b39670-system.js
rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-5d41b5c4-system.js
index ab4039563bf..eadb26d8829 100644
--- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-d64b39670-system.js
+++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-5d41b5c4-system.js
@@ -4,7 +4,7 @@ System.register([], (function (exports, module) {
 		execute: (function () {
 
 			console.log('main');
-			module.import('./chunk-deb-467d682b3-system.js').then(console.log);
+			module.import('./chunk-deb-467d682b-system.js').then(console.log);
 
 		})
 	};
diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/txt/b94d27b99-test.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/txt/b94d27b9-test.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/txt/b94d27b99-test.txt
rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/txt/b94d27b9-test.txt
diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo1-60bc15c4c.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo1-60bc15c4.svg
similarity index 100%
rename from test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo1-60bc15c4c.svg
rename to test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo1-60bc15c4.svg
diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-fdaa74783.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-fdaa7478.svg
similarity index 100%
rename from test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-fdaa74783.svg
rename to test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-fdaa7478.svg
diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js
index d132600e0da..e5681989434 100644
--- a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js
+++ b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js
@@ -1,6 +1,6 @@
 define(['require', 'exports'], (function (require, exports) { 'use strict';
 
-	var logo = new URL(require.toUrl('./assets/logo1-60bc15c4c.svg'), document.baseURI).href;
+	var logo = new URL(require.toUrl('./assets/logo1-60bc15c4.svg'), document.baseURI).href;
 
 	function showImage(url) {
 		console.log(url);
diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk.js b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk.js
index 008e102da85..dcde8981162 100644
--- a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk.js
+++ b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk.js
@@ -1,6 +1,6 @@
 define(['require', '../main'], (function (require, main) { 'use strict';
 
-	var logo = new URL(require.toUrl('../assets/logo2-fdaa74783.svg'), document.baseURI).href;
+	var logo = new URL(require.toUrl('../assets/logo2-fdaa7478.svg'), document.baseURI).href;
 
 	main.showImage(logo);
 
diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo1-60bc15c4c.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo1-60bc15c4.svg
similarity index 100%
rename from test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo1-60bc15c4c.svg
rename to test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo1-60bc15c4.svg
diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-fdaa74783.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-fdaa7478.svg
similarity index 100%
rename from test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-fdaa74783.svg
rename to test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-fdaa7478.svg
diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js
index 2cbb3641638..7b1418ccbc7 100644
--- a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js
+++ b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo1-60bc15c4c.svg').href : new URL('assets/logo1-60bc15c4c.svg', document.currentScript && document.currentScript.src || document.baseURI).href);
+var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo1-60bc15c4.svg').href : new URL('assets/logo1-60bc15c4.svg', document.currentScript && document.currentScript.src || document.baseURI).href);
 
 function showImage(url) {
 	console.log(url);
diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk.js b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk.js
index f55906ddf3e..9b7c6f1cf8b 100644
--- a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk.js
+++ b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk.js
@@ -2,6 +2,6 @@
 
 var main = require('../main.js');
 
-var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/../assets/logo2-fdaa74783.svg').href : new URL('../assets/logo2-fdaa74783.svg', document.currentScript && document.currentScript.src || document.baseURI).href);
+var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/../assets/logo2-fdaa7478.svg').href : new URL('../assets/logo2-fdaa7478.svg', document.currentScript && document.currentScript.src || document.baseURI).href);
 
 main.showImage(logo);
diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo1-60bc15c4c.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo1-60bc15c4.svg
similarity index 100%
rename from test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo1-60bc15c4c.svg
rename to test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo1-60bc15c4.svg
diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-fdaa74783.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-fdaa7478.svg
similarity index 100%
rename from test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-fdaa74783.svg
rename to test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-fdaa7478.svg
diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/es/main.js b/test/chunking-form/samples/emit-file/reference-files/_expected/es/main.js
index 9c450b568ed..043250d9d13 100644
--- a/test/chunking-form/samples/emit-file/reference-files/_expected/es/main.js
+++ b/test/chunking-form/samples/emit-file/reference-files/_expected/es/main.js
@@ -1,4 +1,4 @@
-var logo = new URL('assets/logo1-60bc15c4c.svg', import.meta.url).href;
+var logo = new URL('assets/logo1-60bc15c4.svg', import.meta.url).href;
 
 function showImage(url) {
 	console.log(url);
diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk.js b/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk.js
index eef4076abfc..e8eb7621b9d 100644
--- a/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk.js
+++ b/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk.js
@@ -1,5 +1,5 @@
 import { s as showImage } from '../main.js';
 
-var logo = new URL('../assets/logo2-fdaa74783.svg', import.meta.url).href;
+var logo = new URL('../assets/logo2-fdaa7478.svg', import.meta.url).href;
 
 showImage(logo);
diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo1-60bc15c4c.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo1-60bc15c4.svg
similarity index 100%
rename from test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo1-60bc15c4c.svg
rename to test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo1-60bc15c4.svg
diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-fdaa74783.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-fdaa7478.svg
similarity index 100%
rename from test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-fdaa74783.svg
rename to test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-fdaa7478.svg
diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/system/main.js b/test/chunking-form/samples/emit-file/reference-files/_expected/system/main.js
index c4221fc7200..aeaba1fc68d 100644
--- a/test/chunking-form/samples/emit-file/reference-files/_expected/system/main.js
+++ b/test/chunking-form/samples/emit-file/reference-files/_expected/system/main.js
@@ -5,7 +5,7 @@ System.register([], (function (exports, module) {
 
 			exports('s', showImage);
 
-			var logo = new URL('assets/logo1-60bc15c4c.svg', module.meta.url).href;
+			var logo = new URL('assets/logo1-60bc15c4.svg', module.meta.url).href;
 
 			function showImage(url) {
 				console.log(url);
diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk.js b/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk.js
index e63c8eea380..3be6d43938d 100644
--- a/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk.js
+++ b/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk.js
@@ -7,7 +7,7 @@ System.register(['../main.js'], (function (exports, module) {
 		}],
 		execute: (function () {
 
-			var logo = new URL('../assets/logo2-fdaa74783.svg', module.meta.url).href;
+			var logo = new URL('../assets/logo2-fdaa7478.svg', module.meta.url).href;
 
 			showImage(logo);
 
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/banner-8c7ed2d9b.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/banner-8c7ed2d9.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/banner-8c7ed2d9b.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/banner-8c7ed2d9.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/footer-0301844cc.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/footer-0301844c.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/footer-0301844cc.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/footer-0301844c.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-6922b0a1.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-6922b0a1.txt
new file mode 100644
index 00000000000..b00dcf27801
--- /dev/null
+++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-6922b0a1.txt
@@ -0,0 +1 @@
+generateBundle amd with assets/generateBundle-format-240389f4.txt
\ No newline at end of file
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-697ea1690.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-697ea1690.txt
deleted file mode 100644
index e8a8ab6274a..00000000000
--- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-697ea1690.txt
+++ /dev/null
@@ -1 +0,0 @@
-generateBundle amd with assets/generateBundle-format-240389f4b.txt
\ No newline at end of file
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-format-240389f4b.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-format-240389f4.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-format-240389f4b.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-format-240389f4.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/intro-c432b372e.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/intro-c432b372.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/intro-c432b372e.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/intro-c432b372.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/outro-1e5fe0468.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/outro-1e5fe046.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/outro-1e5fe0468.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/outro-1e5fe046.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderChunk-aa9e49b7c.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderChunk-aa9e49b7.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderChunk-aa9e49b7c.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderChunk-aa9e49b7.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderStart-981aa2ea6.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderStart-981aa2ea.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderStart-981aa2ea6.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderStart-981aa2ea.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/generateBundle.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/generateBundle.txt
index e8a8ab6274a..b00dcf27801 100644
--- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/generateBundle.txt
+++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/generateBundle.txt
@@ -1 +1 @@
-generateBundle amd with assets/generateBundle-format-240389f4b.txt
\ No newline at end of file
+generateBundle amd with assets/generateBundle-format-240389f4.txt
\ No newline at end of file
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js
index 0cfdc08efad..ea3be902633 100644
--- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js
+++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js
@@ -1,6 +1,6 @@
 define(['require', 'exports'], (function (require, exports) { 'use strict';
 
-	const renderStart = new URL(require.toUrl('./assets/renderStart-981aa2ea6.txt'), document.baseURI).href;
+	const renderStart = new URL(require.toUrl('./assets/renderStart-981aa2ea.txt'), document.baseURI).href;
 	const renderStartNamed = new URL(require.toUrl('./renderStart.txt'), document.baseURI).href;
 	const renderStartNamedImmediately = 'renderStart.txt';
 	const bannerNamed = new URL(require.toUrl('./banner.txt'), document.baseURI).href;
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/banner-8c7ed2d9b.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/banner-8c7ed2d9.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/banner-8c7ed2d9b.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/banner-8c7ed2d9.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/footer-0301844cc.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/footer-0301844c.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/footer-0301844cc.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/footer-0301844c.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-8a0553c29.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-8a0553c29.txt
deleted file mode 100644
index e29d261a368..00000000000
--- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-8a0553c29.txt
+++ /dev/null
@@ -1 +0,0 @@
-generateBundle cjs with assets/generateBundle-format-4efb05bcf.txt
\ No newline at end of file
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-b1a5f14c.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-b1a5f14c.txt
new file mode 100644
index 00000000000..21e7f9971dd
--- /dev/null
+++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-b1a5f14c.txt
@@ -0,0 +1 @@
+generateBundle cjs with assets/generateBundle-format-4efb05bc.txt
\ No newline at end of file
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-format-4efb05bcf.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-format-4efb05bc.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-format-4efb05bcf.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-format-4efb05bc.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/intro-c432b372e.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/intro-c432b372.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/intro-c432b372e.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/intro-c432b372.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/outro-1e5fe0468.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/outro-1e5fe046.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/outro-1e5fe0468.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/outro-1e5fe046.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderChunk-aa9e49b7c.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderChunk-aa9e49b7.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderChunk-aa9e49b7c.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderChunk-aa9e49b7.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderStart-981aa2ea6.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderStart-981aa2ea.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderStart-981aa2ea6.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderStart-981aa2ea.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/generateBundle.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/generateBundle.txt
index e29d261a368..21e7f9971dd 100644
--- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/generateBundle.txt
+++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/generateBundle.txt
@@ -1 +1 @@
-generateBundle cjs with assets/generateBundle-format-4efb05bcf.txt
\ No newline at end of file
+generateBundle cjs with assets/generateBundle-format-4efb05bc.txt
\ No newline at end of file
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js
index cb0659070f4..0ee875dbfdd 100644
--- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js
+++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const renderStart = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/renderStart-981aa2ea6.txt').href : new URL('assets/renderStart-981aa2ea6.txt', document.currentScript && document.currentScript.src || document.baseURI).href);
+const renderStart = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/renderStart-981aa2ea.txt').href : new URL('assets/renderStart-981aa2ea.txt', document.currentScript && document.currentScript.src || document.baseURI).href);
 const renderStartNamed = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/renderStart.txt').href : new URL('renderStart.txt', document.currentScript && document.currentScript.src || document.baseURI).href);
 const renderStartNamedImmediately = 'renderStart.txt';
 const bannerNamed = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/banner.txt').href : new URL('banner.txt', document.currentScript && document.currentScript.src || document.baseURI).href);
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/banner-8c7ed2d9b.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/banner-8c7ed2d9.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/banner-8c7ed2d9b.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/banner-8c7ed2d9.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/footer-0301844cc.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/footer-0301844c.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/footer-0301844cc.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/footer-0301844c.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-668db42d.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-668db42d.txt
new file mode 100644
index 00000000000..253f7587c3a
--- /dev/null
+++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-668db42d.txt
@@ -0,0 +1 @@
+generateBundle es with assets/generateBundle-format-c0bc1e08.txt
\ No newline at end of file
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-f544472a5.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-f544472a5.txt
deleted file mode 100644
index 583fb5cf4c5..00000000000
--- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-f544472a5.txt
+++ /dev/null
@@ -1 +0,0 @@
-generateBundle es with assets/generateBundle-format-c0bc1e08f.txt
\ No newline at end of file
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-format-c0bc1e08f.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-format-c0bc1e08.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-format-c0bc1e08f.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-format-c0bc1e08.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/intro-c432b372e.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/intro-c432b372.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/intro-c432b372e.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/intro-c432b372.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/outro-1e5fe0468.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/outro-1e5fe046.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/outro-1e5fe0468.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/outro-1e5fe046.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderChunk-aa9e49b7c.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderChunk-aa9e49b7.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderChunk-aa9e49b7c.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderChunk-aa9e49b7.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderStart-981aa2ea6.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderStart-981aa2ea.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderStart-981aa2ea6.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderStart-981aa2ea.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/generateBundle.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/generateBundle.txt
index 583fb5cf4c5..253f7587c3a 100644
--- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/generateBundle.txt
+++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/generateBundle.txt
@@ -1 +1 @@
-generateBundle es with assets/generateBundle-format-c0bc1e08f.txt
\ No newline at end of file
+generateBundle es with assets/generateBundle-format-c0bc1e08.txt
\ No newline at end of file
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js
index b2dfbfcfc3d..1e7d92b70a7 100644
--- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js
+++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js
@@ -1,4 +1,4 @@
-const renderStart = new URL('assets/renderStart-981aa2ea6.txt', import.meta.url).href;
+const renderStart = new URL('assets/renderStart-981aa2ea.txt', import.meta.url).href;
 const renderStartNamed = new URL('renderStart.txt', import.meta.url).href;
 const renderStartNamedImmediately = 'renderStart.txt';
 const bannerNamed = new URL('banner.txt', import.meta.url).href;
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/banner-8c7ed2d9b.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/banner-8c7ed2d9.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/banner-8c7ed2d9b.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/banner-8c7ed2d9.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/footer-0301844cc.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/footer-0301844c.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/footer-0301844cc.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/footer-0301844c.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-b08c42fd5.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-b0505b8f.txt
similarity index 92%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-b08c42fd5.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-b0505b8f.txt
index 4aa92ddce3e..7b9889b5acb 100644
--- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-b08c42fd5.txt
+++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-b0505b8f.txt
@@ -1 +1 @@
-generateBundle system with assets/generateBundle-format-bbc5e661e.txt
\ No newline at end of file
+generateBundle system with assets/generateBundle-format-bbc5e661.txt
\ No newline at end of file
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-format-bbc5e661e.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-format-bbc5e661.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-format-bbc5e661e.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-format-bbc5e661.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/intro-c432b372e.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/intro-c432b372.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/intro-c432b372e.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/intro-c432b372.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/outro-1e5fe0468.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/outro-1e5fe046.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/outro-1e5fe0468.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/outro-1e5fe046.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderChunk-aa9e49b7c.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderChunk-aa9e49b7.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderChunk-aa9e49b7c.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderChunk-aa9e49b7.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderStart-981aa2ea6.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderStart-981aa2ea.txt
similarity index 100%
rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderStart-981aa2ea6.txt
rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderStart-981aa2ea.txt
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/generateBundle.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/generateBundle.txt
index 4aa92ddce3e..7b9889b5acb 100644
--- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/generateBundle.txt
+++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/generateBundle.txt
@@ -1 +1 @@
-generateBundle system with assets/generateBundle-format-bbc5e661e.txt
\ No newline at end of file
+generateBundle system with assets/generateBundle-format-bbc5e661.txt
\ No newline at end of file
diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js
index 877e190283d..ecff092f8e7 100644
--- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js
+++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js
@@ -3,7 +3,7 @@ System.register([], (function (exports, module) {
 	return {
 		execute: (function () {
 
-			const renderStart = exports('renderStart', new URL('assets/renderStart-981aa2ea6.txt', module.meta.url).href);
+			const renderStart = exports('renderStart', new URL('assets/renderStart-981aa2ea.txt', module.meta.url).href);
 			const renderStartNamed = exports('renderStartNamed', new URL('renderStart.txt', module.meta.url).href);
 			const renderStartNamedImmediately = exports('renderStartNamedImmediately', 'renderStart.txt');
 			const bannerNamed = exports('bannerNamed', new URL('banner.txt', module.meta.url).href);
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-a7baadb6a-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-a7baadb6-amd.js
similarity index 100%
rename from test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-a7baadb6a-amd.js
rename to test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-a7baadb6-amd.js
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-528136a0b-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-528136a0b-amd.js
deleted file mode 100644
index 44ba341b3d0..00000000000
--- a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-528136a0b-amd.js
+++ /dev/null
@@ -1,5 +0,0 @@
-define(['./chunk-main2-a7baadb6a-amd'], (function (main2) { 'use strict';
-
-	main2.log(main2.dep);
-
-}));
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-94fe149e-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-94fe149e-amd.js
new file mode 100644
index 00000000000..f06358c3771
--- /dev/null
+++ b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-94fe149e-amd.js
@@ -0,0 +1,5 @@
+define(['./chunk-main2-a7baadb6-amd'], (function (main2) { 'use strict';
+
+	main2.log(main2.dep);
+
+}));
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-16bafa95-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-16bafa95-amd.js
new file mode 100644
index 00000000000..27e38c81871
--- /dev/null
+++ b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-16bafa95-amd.js
@@ -0,0 +1,7 @@
+define(['./chunk-main2-a7baadb6-amd'], (function (main2) { 'use strict';
+
+
+
+	return main2.log;
+
+}));
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-c3ca84339-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-c3ca84339-amd.js
deleted file mode 100644
index 523dc7035d3..00000000000
--- a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-c3ca84339-amd.js
+++ /dev/null
@@ -1,7 +0,0 @@
-define(['./chunk-main2-a7baadb6a-amd'], (function (main2) { 'use strict';
-
-
-
-	return main2.log;
-
-}));
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-399c15fcf-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-399c15fc-cjs.js
similarity index 100%
rename from test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-399c15fcf-cjs.js
rename to test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-399c15fc-cjs.js
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-2934d4fa-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-2934d4fa-cjs.js
new file mode 100644
index 00000000000..b3ace5cc380
--- /dev/null
+++ b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-2934d4fa-cjs.js
@@ -0,0 +1,5 @@
+'use strict';
+
+var main2 = require('./chunk-main2-399c15fc-cjs.js');
+
+main2.log(main2.dep);
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-a7d19b3f4-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-a7d19b3f4-cjs.js
deleted file mode 100644
index d041411eeba..00000000000
--- a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-a7d19b3f4-cjs.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-var main2 = require('./chunk-main2-399c15fcf-cjs.js');
-
-main2.log(main2.dep);
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-23a1fe926-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-23a1fe926-cjs.js
deleted file mode 100644
index 322e359ece4..00000000000
--- a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-23a1fe926-cjs.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-
-var main2 = require('./chunk-main2-399c15fcf-cjs.js');
-
-
-
-module.exports = main2.log;
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-523204ff-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-523204ff-cjs.js
new file mode 100644
index 00000000000..a2103eea76a
--- /dev/null
+++ b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-523204ff-cjs.js
@@ -0,0 +1,7 @@
+'use strict';
+
+var main2 = require('./chunk-main2-399c15fc-cjs.js');
+
+
+
+module.exports = main2.log;
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-c42fce1aa-es.js b/test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-c42fce1a-es.js
similarity index 100%
rename from test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-c42fce1aa-es.js
rename to test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-c42fce1a-es.js
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-6f12c5b2-es.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-6f12c5b2-es.js
new file mode 100644
index 00000000000..43a51c0260d
--- /dev/null
+++ b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-6f12c5b2-es.js
@@ -0,0 +1,3 @@
+import { l as log, d as dep } from './chunk-main2-c42fce1a-es.js';
+
+log(dep);
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-99920eca0-es.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-99920eca0-es.js
deleted file mode 100644
index 17421678972..00000000000
--- a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-99920eca0-es.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { l as log, d as dep } from './chunk-main2-c42fce1aa-es.js';
-
-log(dep);
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-a9b323b4-es.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-a9b323b4-es.js
new file mode 100644
index 00000000000..ebb3c3e8959
--- /dev/null
+++ b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-a9b323b4-es.js
@@ -0,0 +1 @@
+export { l as default } from './chunk-main2-c42fce1a-es.js';
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-ca3ce29a3-es.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-ca3ce29a3-es.js
deleted file mode 100644
index 3406d3e75ee..00000000000
--- a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-ca3ce29a3-es.js
+++ /dev/null
@@ -1 +0,0 @@
-export { l as default } from './chunk-main2-c42fce1aa-es.js';
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-9cc036248-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-9cc03624-system.js
similarity index 100%
rename from test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-9cc036248-system.js
rename to test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-9cc03624-system.js
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-e474b618d-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-720299cf-system.js
similarity index 70%
rename from test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-e474b618d-system.js
rename to test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-720299cf-system.js
index e06c49043c6..bbe15d21f98 100644
--- a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-e474b618d-system.js
+++ b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-720299cf-system.js
@@ -1,4 +1,4 @@
-System.register(['./chunk-main2-9cc036248-system.js'], (function () {
+System.register(['./chunk-main2-9cc03624-system.js'], (function () {
 	'use strict';
 	var log, dep;
 	return {
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-d12f7520c-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-c3cb1622-system.js
similarity index 64%
rename from test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-d12f7520c-system.js
rename to test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-c3cb1622-system.js
index 28f6951b8ba..8b0dde3a35e 100644
--- a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-d12f7520c-system.js
+++ b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-c3cb1622-system.js
@@ -1,4 +1,4 @@
-System.register(['./chunk-main2-9cc036248-system.js'], (function (exports) {
+System.register(['./chunk-main2-9cc03624-system.js'], (function (exports) {
 	'use strict';
 	return {
 		setters: [function (module) {
diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-7061c38c4.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-7061c38c.js
similarity index 100%
rename from test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-7061c38c4.js
rename to test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-7061c38c.js
diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-f9ef156df.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-82a5a8a4.js
similarity index 100%
rename from test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-f9ef156df.js
rename to test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-82a5a8a4.js
diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-8011025de.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-8011025d.js
similarity index 100%
rename from test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-8011025de.js
rename to test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-8011025d.js
diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-ad740c3b1.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-fc7b26ff.js
similarity index 100%
rename from test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-ad740c3b1.js
rename to test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-fc7b26ff.js
diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-2b8647b5d.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-2b8647b5.js
similarity index 100%
rename from test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-2b8647b5d.js
rename to test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-2b8647b5.js
diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-7658c32d3.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-369b04c8.js
similarity index 100%
rename from test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-7658c32d3.js
rename to test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-369b04c8.js
diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-34f894ee9.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-54240e14.js
similarity index 100%
rename from test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-34f894ee9.js
rename to test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-54240e14.js
diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-54240e14d.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-ed8fdbb3.js
similarity index 100%
rename from test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-54240e14d.js
rename to test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-ed8fdbb3.js
diff --git a/test/chunking-form/samples/hashing/double-hash/_expected/amd/7061c38c4/entry-7061c38c4.js b/test/chunking-form/samples/hashing/double-hash/_expected/amd/7061c38c/entry-7061c38c.js
similarity index 100%
rename from test/chunking-form/samples/hashing/double-hash/_expected/amd/7061c38c4/entry-7061c38c4.js
rename to test/chunking-form/samples/hashing/double-hash/_expected/amd/7061c38c/entry-7061c38c.js
diff --git a/test/chunking-form/samples/hashing/double-hash/_expected/cjs/8011025de/entry-8011025de.js b/test/chunking-form/samples/hashing/double-hash/_expected/cjs/8011025d/entry-8011025d.js
similarity index 100%
rename from test/chunking-form/samples/hashing/double-hash/_expected/cjs/8011025de/entry-8011025de.js
rename to test/chunking-form/samples/hashing/double-hash/_expected/cjs/8011025d/entry-8011025d.js
diff --git a/test/chunking-form/samples/hashing/double-hash/_expected/es/2b8647b5d/entry-2b8647b5d.js b/test/chunking-form/samples/hashing/double-hash/_expected/es/2b8647b5/entry-2b8647b5.js
similarity index 100%
rename from test/chunking-form/samples/hashing/double-hash/_expected/es/2b8647b5d/entry-2b8647b5d.js
rename to test/chunking-form/samples/hashing/double-hash/_expected/es/2b8647b5/entry-2b8647b5.js
diff --git a/test/chunking-form/samples/hashing/double-hash/_expected/system/54240e14d/entry-54240e14d.js b/test/chunking-form/samples/hashing/double-hash/_expected/system/54240e14/entry-54240e14.js
similarity index 100%
rename from test/chunking-form/samples/hashing/double-hash/_expected/system/54240e14d/entry-54240e14d.js
rename to test/chunking-form/samples/hashing/double-hash/_expected/system/54240e14/entry-54240e14.js
diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-bc720c3a.js b/test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-eb0f074f.js
similarity index 100%
rename from test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-bc720c3a.js
rename to test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-eb0f074f.js
diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-9302c3fcea.js b/test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-b24fb22e7f.js
similarity index 100%
rename from test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-9302c3fcea.js
rename to test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-b24fb22e7f.js
diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-c73670b6.js b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-87405ba3.js
similarity index 100%
rename from test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-c73670b6.js
rename to test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-87405ba3.js
diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-c27d529b6b.js b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-b2c59bdf14.js
similarity index 100%
rename from test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-c27d529b6b.js
rename to test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-b2c59bdf14.js
diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/es/main1-43f1ec1b.js b/test/chunking-form/samples/hashing/hash-size/_expected/es/main1-bcca55a1.js
similarity index 100%
rename from test/chunking-form/samples/hashing/hash-size/_expected/es/main1-43f1ec1b.js
rename to test/chunking-form/samples/hashing/hash-size/_expected/es/main1-bcca55a1.js
diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/es/main2-f20de32329.js b/test/chunking-form/samples/hashing/hash-size/_expected/es/main2-83d7b451fa.js
similarity index 100%
rename from test/chunking-form/samples/hashing/hash-size/_expected/es/main2-f20de32329.js
rename to test/chunking-form/samples/hashing/hash-size/_expected/es/main2-83d7b451fa.js
diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-5a34c814.js b/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-122e0961.js
similarity index 100%
rename from test/chunking-form/samples/hashing/hash-size/_expected/system/main1-5a34c814.js
rename to test/chunking-form/samples/hashing/hash-size/_expected/system/main1-122e0961.js
diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-80aee34b0c.js b/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-ed4d8c97a2.js
similarity index 100%
rename from test/chunking-form/samples/hashing/hash-size/_expected/system/main2-80aee34b0c.js
rename to test/chunking-form/samples/hashing/hash-size/_expected/system/main2-ed4d8c97a2.js
diff --git a/test/chunking-form/samples/hashing/random-match/_config.js b/test/chunking-form/samples/hashing/random-match/_config.js
index ff103be1697..939d7935703 100644
--- a/test/chunking-form/samples/hashing/random-match/_config.js
+++ b/test/chunking-form/samples/hashing/random-match/_config.js
@@ -2,7 +2,7 @@ module.exports = {
 	description: 'leaves random hash matches untransformed',
 	options: {
 		output: {
-			entryFileNames: 'entry-[hash]-_!~{0001}~-_!~{1234}~.js'
+			entryFileNames: 'entry-[hash]-!~{001}~-!~{123}~.js'
 		}
 	}
 };
diff --git a/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-a38385ce-a38385ce-!~{123}~.js b/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-a38385ce-a38385ce-!~{123}~.js
new file mode 100644
index 00000000000..dea40a5e37e
--- /dev/null
+++ b/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-a38385ce-a38385ce-!~{123}~.js
@@ -0,0 +1,6 @@
+define((function () { 'use strict';
+
+	console.log('replaced: a38385ce');
+	console.log('not replaced: !~{123}~');
+
+}));
diff --git a/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-f76a8f807-_!~{0001}~-_!~{1234}~.js b/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-f76a8f807-_!~{0001}~-_!~{1234}~.js
deleted file mode 100644
index 411f376af5a..00000000000
--- a/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-f76a8f807-_!~{0001}~-_!~{1234}~.js
+++ /dev/null
@@ -1,6 +0,0 @@
-define((function () { 'use strict';
-
-	console.log('replaced: _!~{0001}~');
-	console.log('not replaced: _!~{1234}~');
-
-}));
diff --git a/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55937672-55937672-!~{123}~.js b/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55937672-55937672-!~{123}~.js
new file mode 100644
index 00000000000..7040251a7df
--- /dev/null
+++ b/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55937672-55937672-!~{123}~.js
@@ -0,0 +1,4 @@
+'use strict';
+
+console.log('replaced: 55937672');
+console.log('not replaced: !~{123}~');
diff --git a/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-c895b5727-_!~{0001}~-_!~{1234}~.js b/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-c895b5727-_!~{0001}~-_!~{1234}~.js
deleted file mode 100644
index dbdfe0a316b..00000000000
--- a/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-c895b5727-_!~{0001}~-_!~{1234}~.js
+++ /dev/null
@@ -1,4 +0,0 @@
-'use strict';
-
-console.log('replaced: _!~{0001}~');
-console.log('not replaced: _!~{1234}~');
diff --git a/test/chunking-form/samples/hashing/random-match/_expected/es/entry-15d288a46-_!~{0001}~-_!~{1234}~.js b/test/chunking-form/samples/hashing/random-match/_expected/es/entry-15d288a46-_!~{0001}~-_!~{1234}~.js
deleted file mode 100644
index b44f34263a3..00000000000
--- a/test/chunking-form/samples/hashing/random-match/_expected/es/entry-15d288a46-_!~{0001}~-_!~{1234}~.js
+++ /dev/null
@@ -1,2 +0,0 @@
-console.log('replaced: _!~{0001}~');
-console.log('not replaced: _!~{1234}~');
diff --git a/test/chunking-form/samples/hashing/random-match/_expected/es/entry-3e8c77bc-3e8c77bc-!~{123}~.js b/test/chunking-form/samples/hashing/random-match/_expected/es/entry-3e8c77bc-3e8c77bc-!~{123}~.js
new file mode 100644
index 00000000000..23eae93eadc
--- /dev/null
+++ b/test/chunking-form/samples/hashing/random-match/_expected/es/entry-3e8c77bc-3e8c77bc-!~{123}~.js
@@ -0,0 +1,2 @@
+console.log('replaced: 3e8c77bc');
+console.log('not replaced: !~{123}~');
diff --git a/test/chunking-form/samples/hashing/random-match/_expected/system/entry-86b537413-_!~{0001}~-_!~{1234}~.js b/test/chunking-form/samples/hashing/random-match/_expected/system/entry-49c9800c-49c9800c-!~{123}~.js
similarity index 54%
rename from test/chunking-form/samples/hashing/random-match/_expected/system/entry-86b537413-_!~{0001}~-_!~{1234}~.js
rename to test/chunking-form/samples/hashing/random-match/_expected/system/entry-49c9800c-49c9800c-!~{123}~.js
index 86c166fc21a..8fc7815674e 100644
--- a/test/chunking-form/samples/hashing/random-match/_expected/system/entry-86b537413-_!~{0001}~-_!~{1234}~.js
+++ b/test/chunking-form/samples/hashing/random-match/_expected/system/entry-49c9800c-49c9800c-!~{123}~.js
@@ -3,8 +3,8 @@ System.register([], (function () {
 	return {
 		execute: (function () {
 
-			console.log('replaced: _!~{0001}~');
-			console.log('not replaced: _!~{1234}~');
+			console.log('replaced: 49c9800c');
+			console.log('not replaced: !~{123}~');
 
 		})
 	};
diff --git a/test/chunking-form/samples/hashing/random-match/main.js b/test/chunking-form/samples/hashing/random-match/main.js
index b44f34263a3..21de10d404e 100644
--- a/test/chunking-form/samples/hashing/random-match/main.js
+++ b/test/chunking-form/samples/hashing/random-match/main.js
@@ -1,2 +1,2 @@
-console.log('replaced: _!~{0001}~');
-console.log('not replaced: _!~{1234}~');
+console.log('replaced: !~{001}~');
+console.log('not replaced: !~{123}~');
diff --git a/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/amd/09da348ab.js b/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/amd/09da348a.js
similarity index 100%
rename from test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/amd/09da348ab.js
rename to test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/amd/09da348a.js
diff --git a/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/cjs/b99f90f48.js b/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/cjs/b99f90f4.js
similarity index 100%
rename from test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/cjs/b99f90f48.js
rename to test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/cjs/b99f90f4.js
diff --git a/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/es/55aeacf86.js b/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/es/55aeacf8.js
similarity index 100%
rename from test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/es/55aeacf86.js
rename to test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/es/55aeacf8.js
diff --git a/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/system/e65da8700.js b/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/system/e65da870.js
similarity index 100%
rename from test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/system/e65da8700.js
rename to test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/system/e65da870.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/b.str-amd-f73e15b93.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/b.str-amd-f73e15b9.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/b.str-amd-f73e15b93.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/b.str-amd-f73e15b9.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/c-amd-c1bed1630.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/c-amd-c1bed163.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/c-amd-c1bed1630.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/c-amd-c1bed163.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/d-amd-f5c92c046.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/d-amd-f5c92c04.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/d-amd-f5c92c046.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/d-amd-f5c92c04.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/e-amd-f393b98d6.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/e-amd-f393b98d.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/e-amd-f393b98d6.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/e-amd-f393b98d.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/f-amd-df81ac714.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/f-amd-df81ac71.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/f-amd-df81ac714.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/f-amd-df81ac71.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/g-amd-1f750b5cf.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/g-amd-1f750b5c.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/g-amd-1f750b5cf.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/g-amd-1f750b5c.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/h-amd-a60c0f22e.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/h-amd-a60c0f22.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/h-amd-a60c0f22e.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/h-amd-a60c0f22.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-22e059f72.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-22e059f72.js
deleted file mode 100644
index 31a53457be8..00000000000
--- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-22e059f72.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(['exports', './nested/a-amd-5dc7856c7', './b.str-amd-f73e15b93', './c-amd-c1bed1630', './d-amd-f5c92c046', './e-amd-f393b98d6', './f-amd-df81ac714', './g-amd-1f750b5cf', './h-amd-a60c0f22e', './no-ext-amd-9d2c6ef6c'], (function (exports, a, b, c, d, e, f, g, h, noExt) { 'use strict';
-
-
-
-	exports.a = a;
-	exports.b = b;
-	exports.c = c;
-	exports.d = d;
-	exports.e = e;
-	exports.f = f;
-	exports.g = g;
-	exports.h = h;
-	exports.x = noExt;
-
-}));
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-addffa50.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-addffa50.js
new file mode 100644
index 00000000000..55eaa129472
--- /dev/null
+++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-addffa50.js
@@ -0,0 +1,15 @@
+define(['exports', './nested/a-amd-5dc7856c', './b.str-amd-f73e15b9', './c-amd-c1bed163', './d-amd-f5c92c04', './e-amd-f393b98d', './f-amd-df81ac71', './g-amd-1f750b5c', './h-amd-a60c0f22', './no-ext-amd-9d2c6ef6'], (function (exports, a, b, c, d, e, f, g, h, noExt) { 'use strict';
+
+
+
+	exports.a = a;
+	exports.b = b;
+	exports.c = c;
+	exports.d = d;
+	exports.e = e;
+	exports.f = f;
+	exports.g = g;
+	exports.h = h;
+	exports.x = noExt;
+
+}));
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/a-amd-5dc7856c7.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/a-amd-5dc7856c.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/a-amd-5dc7856c7.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/a-amd-5dc7856c.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/no-ext-amd-9d2c6ef6c.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/no-ext-amd-9d2c6ef6.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/no-ext-amd-9d2c6ef6c.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/no-ext-amd-9d2c6ef6.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/b.str-cjs-6703f3b21.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/b.str-cjs-6703f3b2.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/b.str-cjs-6703f3b21.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/b.str-cjs-6703f3b2.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/c-cjs-71ac00983.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/c-cjs-71ac0098.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/c-cjs-71ac00983.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/c-cjs-71ac0098.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/d-cjs-9b009b8fc.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/d-cjs-9b009b8f.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/d-cjs-9b009b8fc.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/d-cjs-9b009b8f.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/e-cjs-831dad1f9.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/e-cjs-831dad1f.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/e-cjs-831dad1f9.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/e-cjs-831dad1f.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/f-cjs-39905a996.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/f-cjs-39905a99.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/f-cjs-39905a996.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/f-cjs-39905a99.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/g-cjs-3328e22bc.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/g-cjs-3328e22b.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/g-cjs-3328e22bc.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/g-cjs-3328e22b.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/h-cjs-d8541d4b5.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/h-cjs-d8541d4b.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/h-cjs-d8541d4b5.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/h-cjs-d8541d4b.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-ac37d359c.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-ac37d359c.js
deleted file mode 100644
index d6f6d661231..00000000000
--- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-ac37d359c.js
+++ /dev/null
@@ -1,23 +0,0 @@
-'use strict';
-
-var a = require('./nested/a-cjs-80f9b8c36.js');
-var b = require('./b.str-cjs-6703f3b21.js');
-var c = require('./c-cjs-71ac00983.js');
-var d = require('./d-cjs-9b009b8fc.js');
-var e = require('./e-cjs-831dad1f9.js');
-var f = require('./f-cjs-39905a996.js');
-var g = require('./g-cjs-3328e22bc.js');
-var h = require('./h-cjs-d8541d4b5.js');
-var noExt = require('./no-ext-cjs-500f8f81a.js');
-
-
-
-exports.a = a;
-exports.b = b;
-exports.c = c;
-exports.d = d;
-exports.e = e;
-exports.f = f;
-exports.g = g;
-exports.h = h;
-exports.x = noExt;
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-cb43c6df.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-cb43c6df.js
new file mode 100644
index 00000000000..89e6a423970
--- /dev/null
+++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-cb43c6df.js
@@ -0,0 +1,23 @@
+'use strict';
+
+var a = require('./nested/a-cjs-80f9b8c3.js');
+var b = require('./b.str-cjs-6703f3b2.js');
+var c = require('./c-cjs-71ac0098.js');
+var d = require('./d-cjs-9b009b8f.js');
+var e = require('./e-cjs-831dad1f.js');
+var f = require('./f-cjs-39905a99.js');
+var g = require('./g-cjs-3328e22b.js');
+var h = require('./h-cjs-d8541d4b.js');
+var noExt = require('./no-ext-cjs-500f8f81.js');
+
+
+
+exports.a = a;
+exports.b = b;
+exports.c = c;
+exports.d = d;
+exports.e = e;
+exports.f = f;
+exports.g = g;
+exports.h = h;
+exports.x = noExt;
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/a-cjs-80f9b8c36.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/a-cjs-80f9b8c3.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/a-cjs-80f9b8c36.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/a-cjs-80f9b8c3.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/no-ext-cjs-500f8f81a.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/no-ext-cjs-500f8f81.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/no-ext-cjs-500f8f81a.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/no-ext-cjs-500f8f81.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/b.str-es-3ce883b15.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/b.str-es-3ce883b1.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/b.str-es-3ce883b15.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/b.str-es-3ce883b1.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/c-es-7b7256f96.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/c-es-7b7256f9.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/c-es-7b7256f96.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/c-es-7b7256f9.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/d-es-1616849c2.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/d-es-1616849c.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/d-es-1616849c2.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/d-es-1616849c.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/e-es-e18089faa.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/e-es-e18089fa.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/e-es-e18089faa.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/e-es-e18089fa.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/f-es-c1646e128.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/f-es-c1646e12.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/f-es-c1646e128.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/f-es-c1646e12.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/g-es-968f87d20.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/g-es-968f87d2.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/g-es-968f87d20.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/g-es-968f87d2.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/h-es-05491bfaa.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/h-es-05491bfa.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/h-es-05491bfaa.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/h-es-05491bfa.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-1b53d956a.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-1b53d956a.js
deleted file mode 100644
index 471dbd92d87..00000000000
--- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-1b53d956a.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export { default as a } from './nested/a-es-125ea65c4.js';
-export { default as b } from './b.str-es-3ce883b15.js';
-export { default as c } from './c-es-7b7256f96.js';
-export { default as d } from './d-es-1616849c2.js';
-export { default as e } from './e-es-e18089faa.js';
-export { default as f } from './f-es-c1646e128.js';
-export { default as g } from './g-es-968f87d20.js';
-export { default as h } from './h-es-05491bfaa.js';
-export { default as x } from './no-ext-es-1f34b6e8e.js';
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-f8350081.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-f8350081.js
new file mode 100644
index 00000000000..bea0b84c6a0
--- /dev/null
+++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-f8350081.js
@@ -0,0 +1,9 @@
+export { default as a } from './nested/a-es-125ea65c.js';
+export { default as b } from './b.str-es-3ce883b1.js';
+export { default as c } from './c-es-7b7256f9.js';
+export { default as d } from './d-es-1616849c.js';
+export { default as e } from './e-es-e18089fa.js';
+export { default as f } from './f-es-c1646e12.js';
+export { default as g } from './g-es-968f87d2.js';
+export { default as h } from './h-es-05491bfa.js';
+export { default as x } from './no-ext-es-1f34b6e8.js';
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/a-es-125ea65c4.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/a-es-125ea65c.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/a-es-125ea65c4.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/a-es-125ea65c.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/no-ext-es-1f34b6e8e.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/no-ext-es-1f34b6e8.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/no-ext-es-1f34b6e8e.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/no-ext-es-1f34b6e8.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/b.str-system-2fa3160e8.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/b.str-system-2fa3160e.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/b.str-system-2fa3160e8.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/b.str-system-2fa3160e.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/c-system-9442eacde.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/c-system-9442eacd.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/c-system-9442eacde.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/c-system-9442eacd.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/d-system-1a05eedae.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/d-system-1a05eeda.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/d-system-1a05eedae.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/d-system-1a05eeda.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/e-system-f73caf6ab.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/e-system-f73caf6a.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/e-system-f73caf6ab.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/e-system-f73caf6a.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/f-system-b3b06e3ff.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/f-system-b3b06e3f.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/f-system-b3b06e3ff.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/f-system-b3b06e3f.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/g-system-9b3ad6522.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/g-system-9b3ad652.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/g-system-9b3ad6522.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/g-system-9b3ad652.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/h-system-6c6b48ca2.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/h-system-6c6b48ca.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/h-system-6c6b48ca2.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/h-system-6c6b48ca.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-90a1fea9c.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-d08bfef5.js
similarity index 66%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-90a1fea9c.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-d08bfef5.js
index d076abf9dd7..ed7bef41127 100644
--- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-90a1fea9c.js
+++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-d08bfef5.js
@@ -1,4 +1,4 @@
-System.register(['./nested/a-system-db94ffc0b.js', './b.str-system-2fa3160e8.js', './c-system-9442eacde.js', './d-system-1a05eedae.js', './e-system-f73caf6ab.js', './f-system-b3b06e3ff.js', './g-system-9b3ad6522.js', './h-system-6c6b48ca2.js', './no-ext-system-0cf938a89.js'], (function (exports) {
+System.register(['./nested/a-system-db94ffc0.js', './b.str-system-2fa3160e.js', './c-system-9442eacd.js', './d-system-1a05eeda.js', './e-system-f73caf6a.js', './f-system-b3b06e3f.js', './g-system-9b3ad652.js', './h-system-6c6b48ca.js', './no-ext-system-0cf938a8.js'], (function (exports) {
 	'use strict';
 	return {
 		setters: [function (module) {
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/a-system-db94ffc0b.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/a-system-db94ffc0.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/a-system-db94ffc0b.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/a-system-db94ffc0.js
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/no-ext-system-0cf938a89.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/no-ext-system-0cf938a8.js
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/no-ext-system-0cf938a89.js
rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/no-ext-system-0cf938a8.js
diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-03552e5c1.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-03552e5c.mjs
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-03552e5c1.mjs
rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-03552e5c.mjs
diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-724c602d3.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-724c602d.mjs
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-724c602d3.mjs
rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-724c602d.mjs
diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-e9dc1b7ec.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-e9dc1b7e.mjs
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-e9dc1b7ec.mjs
rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-e9dc1b7e.mjs
diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-30156411.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-30156411.mjs
new file mode 100644
index 00000000000..05b7abceb0f
--- /dev/null
+++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-30156411.mjs
@@ -0,0 +1,7 @@
+define(['./_virtual/_virtualModule-amd-03552e5c.mjs', './_virtual/_virtualWithExt-amd-e9dc1b7e.mjs', './_virtual/_virtualWithAssetExt.str-amd-724c602d.mjs'], (function (_virtualModule, _virtualWithExt, _virtualWithAssetExt) { 'use strict';
+
+	assert.equal(_virtualModule.virtual, 'Virtual!');
+	assert.equal(_virtualWithExt.virtual2, 'Virtual2!');
+	assert.equal(_virtualWithAssetExt.virtual3, 'Virtual3!');
+
+}));
diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-8bc20eae7.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-8bc20eae7.mjs
deleted file mode 100644
index d23bc310d0b..00000000000
--- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-8bc20eae7.mjs
+++ /dev/null
@@ -1,7 +0,0 @@
-define(['./_virtual/_virtualModule-amd-03552e5c1.mjs', './_virtual/_virtualWithExt-amd-e9dc1b7ec.mjs', './_virtual/_virtualWithAssetExt.str-amd-724c602d3.mjs'], (function (_virtualModule, _virtualWithExt, _virtualWithAssetExt) { 'use strict';
-
-	assert.equal(_virtualModule.virtual, 'Virtual!');
-	assert.equal(_virtualWithExt.virtual2, 'Virtual2!');
-	assert.equal(_virtualWithAssetExt.virtual3, 'Virtual3!');
-
-}));
diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-bbe1ad5ee.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-bbe1ad5e.mjs
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-bbe1ad5ee.mjs
rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-bbe1ad5e.mjs
diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-0e5616114.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-0e561611.mjs
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-0e5616114.mjs
rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-0e561611.mjs
diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-b148ca330.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-b148ca33.mjs
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-b148ca330.mjs
rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-b148ca33.mjs
diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-2e0286774.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-23637a85.mjs
similarity index 86%
rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-2e0286774.mjs
rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-23637a85.mjs
index 94cd9787d3f..7246a157d47 100644
--- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-2e0286774.mjs
+++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-23637a85.mjs
@@ -1,8 +1,8 @@
 'use strict';
 
-var _virtualModule = require('./_virtual/_virtualModule-cjs-bbe1ad5ee.mjs');
-var _virtualWithExt = require('./_virtual/_virtualWithExt-cjs-b148ca330.mjs');
-var _virtualWithAssetExt = require('./_virtual/_virtualWithAssetExt.str-cjs-0e5616114.mjs');
+var _virtualModule = require('./_virtual/_virtualModule-cjs-bbe1ad5e.mjs');
+var _virtualWithExt = require('./_virtual/_virtualWithExt-cjs-b148ca33.mjs');
+var _virtualWithAssetExt = require('./_virtual/_virtualWithAssetExt.str-cjs-0e561611.mjs');
 
 assert.equal(_virtualModule.virtual, 'Virtual!');
 assert.equal(_virtualWithExt.virtual2, 'Virtual2!');
diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualModule-es-22303f19c.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualModule-es-22303f19.mjs
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualModule-es-22303f19c.mjs
rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualModule-es-22303f19.mjs
diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithAssetExt.str-es-07beb78c0.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithAssetExt.str-es-07beb78c.mjs
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithAssetExt.str-es-07beb78c0.mjs
rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithAssetExt.str-es-07beb78c.mjs
diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithExt-es-6330be378.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithExt-es-6330be37.mjs
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithExt-es-6330be378.mjs
rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithExt-es-6330be37.mjs
diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-96fd51940.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-956265de.mjs
similarity index 71%
rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-96fd51940.mjs
rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-956265de.mjs
index 4fb1858c1c9..b76ad5331d4 100644
--- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-96fd51940.mjs
+++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-956265de.mjs
@@ -1,6 +1,6 @@
-import { virtual } from './_virtual/_virtualModule-es-22303f19c.mjs';
-import { virtual2 } from './_virtual/_virtualWithExt-es-6330be378.mjs';
-import { virtual3 } from './_virtual/_virtualWithAssetExt.str-es-07beb78c0.mjs';
+import { virtual } from './_virtual/_virtualModule-es-22303f19.mjs';
+import { virtual2 } from './_virtual/_virtualWithExt-es-6330be37.mjs';
+import { virtual3 } from './_virtual/_virtualWithAssetExt.str-es-07beb78c.mjs';
 
 assert.equal(virtual, 'Virtual!');
 assert.equal(virtual2, 'Virtual2!');
diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualModule-system-26bc50708.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualModule-system-26bc5070.mjs
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualModule-system-26bc50708.mjs
rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualModule-system-26bc5070.mjs
diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithAssetExt.str-system-98927794a.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithAssetExt.str-system-98927794.mjs
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithAssetExt.str-system-98927794a.mjs
rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithAssetExt.str-system-98927794.mjs
diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithExt-system-11e583df3.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithExt-system-11e583df.mjs
similarity index 100%
rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithExt-system-11e583df3.mjs
rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithExt-system-11e583df.mjs
diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-17a184843.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-36e9b93b.mjs
similarity index 67%
rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-17a184843.mjs
rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-36e9b93b.mjs
index 208eee2f0fe..0471f396998 100644
--- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-17a184843.mjs
+++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-36e9b93b.mjs
@@ -1,4 +1,4 @@
-System.register(['./_virtual/_virtualModule-system-26bc50708.mjs', './_virtual/_virtualWithExt-system-11e583df3.mjs', './_virtual/_virtualWithAssetExt.str-system-98927794a.mjs'], (function () {
+System.register(['./_virtual/_virtualModule-system-26bc5070.mjs', './_virtual/_virtualWithExt-system-11e583df.mjs', './_virtual/_virtualWithAssetExt.str-system-98927794.mjs'], (function () {
 	'use strict';
 	var virtual, virtual2, virtual3;
 	return {
diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main1-31ed1903c.js b/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main1-31ed1903.js
similarity index 100%
rename from test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main1-31ed1903c.js
rename to test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main1-31ed1903.js
diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-7097303ab.js b/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-4c3da82f.js
similarity index 62%
rename from test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-7097303ab.js
rename to test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-4c3da82f.js
index e8243a47efe..a8a0784ce22 100644
--- a/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-7097303ab.js
+++ b/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-4c3da82f.js
@@ -1,4 +1,4 @@
-import { added } from "./entry-main1-31ed1903c.js";
+import { added } from "./entry-main1-31ed1903.js";
 console.log(added);
 define((function () { 'use strict';
 
diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main1-c6673fa55.js b/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main1-c6673fa5.js
similarity index 100%
rename from test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main1-c6673fa55.js
rename to test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main1-c6673fa5.js
diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-218bc884c.js b/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-a3a04675.js
similarity index 52%
rename from test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-218bc884c.js
rename to test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-a3a04675.js
index 42cabd5b48c..af9ae0e960b 100644
--- a/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-218bc884c.js
+++ b/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-a3a04675.js
@@ -1,4 +1,4 @@
-import { added } from "./entry-main1-c6673fa55.js";
+import { added } from "./entry-main1-c6673fa5.js";
 console.log(added);
 'use strict';
 
diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main1-56d7d3687.js b/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main1-56d7d368.js
similarity index 100%
rename from test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main1-56d7d3687.js
rename to test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main1-56d7d368.js
diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-7827261c.js b/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-7827261c.js
new file mode 100644
index 00000000000..183983b05c8
--- /dev/null
+++ b/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-7827261c.js
@@ -0,0 +1,3 @@
+import { added } from "./entry-main1-56d7d368.js";
+console.log(added);
+console.log('main2');
diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-eb0bbfdc7.js b/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-eb0bbfdc7.js
deleted file mode 100644
index d843ccc27c9..00000000000
--- a/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-eb0bbfdc7.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { added } from "./entry-main1-56d7d3687.js";
-console.log(added);
-console.log('main2');
diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main1-d7dc9358d.js b/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main1-d7dc9358.js
similarity index 100%
rename from test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main1-d7dc9358d.js
rename to test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main1-d7dc9358.js
diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-661a390bc.js b/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-f1bbcc21.js
similarity index 73%
rename from test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-661a390bc.js
rename to test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-f1bbcc21.js
index e11fd858e3e..f97000e8248 100644
--- a/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-661a390bc.js
+++ b/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-f1bbcc21.js
@@ -1,4 +1,4 @@
-import { added } from "./entry-main1-d7dc9358d.js";
+import { added } from "./entry-main1-d7dc9358.js";
 console.log(added);
 System.register([], (function () {
 	'use strict';
diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/asset-test-9f86d0818 b/test/chunking-form/samples/render-chunk/_expected/amd/asset-test-9f86d081
similarity index 100%
rename from test/chunking-form/samples/render-chunk/_expected/amd/asset-test-9f86d0818
rename to test/chunking-form/samples/render-chunk/_expected/amd/asset-test-9f86d081
diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-80e44242e.js b/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-88c5c49b.js
similarity index 70%
rename from test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-80e44242e.js
rename to test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-88c5c49b.js
index f079021e8ee..df6077cdab8 100644
--- a/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-80e44242e.js
+++ b/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-88c5c49b.js
@@ -1,7 +1,7 @@
 define(['require', 'exports'], (function (require, exports) { 'use strict';
 
 	var num = 2;
-	console.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d0818'), document.baseURI).href);
+	console.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href);
 
 	exports.num = num;
 
@@ -20,24 +20,24 @@ console.log({
   "name": "dep2",
   "type": "chunk",
   "dynamicImports": [],
-  "fileName": "chunk-dep2-80e44242e.js",
+  "fileName": "chunk-dep2-88c5c49b.js",
   "implicitlyLoadedBefore": [],
   "importedBindings": {},
   "imports": [],
   "modules": {
     "**/dep2.js": {
-      "code": "\tvar num = 2;\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d0818'), document.baseURI).href);",
+      "code": "\tvar num = 2;\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href);",
       "originalLength": 19,
       "removedExports": [],
       "renderedExports": [
         "num"
       ],
-      "renderedLength": 118
+      "renderedLength": 117
     }
   },
   "referencedFiles": [
-    "asset-test-9f86d0818"
+    "asset-test-9f86d081"
   ]
 });
-console.log('all chunks', ["entry-main1-8ead5feeb.js","chunk-dep2-80e44242e.js","entry-main2-c8ddb3661.js"])
-console.log('referenced asset in renderChunk', 'asset-test-9f86d0818');
+console.log('all chunks', ["entry-main1-87907a68.js","chunk-dep2-88c5c49b.js","entry-main2-71e00327.js"])
+console.log('referenced asset in renderChunk', 'asset-test-9f86d081');
diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-8ead5feeb.js b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-87907a68.js
similarity index 61%
rename from test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-8ead5feeb.js
rename to test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-87907a68.js
index a7f6bdf983d..a8ef7fad868 100644
--- a/test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-8ead5feeb.js
+++ b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-87907a68.js
@@ -1,10 +1,10 @@
-define(['require', './chunk-dep2-80e44242e'], (function (require, dep2) { 'use strict';
+define(['require', './chunk-dep2-88c5c49b'], (function (require, dep2) { 'use strict';
 
 	var num = 1;
-	console.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d0818'), document.baseURI).href);
+	console.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href);
 
 	console.log(num + dep2.num);
-	console.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d0818'), document.baseURI).href);
+	console.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href);
 
 }));
 console.log({
@@ -20,37 +20,37 @@ console.log({
   "name": "main1",
   "type": "chunk",
   "dynamicImports": [],
-  "fileName": "entry-main1-8ead5feeb.js",
+  "fileName": "entry-main1-87907a68.js",
   "implicitlyLoadedBefore": [],
   "importedBindings": {
-    "chunk-dep2-80e44242e.js": [
+    "chunk-dep2-88c5c49b.js": [
       "num"
     ]
   },
   "imports": [
-    "chunk-dep2-80e44242e.js"
+    "chunk-dep2-88c5c49b.js"
   ],
   "modules": {
     "**/dep1.js": {
-      "code": "\tvar num = 1;\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d0818'), document.baseURI).href);",
+      "code": "\tvar num = 1;\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href);",
       "originalLength": 19,
       "removedExports": [],
       "renderedExports": [
         "num"
       ],
-      "renderedLength": 118
+      "renderedLength": 117
     },
     "**/main1.js": {
-      "code": "\tconsole.log(num + dep2.num);\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d0818'), document.baseURI).href);",
+      "code": "\tconsole.log(num + dep2.num);\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href);",
       "originalLength": 102,
       "removedExports": [],
       "renderedExports": [],
-      "renderedLength": 134
+      "renderedLength": 133
     }
   },
   "referencedFiles": [
-    "asset-test-9f86d0818"
+    "asset-test-9f86d081"
   ]
 });
-console.log('all chunks', ["entry-main1-8ead5feeb.js","chunk-dep2-80e44242e.js","entry-main2-c8ddb3661.js"])
-console.log('referenced asset in renderChunk', 'asset-test-9f86d0818');
+console.log('all chunks', ["entry-main1-87907a68.js","chunk-dep2-88c5c49b.js","entry-main2-71e00327.js"])
+console.log('referenced asset in renderChunk', 'asset-test-9f86d081');
diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-c8ddb3661.js b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-71e00327.js
similarity index 61%
rename from test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-c8ddb3661.js
rename to test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-71e00327.js
index 2565fdd4d93..33f959ffeca 100644
--- a/test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-c8ddb3661.js
+++ b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-71e00327.js
@@ -1,10 +1,10 @@
-define(['require', './chunk-dep2-80e44242e'], (function (require, dep2) { 'use strict';
+define(['require', './chunk-dep2-88c5c49b'], (function (require, dep2) { 'use strict';
 
 	var num = 3;
-	console.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d0818'), document.baseURI).href);
+	console.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href);
 
 	console.log(dep2.num + num);
-	console.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d0818'), document.baseURI).href);
+	console.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href);
 
 }));
 console.log({
@@ -20,37 +20,37 @@ console.log({
   "name": "main2",
   "type": "chunk",
   "dynamicImports": [],
-  "fileName": "entry-main2-c8ddb3661.js",
+  "fileName": "entry-main2-71e00327.js",
   "implicitlyLoadedBefore": [],
   "importedBindings": {
-    "chunk-dep2-80e44242e.js": [
+    "chunk-dep2-88c5c49b.js": [
       "num"
     ]
   },
   "imports": [
-    "chunk-dep2-80e44242e.js"
+    "chunk-dep2-88c5c49b.js"
   ],
   "modules": {
     "**/dep3.js": {
-      "code": "\tvar num = 3;\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d0818'), document.baseURI).href);",
+      "code": "\tvar num = 3;\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href);",
       "originalLength": 19,
       "removedExports": [],
       "renderedExports": [
         "num"
       ],
-      "renderedLength": 118
+      "renderedLength": 117
     },
     "**/main2.js": {
-      "code": "\tconsole.log(dep2.num + num);\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d0818'), document.baseURI).href);",
+      "code": "\tconsole.log(dep2.num + num);\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href);",
       "originalLength": 102,
       "removedExports": [],
       "renderedExports": [],
-      "renderedLength": 134
+      "renderedLength": 133
     }
   },
   "referencedFiles": [
-    "asset-test-9f86d0818"
+    "asset-test-9f86d081"
   ]
 });
-console.log('all chunks', ["entry-main1-8ead5feeb.js","chunk-dep2-80e44242e.js","entry-main2-c8ddb3661.js"])
-console.log('referenced asset in renderChunk', 'asset-test-9f86d0818');
+console.log('all chunks', ["entry-main1-87907a68.js","chunk-dep2-88c5c49b.js","entry-main2-71e00327.js"])
+console.log('referenced asset in renderChunk', 'asset-test-9f86d081');
diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/asset-test-9f86d0818 b/test/chunking-form/samples/render-chunk/_expected/cjs/asset-test-9f86d081
similarity index 100%
rename from test/chunking-form/samples/render-chunk/_expected/cjs/asset-test-9f86d0818
rename to test/chunking-form/samples/render-chunk/_expected/cjs/asset-test-9f86d081
diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-7dee0ddf4.js b/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-970ee28f.js
similarity index 62%
rename from test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-7dee0ddf4.js
rename to test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-970ee28f.js
index 6dff4b0ad2f..886925ecbef 100644
--- a/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-7dee0ddf4.js
+++ b/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-970ee28f.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var num = 2;
-console.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d0818').href : new URL('asset-test-9f86d0818', document.currentScript && document.currentScript.src || document.baseURI).href));
+console.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href));
 
 exports.num = num;
 console.log({
@@ -18,24 +18,24 @@ console.log({
   "name": "dep2",
   "type": "chunk",
   "dynamicImports": [],
-  "fileName": "chunk-dep2-7dee0ddf4.js",
+  "fileName": "chunk-dep2-970ee28f.js",
   "implicitlyLoadedBefore": [],
   "importedBindings": {},
   "imports": [],
   "modules": {
     "**/dep2.js": {
-      "code": "var num = 2;\nconsole.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d0818').href : new URL('asset-test-9f86d0818', document.currentScript && document.currentScript.src || document.baseURI).href));",
+      "code": "var num = 2;\nconsole.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href));",
       "originalLength": 19,
       "removedExports": [],
       "renderedExports": [
         "num"
       ],
-      "renderedLength": 277
+      "renderedLength": 275
     }
   },
   "referencedFiles": [
-    "asset-test-9f86d0818"
+    "asset-test-9f86d081"
   ]
 });
-console.log('all chunks', ["entry-main1-9d05d34a2.js","chunk-dep2-7dee0ddf4.js","entry-main2-9ac8fff25.js"])
-console.log('referenced asset in renderChunk', 'asset-test-9f86d0818');
+console.log('all chunks', ["entry-main1-6d518561.js","chunk-dep2-970ee28f.js","entry-main2-a4b8e424.js"])
+console.log('referenced asset in renderChunk', 'asset-test-9f86d081');
diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-9d05d34a2.js b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-6d518561.js
similarity index 56%
rename from test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-9d05d34a2.js
rename to test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-6d518561.js
index 6a03b4eb2c2..65b10a44e02 100644
--- a/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-9d05d34a2.js
+++ b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-6d518561.js
@@ -1,12 +1,12 @@
 'use strict';
 
-var dep2 = require('./chunk-dep2-7dee0ddf4.js');
+var dep2 = require('./chunk-dep2-970ee28f.js');
 
 var num = 1;
-console.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d0818').href : new URL('asset-test-9f86d0818', document.currentScript && document.currentScript.src || document.baseURI).href));
+console.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href));
 
 console.log(num + dep2.num);
-console.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d0818').href : new URL('asset-test-9f86d0818', document.currentScript && document.currentScript.src || document.baseURI).href));
+console.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href));
 console.log({
   "exports": [],
   "facadeModuleId": "**/main1.js",
@@ -20,37 +20,37 @@ console.log({
   "name": "main1",
   "type": "chunk",
   "dynamicImports": [],
-  "fileName": "entry-main1-9d05d34a2.js",
+  "fileName": "entry-main1-6d518561.js",
   "implicitlyLoadedBefore": [],
   "importedBindings": {
-    "chunk-dep2-7dee0ddf4.js": [
+    "chunk-dep2-970ee28f.js": [
       "num"
     ]
   },
   "imports": [
-    "chunk-dep2-7dee0ddf4.js"
+    "chunk-dep2-970ee28f.js"
   ],
   "modules": {
     "**/dep1.js": {
-      "code": "var num = 1;\nconsole.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d0818').href : new URL('asset-test-9f86d0818', document.currentScript && document.currentScript.src || document.baseURI).href));",
+      "code": "var num = 1;\nconsole.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href));",
       "originalLength": 19,
       "removedExports": [],
       "renderedExports": [
         "num"
       ],
-      "renderedLength": 277
+      "renderedLength": 275
     },
     "**/main1.js": {
-      "code": "console.log(num + dep2.num);\nconsole.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d0818').href : new URL('asset-test-9f86d0818', document.currentScript && document.currentScript.src || document.baseURI).href));",
+      "code": "console.log(num + dep2.num);\nconsole.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href));",
       "originalLength": 102,
       "removedExports": [],
       "renderedExports": [],
-      "renderedLength": 293
+      "renderedLength": 291
     }
   },
   "referencedFiles": [
-    "asset-test-9f86d0818"
+    "asset-test-9f86d081"
   ]
 });
-console.log('all chunks', ["entry-main1-9d05d34a2.js","chunk-dep2-7dee0ddf4.js","entry-main2-9ac8fff25.js"])
-console.log('referenced asset in renderChunk', 'asset-test-9f86d0818');
+console.log('all chunks', ["entry-main1-6d518561.js","chunk-dep2-970ee28f.js","entry-main2-a4b8e424.js"])
+console.log('referenced asset in renderChunk', 'asset-test-9f86d081');
diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-9ac8fff25.js b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-a4b8e424.js
similarity index 56%
rename from test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-9ac8fff25.js
rename to test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-a4b8e424.js
index eb8aff5fde4..4a2059addab 100644
--- a/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-9ac8fff25.js
+++ b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-a4b8e424.js
@@ -1,12 +1,12 @@
 'use strict';
 
-var dep2 = require('./chunk-dep2-7dee0ddf4.js');
+var dep2 = require('./chunk-dep2-970ee28f.js');
 
 var num = 3;
-console.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d0818').href : new URL('asset-test-9f86d0818', document.currentScript && document.currentScript.src || document.baseURI).href));
+console.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href));
 
 console.log(dep2.num + num);
-console.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d0818').href : new URL('asset-test-9f86d0818', document.currentScript && document.currentScript.src || document.baseURI).href));
+console.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href));
 console.log({
   "exports": [],
   "facadeModuleId": "**/main2.js",
@@ -20,37 +20,37 @@ console.log({
   "name": "main2",
   "type": "chunk",
   "dynamicImports": [],
-  "fileName": "entry-main2-9ac8fff25.js",
+  "fileName": "entry-main2-a4b8e424.js",
   "implicitlyLoadedBefore": [],
   "importedBindings": {
-    "chunk-dep2-7dee0ddf4.js": [
+    "chunk-dep2-970ee28f.js": [
       "num"
     ]
   },
   "imports": [
-    "chunk-dep2-7dee0ddf4.js"
+    "chunk-dep2-970ee28f.js"
   ],
   "modules": {
     "**/dep3.js": {
-      "code": "var num = 3;\nconsole.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d0818').href : new URL('asset-test-9f86d0818', document.currentScript && document.currentScript.src || document.baseURI).href));",
+      "code": "var num = 3;\nconsole.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href));",
       "originalLength": 19,
       "removedExports": [],
       "renderedExports": [
         "num"
       ],
-      "renderedLength": 277
+      "renderedLength": 275
     },
     "**/main2.js": {
-      "code": "console.log(dep2.num + num);\nconsole.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d0818').href : new URL('asset-test-9f86d0818', document.currentScript && document.currentScript.src || document.baseURI).href));",
+      "code": "console.log(dep2.num + num);\nconsole.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href));",
       "originalLength": 102,
       "removedExports": [],
       "renderedExports": [],
-      "renderedLength": 293
+      "renderedLength": 291
     }
   },
   "referencedFiles": [
-    "asset-test-9f86d0818"
+    "asset-test-9f86d081"
   ]
 });
-console.log('all chunks', ["entry-main1-9d05d34a2.js","chunk-dep2-7dee0ddf4.js","entry-main2-9ac8fff25.js"])
-console.log('referenced asset in renderChunk', 'asset-test-9f86d0818');
+console.log('all chunks', ["entry-main1-6d518561.js","chunk-dep2-970ee28f.js","entry-main2-a4b8e424.js"])
+console.log('referenced asset in renderChunk', 'asset-test-9f86d081');
diff --git a/test/chunking-form/samples/render-chunk/_expected/es/asset-test-9f86d0818 b/test/chunking-form/samples/render-chunk/_expected/es/asset-test-9f86d081
similarity index 100%
rename from test/chunking-form/samples/render-chunk/_expected/es/asset-test-9f86d0818
rename to test/chunking-form/samples/render-chunk/_expected/es/asset-test-9f86d081
diff --git a/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-452db20e2.js b/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-f4e7f39c.js
similarity index 65%
rename from test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-452db20e2.js
rename to test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-f4e7f39c.js
index 87d745c4910..652d84443be 100644
--- a/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-452db20e2.js
+++ b/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-f4e7f39c.js
@@ -1,5 +1,5 @@
 var num = 2;
-console.log('referenced asset', new URL('asset-test-9f86d0818', import.meta.url).href);
+console.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href);
 
 export { num as n };
 console.log({
@@ -16,24 +16,24 @@ console.log({
   "name": "dep2",
   "type": "chunk",
   "dynamicImports": [],
-  "fileName": "chunk-dep2-452db20e2.js",
+  "fileName": "chunk-dep2-f4e7f39c.js",
   "implicitlyLoadedBefore": [],
   "importedBindings": {},
   "imports": [],
   "modules": {
     "**/dep2.js": {
-      "code": "var num = 2;\nconsole.log('referenced asset', new URL('asset-test-9f86d0818', import.meta.url).href);",
+      "code": "var num = 2;\nconsole.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href);",
       "originalLength": 19,
       "removedExports": [],
       "renderedExports": [
         "num"
       ],
-      "renderedLength": 100
+      "renderedLength": 99
     }
   },
   "referencedFiles": [
-    "asset-test-9f86d0818"
+    "asset-test-9f86d081"
   ]
 });
-console.log('all chunks', ["entry-main1-9c60f0cdf.js","chunk-dep2-452db20e2.js","entry-main2-8b36dada6.js"])
-console.log('referenced asset in renderChunk', 'asset-test-9f86d0818');
+console.log('all chunks', ["entry-main1-bb9f9ac2.js","chunk-dep2-f4e7f39c.js","entry-main2-2ba44c5c.js"])
+console.log('referenced asset in renderChunk', 'asset-test-9f86d081');
diff --git a/test/chunking-form/samples/render-chunk/_expected/es/entry-main1-9c60f0cdf.js b/test/chunking-form/samples/render-chunk/_expected/es/entry-main1-bb9f9ac2.js
similarity index 57%
rename from test/chunking-form/samples/render-chunk/_expected/es/entry-main1-9c60f0cdf.js
rename to test/chunking-form/samples/render-chunk/_expected/es/entry-main1-bb9f9ac2.js
index 4d23fbcb7fb..a3b29723c87 100644
--- a/test/chunking-form/samples/render-chunk/_expected/es/entry-main1-9c60f0cdf.js
+++ b/test/chunking-form/samples/render-chunk/_expected/es/entry-main1-bb9f9ac2.js
@@ -1,10 +1,10 @@
-import { n as num$1 } from './chunk-dep2-452db20e2.js';
+import { n as num$1 } from './chunk-dep2-f4e7f39c.js';
 
 var num = 1;
-console.log('referenced asset', new URL('asset-test-9f86d0818', import.meta.url).href);
+console.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href);
 
 console.log(num + num$1);
-console.log('referenced asset', new URL('asset-test-9f86d0818', import.meta.url).href);
+console.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href);
 console.log({
   "exports": [],
   "facadeModuleId": "**/main1.js",
@@ -18,37 +18,37 @@ console.log({
   "name": "main1",
   "type": "chunk",
   "dynamicImports": [],
-  "fileName": "entry-main1-9c60f0cdf.js",
+  "fileName": "entry-main1-bb9f9ac2.js",
   "implicitlyLoadedBefore": [],
   "importedBindings": {
-    "chunk-dep2-452db20e2.js": [
+    "chunk-dep2-f4e7f39c.js": [
       "n"
     ]
   },
   "imports": [
-    "chunk-dep2-452db20e2.js"
+    "chunk-dep2-f4e7f39c.js"
   ],
   "modules": {
     "**/dep1.js": {
-      "code": "var num = 1;\nconsole.log('referenced asset', new URL('asset-test-9f86d0818', import.meta.url).href);",
+      "code": "var num = 1;\nconsole.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href);",
       "originalLength": 19,
       "removedExports": [],
       "renderedExports": [
         "num"
       ],
-      "renderedLength": 100
+      "renderedLength": 99
     },
     "**/main1.js": {
-      "code": "console.log(num + num$1);\nconsole.log('referenced asset', new URL('asset-test-9f86d0818', import.meta.url).href);",
+      "code": "console.log(num + num$1);\nconsole.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href);",
       "originalLength": 102,
       "removedExports": [],
       "renderedExports": [],
-      "renderedLength": 113
+      "renderedLength": 112
     }
   },
   "referencedFiles": [
-    "asset-test-9f86d0818"
+    "asset-test-9f86d081"
   ]
 });
-console.log('all chunks', ["entry-main1-9c60f0cdf.js","chunk-dep2-452db20e2.js","entry-main2-8b36dada6.js"])
-console.log('referenced asset in renderChunk', 'asset-test-9f86d0818');
+console.log('all chunks', ["entry-main1-bb9f9ac2.js","chunk-dep2-f4e7f39c.js","entry-main2-2ba44c5c.js"])
+console.log('referenced asset in renderChunk', 'asset-test-9f86d081');
diff --git a/test/chunking-form/samples/render-chunk/_expected/es/entry-main2-8b36dada6.js b/test/chunking-form/samples/render-chunk/_expected/es/entry-main2-2ba44c5c.js
similarity index 57%
rename from test/chunking-form/samples/render-chunk/_expected/es/entry-main2-8b36dada6.js
rename to test/chunking-form/samples/render-chunk/_expected/es/entry-main2-2ba44c5c.js
index ecaf8c5c28a..236c4a13e69 100644
--- a/test/chunking-form/samples/render-chunk/_expected/es/entry-main2-8b36dada6.js
+++ b/test/chunking-form/samples/render-chunk/_expected/es/entry-main2-2ba44c5c.js
@@ -1,10 +1,10 @@
-import { n as num$1 } from './chunk-dep2-452db20e2.js';
+import { n as num$1 } from './chunk-dep2-f4e7f39c.js';
 
 var num = 3;
-console.log('referenced asset', new URL('asset-test-9f86d0818', import.meta.url).href);
+console.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href);
 
 console.log(num$1 + num);
-console.log('referenced asset', new URL('asset-test-9f86d0818', import.meta.url).href);
+console.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href);
 console.log({
   "exports": [],
   "facadeModuleId": "**/main2.js",
@@ -18,37 +18,37 @@ console.log({
   "name": "main2",
   "type": "chunk",
   "dynamicImports": [],
-  "fileName": "entry-main2-8b36dada6.js",
+  "fileName": "entry-main2-2ba44c5c.js",
   "implicitlyLoadedBefore": [],
   "importedBindings": {
-    "chunk-dep2-452db20e2.js": [
+    "chunk-dep2-f4e7f39c.js": [
       "n"
     ]
   },
   "imports": [
-    "chunk-dep2-452db20e2.js"
+    "chunk-dep2-f4e7f39c.js"
   ],
   "modules": {
     "**/dep3.js": {
-      "code": "var num = 3;\nconsole.log('referenced asset', new URL('asset-test-9f86d0818', import.meta.url).href);",
+      "code": "var num = 3;\nconsole.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href);",
       "originalLength": 19,
       "removedExports": [],
       "renderedExports": [
         "num"
       ],
-      "renderedLength": 100
+      "renderedLength": 99
     },
     "**/main2.js": {
-      "code": "console.log(num$1 + num);\nconsole.log('referenced asset', new URL('asset-test-9f86d0818', import.meta.url).href);",
+      "code": "console.log(num$1 + num);\nconsole.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href);",
       "originalLength": 102,
       "removedExports": [],
       "renderedExports": [],
-      "renderedLength": 113
+      "renderedLength": 112
     }
   },
   "referencedFiles": [
-    "asset-test-9f86d0818"
+    "asset-test-9f86d081"
   ]
 });
-console.log('all chunks', ["entry-main1-9c60f0cdf.js","chunk-dep2-452db20e2.js","entry-main2-8b36dada6.js"])
-console.log('referenced asset in renderChunk', 'asset-test-9f86d0818');
+console.log('all chunks', ["entry-main1-bb9f9ac2.js","chunk-dep2-f4e7f39c.js","entry-main2-2ba44c5c.js"])
+console.log('referenced asset in renderChunk', 'asset-test-9f86d081');
diff --git a/test/chunking-form/samples/render-chunk/_expected/system/asset-test-9f86d0818 b/test/chunking-form/samples/render-chunk/_expected/system/asset-test-9f86d081
similarity index 100%
rename from test/chunking-form/samples/render-chunk/_expected/system/asset-test-9f86d0818
rename to test/chunking-form/samples/render-chunk/_expected/system/asset-test-9f86d081
diff --git a/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-e734956e2.js b/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-ea1348fd.js
similarity index 66%
rename from test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-e734956e2.js
rename to test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-ea1348fd.js
index 0fa53f1192e..1b1d50b11ab 100644
--- a/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-e734956e2.js
+++ b/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-ea1348fd.js
@@ -4,7 +4,7 @@ System.register([], (function (exports, module) {
 		execute: (function () {
 
 			var num = exports('n', 2);
-			console.log('referenced asset', new URL('asset-test-9f86d0818', module.meta.url).href);
+			console.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href);
 
 		})
 	};
@@ -23,24 +23,24 @@ console.log({
   "name": "dep2",
   "type": "chunk",
   "dynamicImports": [],
-  "fileName": "chunk-dep2-e734956e2.js",
+  "fileName": "chunk-dep2-ea1348fd.js",
   "implicitlyLoadedBefore": [],
   "importedBindings": {},
   "imports": [],
   "modules": {
     "**/dep2.js": {
-      "code": "\t\t\tvar num = exports('n', 2);\n\t\t\tconsole.log('referenced asset', new URL('asset-test-9f86d0818', module.meta.url).href);",
+      "code": "\t\t\tvar num = exports('n', 2);\n\t\t\tconsole.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href);",
       "originalLength": 19,
       "removedExports": [],
       "renderedExports": [
         "num"
       ],
-      "renderedLength": 114
+      "renderedLength": 113
     }
   },
   "referencedFiles": [
-    "asset-test-9f86d0818"
+    "asset-test-9f86d081"
   ]
 });
-console.log('all chunks', ["entry-main1-a5eeb6cbd.js","chunk-dep2-e734956e2.js","entry-main2-0e66ce5ec.js"])
-console.log('referenced asset in renderChunk', 'asset-test-9f86d0818');
+console.log('all chunks', ["entry-main1-118e1de4.js","chunk-dep2-ea1348fd.js","entry-main2-34191286.js"])
+console.log('referenced asset in renderChunk', 'asset-test-9f86d081');
diff --git a/test/chunking-form/samples/render-chunk/_expected/system/entry-main1-a5eeb6cbd.js b/test/chunking-form/samples/render-chunk/_expected/system/entry-main1-118e1de4.js
similarity index 59%
rename from test/chunking-form/samples/render-chunk/_expected/system/entry-main1-a5eeb6cbd.js
rename to test/chunking-form/samples/render-chunk/_expected/system/entry-main1-118e1de4.js
index 5d39e2fae5f..b9f812cb33b 100644
--- a/test/chunking-form/samples/render-chunk/_expected/system/entry-main1-a5eeb6cbd.js
+++ b/test/chunking-form/samples/render-chunk/_expected/system/entry-main1-118e1de4.js
@@ -1,4 +1,4 @@
-System.register(['./chunk-dep2-e734956e2.js'], (function (exports, module) {
+System.register(['./chunk-dep2-ea1348fd.js'], (function (exports, module) {
 	'use strict';
 	var num$1;
 	return {
@@ -8,10 +8,10 @@ System.register(['./chunk-dep2-e734956e2.js'], (function (exports, module) {
 		execute: (function () {
 
 			var num = 1;
-			console.log('referenced asset', new URL('asset-test-9f86d0818', module.meta.url).href);
+			console.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href);
 
 			console.log(num + num$1);
-			console.log('referenced asset', new URL('asset-test-9f86d0818', module.meta.url).href);
+			console.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href);
 
 		})
 	};
@@ -29,37 +29,37 @@ console.log({
   "name": "main1",
   "type": "chunk",
   "dynamicImports": [],
-  "fileName": "entry-main1-a5eeb6cbd.js",
+  "fileName": "entry-main1-118e1de4.js",
   "implicitlyLoadedBefore": [],
   "importedBindings": {
-    "chunk-dep2-e734956e2.js": [
+    "chunk-dep2-ea1348fd.js": [
       "n"
     ]
   },
   "imports": [
-    "chunk-dep2-e734956e2.js"
+    "chunk-dep2-ea1348fd.js"
   ],
   "modules": {
     "**/dep1.js": {
-      "code": "\t\t\tvar num = 1;\n\t\t\tconsole.log('referenced asset', new URL('asset-test-9f86d0818', module.meta.url).href);",
+      "code": "\t\t\tvar num = 1;\n\t\t\tconsole.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href);",
       "originalLength": 19,
       "removedExports": [],
       "renderedExports": [
         "num"
       ],
-      "renderedLength": 100
+      "renderedLength": 99
     },
     "**/main1.js": {
-      "code": "\t\t\tconsole.log(num + num$1);\n\t\t\tconsole.log('referenced asset', new URL('asset-test-9f86d0818', module.meta.url).href);",
+      "code": "\t\t\tconsole.log(num + num$1);\n\t\t\tconsole.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href);",
       "originalLength": 102,
       "removedExports": [],
       "renderedExports": [],
-      "renderedLength": 113
+      "renderedLength": 112
     }
   },
   "referencedFiles": [
-    "asset-test-9f86d0818"
+    "asset-test-9f86d081"
   ]
 });
-console.log('all chunks', ["entry-main1-a5eeb6cbd.js","chunk-dep2-e734956e2.js","entry-main2-0e66ce5ec.js"])
-console.log('referenced asset in renderChunk', 'asset-test-9f86d0818');
+console.log('all chunks', ["entry-main1-118e1de4.js","chunk-dep2-ea1348fd.js","entry-main2-34191286.js"])
+console.log('referenced asset in renderChunk', 'asset-test-9f86d081');
diff --git a/test/chunking-form/samples/render-chunk/_expected/system/entry-main2-0e66ce5ec.js b/test/chunking-form/samples/render-chunk/_expected/system/entry-main2-34191286.js
similarity index 59%
rename from test/chunking-form/samples/render-chunk/_expected/system/entry-main2-0e66ce5ec.js
rename to test/chunking-form/samples/render-chunk/_expected/system/entry-main2-34191286.js
index 6506b22fc9e..35fa3d4cfe2 100644
--- a/test/chunking-form/samples/render-chunk/_expected/system/entry-main2-0e66ce5ec.js
+++ b/test/chunking-form/samples/render-chunk/_expected/system/entry-main2-34191286.js
@@ -1,4 +1,4 @@
-System.register(['./chunk-dep2-e734956e2.js'], (function (exports, module) {
+System.register(['./chunk-dep2-ea1348fd.js'], (function (exports, module) {
 	'use strict';
 	var num$1;
 	return {
@@ -8,10 +8,10 @@ System.register(['./chunk-dep2-e734956e2.js'], (function (exports, module) {
 		execute: (function () {
 
 			var num = 3;
-			console.log('referenced asset', new URL('asset-test-9f86d0818', module.meta.url).href);
+			console.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href);
 
 			console.log(num$1 + num);
-			console.log('referenced asset', new URL('asset-test-9f86d0818', module.meta.url).href);
+			console.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href);
 
 		})
 	};
@@ -29,37 +29,37 @@ console.log({
   "name": "main2",
   "type": "chunk",
   "dynamicImports": [],
-  "fileName": "entry-main2-0e66ce5ec.js",
+  "fileName": "entry-main2-34191286.js",
   "implicitlyLoadedBefore": [],
   "importedBindings": {
-    "chunk-dep2-e734956e2.js": [
+    "chunk-dep2-ea1348fd.js": [
       "n"
     ]
   },
   "imports": [
-    "chunk-dep2-e734956e2.js"
+    "chunk-dep2-ea1348fd.js"
   ],
   "modules": {
     "**/dep3.js": {
-      "code": "\t\t\tvar num = 3;\n\t\t\tconsole.log('referenced asset', new URL('asset-test-9f86d0818', module.meta.url).href);",
+      "code": "\t\t\tvar num = 3;\n\t\t\tconsole.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href);",
       "originalLength": 19,
       "removedExports": [],
       "renderedExports": [
         "num"
       ],
-      "renderedLength": 100
+      "renderedLength": 99
     },
     "**/main2.js": {
-      "code": "\t\t\tconsole.log(num$1 + num);\n\t\t\tconsole.log('referenced asset', new URL('asset-test-9f86d0818', module.meta.url).href);",
+      "code": "\t\t\tconsole.log(num$1 + num);\n\t\t\tconsole.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href);",
       "originalLength": 102,
       "removedExports": [],
       "renderedExports": [],
-      "renderedLength": 113
+      "renderedLength": 112
     }
   },
   "referencedFiles": [
-    "asset-test-9f86d0818"
+    "asset-test-9f86d081"
   ]
 });
-console.log('all chunks', ["entry-main1-a5eeb6cbd.js","chunk-dep2-e734956e2.js","entry-main2-0e66ce5ec.js"])
-console.log('referenced asset in renderChunk', 'asset-test-9f86d0818');
+console.log('all chunks', ["entry-main1-118e1de4.js","chunk-dep2-ea1348fd.js","entry-main2-34191286.js"])
+console.log('referenced asset in renderChunk', 'asset-test-9f86d081');
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-resolved-9e0f7ca58.txt b/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-resolved-9e0f7ca5.txt
similarity index 100%
rename from test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-resolved-9e0f7ca58.txt
rename to test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-resolved-9e0f7ca5.txt
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-solved-230ecafdb.txt b/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-solved-230ecafd.txt
similarity index 100%
rename from test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-solved-230ecafdb.txt
rename to test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-solved-230ecafd.txt
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-unresolved-f4c1e86cd.txt b/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-unresolved-f4c1e86c.txt
similarity index 100%
rename from test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-unresolved-f4c1e86cd.txt
rename to test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-unresolved-f4c1e86c.txt
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/main.js b/test/chunking-form/samples/resolve-file-url/_expected/amd/main.js
index 3582946dd06..af4a4d20560 100644
--- a/test/chunking-form/samples/resolve-file-url/_expected/amd/main.js
+++ b/test/chunking-form/samples/resolve-file-url/_expected/amd/main.js
@@ -3,7 +3,7 @@ define(['require'], (function (require) { 'use strict';
 	const asset$1 = 'resolved';
 	const chunk$1 = 'resolved';
 
-	const asset = new URL(require.toUrl('./assets/asset-unresolved-f4c1e86cd.txt'), document.baseURI).href;
+	const asset = new URL(require.toUrl('./assets/asset-unresolved-f4c1e86c.txt'), document.baseURI).href;
 	const chunk = new URL(require.toUrl('./nested/chunk2.js'), document.baseURI).href;
 
 	new Promise(function (resolve, reject) { require(['./nested/chunk'], resolve, reject); }).then(result => console.log(result, chunk$1, chunk, asset$1, asset));
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk.js b/test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk.js
index ef614ea0213..c077f6b4e6b 100644
--- a/test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk.js
+++ b/test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk.js
@@ -1,6 +1,6 @@
 define(['require', 'exports'], (function (require, exports) { 'use strict';
 
-	const asset = 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-230ecafdb.txt:format=amd:relativePath=../assets/asset-solved-230ecafdb.txt:referenceId=6296c678';
+	const asset = 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=amd:relativePath=../assets/asset-solved-230ecafd.txt:referenceId=6296c678';
 	const chunk = 'chunkId=nested/chunk.js:moduleId=solved:fileName=nested/chunk2.js:format=amd:relativePath=chunk2.js:referenceId=f6c25ae7';
 
 	exports.asset = asset;
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-resolved-9e0f7ca58.txt b/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-resolved-9e0f7ca5.txt
similarity index 100%
rename from test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-resolved-9e0f7ca58.txt
rename to test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-resolved-9e0f7ca5.txt
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-solved-230ecafdb.txt b/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-solved-230ecafd.txt
similarity index 100%
rename from test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-solved-230ecafdb.txt
rename to test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-solved-230ecafd.txt
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-unresolved-f4c1e86cd.txt b/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-unresolved-f4c1e86c.txt
similarity index 100%
rename from test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-unresolved-f4c1e86cd.txt
rename to test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-unresolved-f4c1e86c.txt
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/main.js b/test/chunking-form/samples/resolve-file-url/_expected/cjs/main.js
index 34bc6accd0c..24d8205dd21 100644
--- a/test/chunking-form/samples/resolve-file-url/_expected/cjs/main.js
+++ b/test/chunking-form/samples/resolve-file-url/_expected/cjs/main.js
@@ -3,7 +3,7 @@
 const asset$1 = 'resolved';
 const chunk$1 = 'resolved';
 
-const asset = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-f4c1e86cd.txt').href : new URL('assets/asset-unresolved-f4c1e86cd.txt', document.currentScript && document.currentScript.src || document.baseURI).href);
+const asset = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-f4c1e86c.txt').href : new URL('assets/asset-unresolved-f4c1e86c.txt', document.currentScript && document.currentScript.src || document.baseURI).href);
 const chunk = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/nested/chunk2.js').href : new URL('nested/chunk2.js', document.currentScript && document.currentScript.src || document.baseURI).href);
 
 Promise.resolve().then(function () { return require('./nested/chunk.js'); }).then(result => console.log(result, chunk$1, chunk, asset$1, asset));
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk.js b/test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk.js
index c06c10c41ce..206e5c2c2a3 100644
--- a/test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk.js
+++ b/test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const asset = 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-230ecafdb.txt:format=cjs:relativePath=../assets/asset-solved-230ecafdb.txt:referenceId=6296c678';
+const asset = 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=cjs:relativePath=../assets/asset-solved-230ecafd.txt:referenceId=6296c678';
 const chunk = 'chunkId=nested/chunk.js:moduleId=solved:fileName=nested/chunk2.js:format=cjs:relativePath=chunk2.js:referenceId=f6c25ae7';
 
 exports.asset = asset;
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-resolved-9e0f7ca58.txt b/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-resolved-9e0f7ca5.txt
similarity index 100%
rename from test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-resolved-9e0f7ca58.txt
rename to test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-resolved-9e0f7ca5.txt
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-solved-230ecafdb.txt b/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-solved-230ecafd.txt
similarity index 100%
rename from test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-solved-230ecafdb.txt
rename to test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-solved-230ecafd.txt
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-unresolved-f4c1e86cd.txt b/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-unresolved-f4c1e86c.txt
similarity index 100%
rename from test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-unresolved-f4c1e86cd.txt
rename to test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-unresolved-f4c1e86c.txt
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/main.js b/test/chunking-form/samples/resolve-file-url/_expected/es/main.js
index 4cca839fd1b..787fa8158a2 100644
--- a/test/chunking-form/samples/resolve-file-url/_expected/es/main.js
+++ b/test/chunking-form/samples/resolve-file-url/_expected/es/main.js
@@ -1,7 +1,7 @@
 const asset$1 = 'resolved';
 const chunk$1 = 'resolved';
 
-const asset = new URL('assets/asset-unresolved-f4c1e86cd.txt', import.meta.url).href;
+const asset = new URL('assets/asset-unresolved-f4c1e86c.txt', import.meta.url).href;
 const chunk = new URL('nested/chunk2.js', import.meta.url).href;
 
 import('./nested/chunk.js').then(result => console.log(result, chunk$1, chunk, asset$1, asset));
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk.js b/test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk.js
index 6070d3f3338..a9081bb7a7a 100644
--- a/test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk.js
+++ b/test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk.js
@@ -1,4 +1,4 @@
-const asset = 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-230ecafdb.txt:format=es:relativePath=../assets/asset-solved-230ecafdb.txt:referenceId=6296c678';
+const asset = 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=es:relativePath=../assets/asset-solved-230ecafd.txt:referenceId=6296c678';
 const chunk = 'chunkId=nested/chunk.js:moduleId=solved:fileName=nested/chunk2.js:format=es:relativePath=chunk2.js:referenceId=f6c25ae7';
 
 export { asset, chunk };
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-resolved-9e0f7ca58.txt b/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-resolved-9e0f7ca5.txt
similarity index 100%
rename from test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-resolved-9e0f7ca58.txt
rename to test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-resolved-9e0f7ca5.txt
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-solved-230ecafdb.txt b/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-solved-230ecafd.txt
similarity index 100%
rename from test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-solved-230ecafdb.txt
rename to test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-solved-230ecafd.txt
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-unresolved-f4c1e86cd.txt b/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-unresolved-f4c1e86c.txt
similarity index 100%
rename from test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-unresolved-f4c1e86cd.txt
rename to test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-unresolved-f4c1e86c.txt
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/main.js b/test/chunking-form/samples/resolve-file-url/_expected/system/main.js
index ba7c8f65539..e8f41d38a17 100644
--- a/test/chunking-form/samples/resolve-file-url/_expected/system/main.js
+++ b/test/chunking-form/samples/resolve-file-url/_expected/system/main.js
@@ -6,7 +6,7 @@ System.register([], (function (exports, module) {
 			const asset$1 = 'resolved';
 			const chunk$1 = 'resolved';
 
-			const asset = new URL('assets/asset-unresolved-f4c1e86cd.txt', module.meta.url).href;
+			const asset = new URL('assets/asset-unresolved-f4c1e86c.txt', module.meta.url).href;
 			const chunk = new URL('nested/chunk2.js', module.meta.url).href;
 
 			module.import('./nested/chunk.js').then(result => console.log(result, chunk$1, chunk, asset$1, asset));
diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk.js b/test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk.js
index d058134dcad..2565e1e8815 100644
--- a/test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk.js
+++ b/test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk.js
@@ -3,7 +3,7 @@ System.register([], (function (exports, module) {
 	return {
 		execute: (function () {
 
-			const asset = exports('asset', 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-230ecafdb.txt:format=system:relativePath=../assets/asset-solved-230ecafdb.txt:referenceId=6296c678');
+			const asset = exports('asset', 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=system:relativePath=../assets/asset-solved-230ecafd.txt:referenceId=6296c678');
 			const chunk = exports('chunk', 'chunkId=nested/chunk.js:moduleId=solved:fileName=nested/chunk2.js:format=system:relativePath=chunk2.js:referenceId=f6c25ae7');
 
 		})
diff --git a/test/cli/samples/code-splitting-named-default-inputs/_config.js b/test/cli/samples/code-splitting-named-default-inputs/_config.js
index 767038e198f..3c6ddea1237 100644
--- a/test/cli/samples/code-splitting-named-default-inputs/_config.js
+++ b/test/cli/samples/code-splitting-named-default-inputs/_config.js
@@ -8,13 +8,13 @@ module.exports = {
 		assert.equal(
 			code,
 			'\n' +
-				`//→ entry1-108734151.js:\n` +
+				`//→ entry1-10873415.js:\n` +
 				"console.log('main1');\n" +
 				'\n' +
-				`//→ Entry 2-b2b9d0bf7.js:\n` +
+				`//→ Entry 2-b2b9d0bf.js:\n` +
 				"console.log('main2');\n" +
 				'\n' +
-				`//→ main3-064cd134a.js:\n` +
+				`//→ main3-064cd134.js:\n` +
 				"console.log('main3');\n"
 		);
 	}
diff --git a/test/cli/samples/code-splitting-named-inputs/_config.js b/test/cli/samples/code-splitting-named-inputs/_config.js
index 92a7c64fcca..8959d27273c 100644
--- a/test/cli/samples/code-splitting-named-inputs/_config.js
+++ b/test/cli/samples/code-splitting-named-inputs/_config.js
@@ -8,13 +8,13 @@ module.exports = {
 		assert.equal(
 			code,
 			'\n' +
-				`//→ entry1-108734151.js:\n` +
+				`//→ entry1-10873415.js:\n` +
 				"console.log('main1');\n" +
 				'\n' +
-				`//→ Entry 2-b2b9d0bf7.js:\n` +
+				`//→ Entry 2-b2b9d0bf.js:\n` +
 				"console.log('main2');\n" +
 				'\n' +
-				`//→ main3-064cd134a.js:\n` +
+				`//→ main3-064cd134.js:\n` +
 				"console.log('main3');\n"
 		);
 	}
diff --git a/test/cli/samples/stdout-code-splitting/_config.js b/test/cli/samples/stdout-code-splitting/_config.js
index f7b831758f0..b170cacb84f 100644
--- a/test/cli/samples/stdout-code-splitting/_config.js
+++ b/test/cli/samples/stdout-code-splitting/_config.js
@@ -20,7 +20,7 @@ module.exports = {
 				`${COLOR}//→ main2.js:${STANDARD}\n` +
 				"console.log('main2');\n" +
 				'\n' +
-				`${COLOR}//→ assets/asset-185f8db32:${STANDARD}\n` +
+				`${COLOR}//→ assets/asset-185f8db3:${STANDARD}\n` +
 				'Hello'
 		);
 	}
diff --git a/test/form/samples/configure-file-url/_expected/amd.js b/test/form/samples/configure-file-url/_expected/amd.js
index a7e1fc19db8..5b95fa904c2 100644
--- a/test/form/samples/configure-file-url/_expected/amd.js
+++ b/test/form/samples/configure-file-url/_expected/amd.js
@@ -1,10 +1,10 @@
 define(['require'], (function (require) { 'use strict';
 
-	var asset1 = 'chunkId=amd.js:moduleId=solved:fileName=assets/asset-solved-230ecafdb.txt:format=amd:relativePath=assets/asset-solved-230ecafdb.txt:referenceId=6296c678';
+	var asset1 = 'chunkId=amd.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=amd:relativePath=assets/asset-solved-230ecafd.txt:referenceId=6296c678';
 
 	var asset2 = 'resolved';
 
-	var asset3 = new URL(require.toUrl('./assets/asset-unresolved-f4c1e86cd.txt'), document.baseURI).href;
+	var asset3 = new URL(require.toUrl('./assets/asset-unresolved-f4c1e86c.txt'), document.baseURI).href;
 
 	console.log(asset1, asset2, asset3);
 
diff --git a/test/form/samples/configure-file-url/_expected/assets/asset-resolved-9e0f7ca58.txt b/test/form/samples/configure-file-url/_expected/assets/asset-resolved-9e0f7ca5.txt
similarity index 100%
rename from test/form/samples/configure-file-url/_expected/assets/asset-resolved-9e0f7ca58.txt
rename to test/form/samples/configure-file-url/_expected/assets/asset-resolved-9e0f7ca5.txt
diff --git a/test/form/samples/configure-file-url/_expected/assets/asset-solved-230ecafdb.txt b/test/form/samples/configure-file-url/_expected/assets/asset-solved-230ecafd.txt
similarity index 100%
rename from test/form/samples/configure-file-url/_expected/assets/asset-solved-230ecafdb.txt
rename to test/form/samples/configure-file-url/_expected/assets/asset-solved-230ecafd.txt
diff --git a/test/form/samples/configure-file-url/_expected/assets/asset-unresolved-f4c1e86cd.txt b/test/form/samples/configure-file-url/_expected/assets/asset-unresolved-f4c1e86c.txt
similarity index 100%
rename from test/form/samples/configure-file-url/_expected/assets/asset-unresolved-f4c1e86cd.txt
rename to test/form/samples/configure-file-url/_expected/assets/asset-unresolved-f4c1e86c.txt
diff --git a/test/form/samples/configure-file-url/_expected/cjs.js b/test/form/samples/configure-file-url/_expected/cjs.js
index 6dbdc33a2bd..28b247bc342 100644
--- a/test/form/samples/configure-file-url/_expected/cjs.js
+++ b/test/form/samples/configure-file-url/_expected/cjs.js
@@ -1,9 +1,9 @@
 'use strict';
 
-var asset1 = 'chunkId=cjs.js:moduleId=solved:fileName=assets/asset-solved-230ecafdb.txt:format=cjs:relativePath=assets/asset-solved-230ecafdb.txt:referenceId=6296c678';
+var asset1 = 'chunkId=cjs.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=cjs:relativePath=assets/asset-solved-230ecafd.txt:referenceId=6296c678';
 
 var asset2 = 'resolved';
 
-var asset3 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-f4c1e86cd.txt').href : new URL('assets/asset-unresolved-f4c1e86cd.txt', document.currentScript && document.currentScript.src || document.baseURI).href);
+var asset3 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-f4c1e86c.txt').href : new URL('assets/asset-unresolved-f4c1e86c.txt', document.currentScript && document.currentScript.src || document.baseURI).href);
 
 console.log(asset1, asset2, asset3);
diff --git a/test/form/samples/configure-file-url/_expected/es.js b/test/form/samples/configure-file-url/_expected/es.js
index 8dae721a1ea..89945227ebc 100644
--- a/test/form/samples/configure-file-url/_expected/es.js
+++ b/test/form/samples/configure-file-url/_expected/es.js
@@ -1,7 +1,7 @@
-var asset1 = 'chunkId=es.js:moduleId=solved:fileName=assets/asset-solved-230ecafdb.txt:format=es:relativePath=assets/asset-solved-230ecafdb.txt:referenceId=6296c678';
+var asset1 = 'chunkId=es.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=es:relativePath=assets/asset-solved-230ecafd.txt:referenceId=6296c678';
 
 var asset2 = 'resolved';
 
-var asset3 = new URL('assets/asset-unresolved-f4c1e86cd.txt', import.meta.url).href;
+var asset3 = new URL('assets/asset-unresolved-f4c1e86c.txt', import.meta.url).href;
 
 console.log(asset1, asset2, asset3);
diff --git a/test/form/samples/configure-file-url/_expected/iife.js b/test/form/samples/configure-file-url/_expected/iife.js
index bfce4c9d59d..66ea85781ef 100644
--- a/test/form/samples/configure-file-url/_expected/iife.js
+++ b/test/form/samples/configure-file-url/_expected/iife.js
@@ -1,11 +1,11 @@
 (function () {
 	'use strict';
 
-	var asset1 = 'chunkId=iife.js:moduleId=solved:fileName=assets/asset-solved-230ecafdb.txt:format=iife:relativePath=assets/asset-solved-230ecafdb.txt:referenceId=6296c678';
+	var asset1 = 'chunkId=iife.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=iife:relativePath=assets/asset-solved-230ecafd.txt:referenceId=6296c678';
 
 	var asset2 = 'resolved';
 
-	var asset3 = new URL('assets/asset-unresolved-f4c1e86cd.txt', document.currentScript && document.currentScript.src || document.baseURI).href;
+	var asset3 = new URL('assets/asset-unresolved-f4c1e86c.txt', document.currentScript && document.currentScript.src || document.baseURI).href;
 
 	console.log(asset1, asset2, asset3);
 
diff --git a/test/form/samples/configure-file-url/_expected/system.js b/test/form/samples/configure-file-url/_expected/system.js
index f6f4381c71a..83ada681a5b 100644
--- a/test/form/samples/configure-file-url/_expected/system.js
+++ b/test/form/samples/configure-file-url/_expected/system.js
@@ -3,11 +3,11 @@ System.register([], (function (exports, module) {
 	return {
 		execute: (function () {
 
-			var asset1 = 'chunkId=system.js:moduleId=solved:fileName=assets/asset-solved-230ecafdb.txt:format=system:relativePath=assets/asset-solved-230ecafdb.txt:referenceId=6296c678';
+			var asset1 = 'chunkId=system.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=system:relativePath=assets/asset-solved-230ecafd.txt:referenceId=6296c678';
 
 			var asset2 = 'resolved';
 
-			var asset3 = new URL('assets/asset-unresolved-f4c1e86cd.txt', module.meta.url).href;
+			var asset3 = new URL('assets/asset-unresolved-f4c1e86c.txt', module.meta.url).href;
 
 			console.log(asset1, asset2, asset3);
 
diff --git a/test/form/samples/configure-file-url/_expected/umd.js b/test/form/samples/configure-file-url/_expected/umd.js
index 74c92ae6b7d..ac24d52850d 100644
--- a/test/form/samples/configure-file-url/_expected/umd.js
+++ b/test/form/samples/configure-file-url/_expected/umd.js
@@ -3,11 +3,11 @@
 	factory();
 })((function () { 'use strict';
 
-	var asset1 = 'chunkId=umd.js:moduleId=solved:fileName=assets/asset-solved-230ecafdb.txt:format=umd:relativePath=assets/asset-solved-230ecafdb.txt:referenceId=6296c678';
+	var asset1 = 'chunkId=umd.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=umd:relativePath=assets/asset-solved-230ecafd.txt:referenceId=6296c678';
 
 	var asset2 = 'resolved';
 
-	var asset3 = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-f4c1e86cd.txt').href : new URL('assets/asset-unresolved-f4c1e86cd.txt', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href);
+	var asset3 = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-f4c1e86c.txt').href : new URL('assets/asset-unresolved-f4c1e86c.txt', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href);
 
 	console.log(asset1, asset2, asset3);
 
diff --git a/test/form/samples/emit-asset-file/_config.js b/test/form/samples/emit-asset-file/_config.js
index c1f708d057a..ea9534a9aef 100644
--- a/test/form/samples/emit-asset-file/_config.js
+++ b/test/form/samples/emit-asset-file/_config.js
@@ -23,9 +23,9 @@ module.exports = {
 			generateBundle(options, outputBundle) {
 				const keys = Object.keys(outputBundle);
 				assert.strictEqual(keys.length, 2);
-				assert.strictEqual(keys[0], 'assets/logo-a2a2cdc40.svg');
+				assert.strictEqual(keys[0], 'assets/logo-a2a2cdc4.svg');
 				const asset = outputBundle[keys[0]];
-				assert.strictEqual(asset.fileName, 'assets/logo-a2a2cdc40.svg');
+				assert.strictEqual(asset.fileName, 'assets/logo-a2a2cdc4.svg');
 				assert.strictEqual(asset.type, 'asset');
 				assert.ok(
 					asset.source.equals(readFileSync(path.resolve(__dirname, 'logo.svg'))),
diff --git a/test/form/samples/emit-asset-file/_expected/amd.js b/test/form/samples/emit-asset-file/_expected/amd.js
index 680f8565311..ca2a1bdd557 100644
--- a/test/form/samples/emit-asset-file/_expected/amd.js
+++ b/test/form/samples/emit-asset-file/_expected/amd.js
@@ -1,6 +1,6 @@
 define(['require'], (function (require) { 'use strict';
 
-	var logo = new URL(require.toUrl('./assets/logo-a2a2cdc40.svg'), document.baseURI).href;
+	var logo = new URL(require.toUrl('./assets/logo-a2a2cdc4.svg'), document.baseURI).href;
 
 	function showImage(url) {
 		console.log(url);
diff --git a/test/form/samples/emit-asset-file/_expected/assets/logo-a2a2cdc40.svg b/test/form/samples/emit-asset-file/_expected/assets/logo-a2a2cdc4.svg
similarity index 100%
rename from test/form/samples/emit-asset-file/_expected/assets/logo-a2a2cdc40.svg
rename to test/form/samples/emit-asset-file/_expected/assets/logo-a2a2cdc4.svg
diff --git a/test/form/samples/emit-asset-file/_expected/cjs.js b/test/form/samples/emit-asset-file/_expected/cjs.js
index 51467023388..ae0b56a62c4 100644
--- a/test/form/samples/emit-asset-file/_expected/cjs.js
+++ b/test/form/samples/emit-asset-file/_expected/cjs.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo-a2a2cdc40.svg').href : new URL('assets/logo-a2a2cdc40.svg', document.currentScript && document.currentScript.src || document.baseURI).href);
+var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo-a2a2cdc4.svg').href : new URL('assets/logo-a2a2cdc4.svg', document.currentScript && document.currentScript.src || document.baseURI).href);
 
 function showImage(url) {
 	console.log(url);
diff --git a/test/form/samples/emit-asset-file/_expected/es.js b/test/form/samples/emit-asset-file/_expected/es.js
index 0a799186d66..c29240a6acf 100644
--- a/test/form/samples/emit-asset-file/_expected/es.js
+++ b/test/form/samples/emit-asset-file/_expected/es.js
@@ -1,4 +1,4 @@
-var logo = new URL('assets/logo-a2a2cdc40.svg', import.meta.url).href;
+var logo = new URL('assets/logo-a2a2cdc4.svg', import.meta.url).href;
 
 function showImage(url) {
 	console.log(url);
diff --git a/test/form/samples/emit-asset-file/_expected/iife.js b/test/form/samples/emit-asset-file/_expected/iife.js
index 5e15692580a..f28f46dbc3d 100644
--- a/test/form/samples/emit-asset-file/_expected/iife.js
+++ b/test/form/samples/emit-asset-file/_expected/iife.js
@@ -1,7 +1,7 @@
 (function () {
 	'use strict';
 
-	var logo = new URL('assets/logo-a2a2cdc40.svg', document.currentScript && document.currentScript.src || document.baseURI).href;
+	var logo = new URL('assets/logo-a2a2cdc4.svg', document.currentScript && document.currentScript.src || document.baseURI).href;
 
 	function showImage(url) {
 		console.log(url);
diff --git a/test/form/samples/emit-asset-file/_expected/system.js b/test/form/samples/emit-asset-file/_expected/system.js
index 1ed0b71a3af..d332088ba81 100644
--- a/test/form/samples/emit-asset-file/_expected/system.js
+++ b/test/form/samples/emit-asset-file/_expected/system.js
@@ -3,7 +3,7 @@ System.register([], (function (exports, module) {
 	return {
 		execute: (function () {
 
-			var logo = new URL('assets/logo-a2a2cdc40.svg', module.meta.url).href;
+			var logo = new URL('assets/logo-a2a2cdc4.svg', module.meta.url).href;
 
 			function showImage(url) {
 				console.log(url);
diff --git a/test/form/samples/emit-asset-file/_expected/umd.js b/test/form/samples/emit-asset-file/_expected/umd.js
index fc88b636f52..cd53dda9832 100644
--- a/test/form/samples/emit-asset-file/_expected/umd.js
+++ b/test/form/samples/emit-asset-file/_expected/umd.js
@@ -3,7 +3,7 @@
 	factory();
 })((function () { 'use strict';
 
-	var logo = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo-a2a2cdc40.svg').href : new URL('assets/logo-a2a2cdc40.svg', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href);
+	var logo = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo-a2a2cdc4.svg').href : new URL('assets/logo-a2a2cdc4.svg', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href);
 
 	function showImage(url) {
 		console.log(url);
diff --git a/test/form/samples/emit-file-tree-shaken-access/_expected/assets/logo-a2a2cdc40.svg b/test/form/samples/emit-file-tree-shaken-access/_expected/assets/logo-a2a2cdc4.svg
similarity index 100%
rename from test/form/samples/emit-file-tree-shaken-access/_expected/assets/logo-a2a2cdc40.svg
rename to test/form/samples/emit-file-tree-shaken-access/_expected/assets/logo-a2a2cdc4.svg
diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/amd.js b/test/form/samples/emit-uint8array-no-buffer/_expected/amd.js
index 014c8822518..87efea4471d 100644
--- a/test/form/samples/emit-uint8array-no-buffer/_expected/amd.js
+++ b/test/form/samples/emit-uint8array-no-buffer/_expected/amd.js
@@ -1,14 +1,14 @@
 define(['require'], (function (require) { 'use strict';
 
-	var asset1a = new URL(require.toUrl('./assets/asset-8e3dd2ea9'), document.baseURI).href;
+	var asset1a = new URL(require.toUrl('./assets/asset-8e3dd2ea'), document.baseURI).href;
 
-	var asset1b = new URL(require.toUrl('./assets/asset-8e3dd2ea9'), document.baseURI).href;
+	var asset1b = new URL(require.toUrl('./assets/asset-8e3dd2ea'), document.baseURI).href;
 
-	var asset2a = new URL(require.toUrl('./assets/asset-75590fc11'), document.baseURI).href;
+	var asset2a = new URL(require.toUrl('./assets/asset-75590fc1'), document.baseURI).href;
 
-	var asset2b = new URL(require.toUrl('./assets/asset-75590fc11'), document.baseURI).href;
+	var asset2b = new URL(require.toUrl('./assets/asset-75590fc1'), document.baseURI).href;
 
-	var asset99a = new URL(require.toUrl('./assets/asset-60cc5dc9f'), document.baseURI).href;
+	var asset99a = new URL(require.toUrl('./assets/asset-60cc5dc9'), document.baseURI).href;
 
 	console.log(asset1a, asset1b, asset2a, asset2b, asset99a);
 
diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-60cc5dc9f b/test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-60cc5dc9
similarity index 100%
rename from test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-60cc5dc9f
rename to test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-60cc5dc9
diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-75590fc11 b/test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-75590fc1
similarity index 100%
rename from test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-75590fc11
rename to test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-75590fc1
diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-8e3dd2ea9 b/test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-8e3dd2ea
similarity index 100%
rename from test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-8e3dd2ea9
rename to test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-8e3dd2ea
diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/cjs.js b/test/form/samples/emit-uint8array-no-buffer/_expected/cjs.js
index 06df5a49a29..083e9204889 100644
--- a/test/form/samples/emit-uint8array-no-buffer/_expected/cjs.js
+++ b/test/form/samples/emit-uint8array-no-buffer/_expected/cjs.js
@@ -1,13 +1,13 @@
 'use strict';
 
-var asset1a = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-8e3dd2ea9').href : new URL('assets/asset-8e3dd2ea9', document.currentScript && document.currentScript.src || document.baseURI).href);
+var asset1a = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-8e3dd2ea').href : new URL('assets/asset-8e3dd2ea', document.currentScript && document.currentScript.src || document.baseURI).href);
 
-var asset1b = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-8e3dd2ea9').href : new URL('assets/asset-8e3dd2ea9', document.currentScript && document.currentScript.src || document.baseURI).href);
+var asset1b = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-8e3dd2ea').href : new URL('assets/asset-8e3dd2ea', document.currentScript && document.currentScript.src || document.baseURI).href);
 
-var asset2a = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-75590fc11').href : new URL('assets/asset-75590fc11', document.currentScript && document.currentScript.src || document.baseURI).href);
+var asset2a = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-75590fc1').href : new URL('assets/asset-75590fc1', document.currentScript && document.currentScript.src || document.baseURI).href);
 
-var asset2b = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-75590fc11').href : new URL('assets/asset-75590fc11', document.currentScript && document.currentScript.src || document.baseURI).href);
+var asset2b = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-75590fc1').href : new URL('assets/asset-75590fc1', document.currentScript && document.currentScript.src || document.baseURI).href);
 
-var asset99a = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-60cc5dc9f').href : new URL('assets/asset-60cc5dc9f', document.currentScript && document.currentScript.src || document.baseURI).href);
+var asset99a = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-60cc5dc9').href : new URL('assets/asset-60cc5dc9', document.currentScript && document.currentScript.src || document.baseURI).href);
 
 console.log(asset1a, asset1b, asset2a, asset2b, asset99a);
diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/es.js b/test/form/samples/emit-uint8array-no-buffer/_expected/es.js
index ffae58f8864..f61d2fab4e9 100644
--- a/test/form/samples/emit-uint8array-no-buffer/_expected/es.js
+++ b/test/form/samples/emit-uint8array-no-buffer/_expected/es.js
@@ -1,11 +1,11 @@
-var asset1a = new URL('assets/asset-8e3dd2ea9', import.meta.url).href;
+var asset1a = new URL('assets/asset-8e3dd2ea', import.meta.url).href;
 
-var asset1b = new URL('assets/asset-8e3dd2ea9', import.meta.url).href;
+var asset1b = new URL('assets/asset-8e3dd2ea', import.meta.url).href;
 
-var asset2a = new URL('assets/asset-75590fc11', import.meta.url).href;
+var asset2a = new URL('assets/asset-75590fc1', import.meta.url).href;
 
-var asset2b = new URL('assets/asset-75590fc11', import.meta.url).href;
+var asset2b = new URL('assets/asset-75590fc1', import.meta.url).href;
 
-var asset99a = new URL('assets/asset-60cc5dc9f', import.meta.url).href;
+var asset99a = new URL('assets/asset-60cc5dc9', import.meta.url).href;
 
 console.log(asset1a, asset1b, asset2a, asset2b, asset99a);
diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/iife.js b/test/form/samples/emit-uint8array-no-buffer/_expected/iife.js
index c4c353032a2..7735d95046d 100644
--- a/test/form/samples/emit-uint8array-no-buffer/_expected/iife.js
+++ b/test/form/samples/emit-uint8array-no-buffer/_expected/iife.js
@@ -1,15 +1,15 @@
 (function () {
 	'use strict';
 
-	var asset1a = new URL('assets/asset-8e3dd2ea9', document.currentScript && document.currentScript.src || document.baseURI).href;
+	var asset1a = new URL('assets/asset-8e3dd2ea', document.currentScript && document.currentScript.src || document.baseURI).href;
 
-	var asset1b = new URL('assets/asset-8e3dd2ea9', document.currentScript && document.currentScript.src || document.baseURI).href;
+	var asset1b = new URL('assets/asset-8e3dd2ea', document.currentScript && document.currentScript.src || document.baseURI).href;
 
-	var asset2a = new URL('assets/asset-75590fc11', document.currentScript && document.currentScript.src || document.baseURI).href;
+	var asset2a = new URL('assets/asset-75590fc1', document.currentScript && document.currentScript.src || document.baseURI).href;
 
-	var asset2b = new URL('assets/asset-75590fc11', document.currentScript && document.currentScript.src || document.baseURI).href;
+	var asset2b = new URL('assets/asset-75590fc1', document.currentScript && document.currentScript.src || document.baseURI).href;
 
-	var asset99a = new URL('assets/asset-60cc5dc9f', document.currentScript && document.currentScript.src || document.baseURI).href;
+	var asset99a = new URL('assets/asset-60cc5dc9', document.currentScript && document.currentScript.src || document.baseURI).href;
 
 	console.log(asset1a, asset1b, asset2a, asset2b, asset99a);
 
diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/system.js b/test/form/samples/emit-uint8array-no-buffer/_expected/system.js
index d631531b164..dc3b8c0c825 100644
--- a/test/form/samples/emit-uint8array-no-buffer/_expected/system.js
+++ b/test/form/samples/emit-uint8array-no-buffer/_expected/system.js
@@ -3,15 +3,15 @@ System.register([], (function (exports, module) {
 	return {
 		execute: (function () {
 
-			var asset1a = new URL('assets/asset-8e3dd2ea9', module.meta.url).href;
+			var asset1a = new URL('assets/asset-8e3dd2ea', module.meta.url).href;
 
-			var asset1b = new URL('assets/asset-8e3dd2ea9', module.meta.url).href;
+			var asset1b = new URL('assets/asset-8e3dd2ea', module.meta.url).href;
 
-			var asset2a = new URL('assets/asset-75590fc11', module.meta.url).href;
+			var asset2a = new URL('assets/asset-75590fc1', module.meta.url).href;
 
-			var asset2b = new URL('assets/asset-75590fc11', module.meta.url).href;
+			var asset2b = new URL('assets/asset-75590fc1', module.meta.url).href;
 
-			var asset99a = new URL('assets/asset-60cc5dc9f', module.meta.url).href;
+			var asset99a = new URL('assets/asset-60cc5dc9', module.meta.url).href;
 
 			console.log(asset1a, asset1b, asset2a, asset2b, asset99a);
 
diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/umd.js b/test/form/samples/emit-uint8array-no-buffer/_expected/umd.js
index ee43d9859a7..18c43ff8451 100644
--- a/test/form/samples/emit-uint8array-no-buffer/_expected/umd.js
+++ b/test/form/samples/emit-uint8array-no-buffer/_expected/umd.js
@@ -3,15 +3,15 @@
 	factory();
 })((function () { 'use strict';
 
-	var asset1a = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-8e3dd2ea9').href : new URL('assets/asset-8e3dd2ea9', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href);
+	var asset1a = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-8e3dd2ea').href : new URL('assets/asset-8e3dd2ea', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href);
 
-	var asset1b = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-8e3dd2ea9').href : new URL('assets/asset-8e3dd2ea9', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href);
+	var asset1b = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-8e3dd2ea').href : new URL('assets/asset-8e3dd2ea', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href);
 
-	var asset2a = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-75590fc11').href : new URL('assets/asset-75590fc11', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href);
+	var asset2a = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-75590fc1').href : new URL('assets/asset-75590fc1', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href);
 
-	var asset2b = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-75590fc11').href : new URL('assets/asset-75590fc11', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href);
+	var asset2b = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-75590fc1').href : new URL('assets/asset-75590fc1', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href);
 
-	var asset99a = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-60cc5dc9f').href : new URL('assets/asset-60cc5dc9f', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href);
+	var asset99a = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-60cc5dc9').href : new URL('assets/asset-60cc5dc9', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href);
 
 	console.log(asset1a, asset1b, asset2a, asset2b, asset99a);
 
diff --git a/test/function/samples/hashing/minimum-hash-size/_config.js b/test/function/samples/hashing/minimum-hash-size/_config.js
index 033123f1cd7..9ef9dfcf253 100644
--- a/test/function/samples/hashing/minimum-hash-size/_config.js
+++ b/test/function/samples/hashing/minimum-hash-size/_config.js
@@ -4,6 +4,6 @@ module.exports = {
 	generateError: {
 		code: 'VALIDATION_ERROR',
 		message:
-			'To generate hashes for this number of chunks (currently 1), you need a minimum hash size of 7, received 3. Check the "output.chunkFileNames" option.'
+			'To generate hashes for this number of chunks (currently 1), you need a minimum hash size of 6, received 3. Check the "output.chunkFileNames" option.'
 	}
 };
diff --git a/test/hooks/index.js b/test/hooks/index.js
index 287c12791dd..8c156d5dd65 100644
--- a/test/hooks/index.js
+++ b/test/hooks/index.js
@@ -168,9 +168,9 @@ describe('hooks', () => {
 			.then(({ output }) => {
 				assert.strictEqual(
 					output[0].code,
-					`var input = new URL('chunk-f0e7d366b.js', import.meta.url).href;\n\nexport { input as default };\n`
+					`var input = new URL('chunk-f0e7d366.js', import.meta.url).href;\n\nexport { input as default };\n`
 				);
-				assert.strictEqual(output[1].fileName, 'chunk-f0e7d366b.js');
+				assert.strictEqual(output[1].fileName, 'chunk-f0e7d366.js');
 				assert.strictEqual(output[1].code, `console.log('chunk');\n`);
 
 				return rollup.rollup({
@@ -193,9 +193,9 @@ describe('hooks', () => {
 			.then(({ output }) => {
 				assert.strictEqual(
 					output[0].code,
-					`var input = new URL('chunk-f0e7d366b.js', import.meta.url).href;\n\nexport { input as default };\n`
+					`var input = new URL('chunk-f0e7d366.js', import.meta.url).href;\n\nexport { input as default };\n`
 				);
-				assert.strictEqual(output[1].fileName, 'chunk-f0e7d366b.js');
+				assert.strictEqual(output[1].fileName, 'chunk-f0e7d366.js');
 				assert.strictEqual(output[1].code, `console.log('chunk');\n`);
 
 				return rollup.rollup({
@@ -215,9 +215,9 @@ describe('hooks', () => {
 			.then(({ output }) => {
 				assert.strictEqual(
 					output[0].code,
-					`var input = new URL('chunk-f0e7d366b.js', import.meta.url).href;\n\nexport { input as default };\n`
+					`var input = new URL('chunk-f0e7d366.js', import.meta.url).href;\n\nexport { input as default };\n`
 				);
-				assert.strictEqual(output[1].fileName, 'chunk-f0e7d366b.js');
+				assert.strictEqual(output[1].fileName, 'chunk-f0e7d366.js');
 				assert.strictEqual(output[1].code, `console.log('chunk');\n`);
 			});
 	});
@@ -276,9 +276,9 @@ describe('hooks', () => {
 			.then(({ output }) => {
 				assert.strictEqual(
 					output[0].code,
-					`var input = new URL('assets/test-b94d27b99.ext', import.meta.url).href;\n\nexport { input as default };\n`
+					`var input = new URL('assets/test-b94d27b9.ext', import.meta.url).href;\n\nexport { input as default };\n`
 				);
-				assert.strictEqual(output[1].fileName, 'assets/test-b94d27b99.ext');
+				assert.strictEqual(output[1].fileName, 'assets/test-b94d27b9.ext');
 				assert.strictEqual(output[1].source, 'hello world');
 
 				return rollup.rollup({
@@ -301,9 +301,9 @@ describe('hooks', () => {
 			.then(({ output }) => {
 				assert.strictEqual(
 					output[0].code,
-					`var input = new URL('assets/test-b94d27b99.ext', import.meta.url).href;\n\nexport { input as default };\n`
+					`var input = new URL('assets/test-b94d27b9.ext', import.meta.url).href;\n\nexport { input as default };\n`
 				);
-				assert.strictEqual(output[1].fileName, 'assets/test-b94d27b99.ext');
+				assert.strictEqual(output[1].fileName, 'assets/test-b94d27b9.ext');
 				assert.strictEqual(output[1].source, 'hello world');
 
 				return rollup.rollup({
@@ -323,9 +323,9 @@ describe('hooks', () => {
 			.then(({ output }) => {
 				assert.strictEqual(
 					output[0].code,
-					`var input = new URL('assets/test-b94d27b99.ext', import.meta.url).href;\n\nexport { input as default };\n`
+					`var input = new URL('assets/test-b94d27b9.ext', import.meta.url).href;\n\nexport { input as default };\n`
 				);
-				assert.strictEqual(output[1].fileName, 'assets/test-b94d27b99.ext');
+				assert.strictEqual(output[1].fileName, 'assets/test-b94d27b9.ext');
 				assert.strictEqual(output[1].source, 'hello world');
 			});
 	});
@@ -371,10 +371,10 @@ describe('hooks', () => {
 				assert.strictEqual(
 					output[0].code,
 					`console.log('imported');\n\n` +
-						`var input = new URL('assets/test-7d48a5826.ext', import.meta.url).href;\n\n` +
+						`var input = new URL('assets/test-7d48a582.ext', import.meta.url).href;\n\n` +
 						`export { input as default };\n`
 				);
-				assert.strictEqual(output[1].fileName, 'assets/test-7d48a5826.ext');
+				assert.strictEqual(output[1].fileName, 'assets/test-7d48a582.ext');
 				assert.strictEqual(output[1].source, 'first run');
 
 				return rollup.rollup({
@@ -404,10 +404,10 @@ describe('hooks', () => {
 				assert.strictEqual(
 					output[0].code,
 					`console.log('imported');\n\n` +
-						`var input = new URL('assets/test-791d43e21.ext', import.meta.url).href;\n\n` +
+						`var input = new URL('assets/test-791d43e2.ext', import.meta.url).href;\n\n` +
 						`export { input as default };\n`
 				);
-				assert.strictEqual(output[1].fileName, 'assets/test-791d43e21.ext');
+				assert.strictEqual(output[1].fileName, 'assets/test-791d43e2.ext');
 				assert.strictEqual(output[1].source, 'second run');
 			});
 	});
@@ -442,11 +442,11 @@ describe('hooks', () => {
 			.then(({ output }) => {
 				assert.strictEqual(
 					output[0].code,
-					`var input = new URL('assets/test-b94d27b99.ext', import.meta.url).href;\n\nexport { input as default };\n`
+					`var input = new URL('assets/test-b94d27b9.ext', import.meta.url).href;\n\nexport { input as default };\n`
 				);
-				assert.strictEqual(output[1].fileName, 'assets/test-b94d27b99.ext');
+				assert.strictEqual(output[1].fileName, 'assets/test-b94d27b9.ext');
 				assert.strictEqual(output[1].source, 'hello world');
-				assert.strictEqual(output[1].fileName, 'assets/test-b94d27b99.ext');
+				assert.strictEqual(output[1].fileName, 'assets/test-b94d27b9.ext');
 				assert.strictEqual(output[1].source, 'hello world');
 
 				return rollup.rollup({
diff --git a/test/misc/bundle-information.js b/test/misc/bundle-information.js
index 55b9420dd98..75f5cbca2ce 100644
--- a/test/misc/bundle-information.js
+++ b/test/misc/bundle-information.js
@@ -28,14 +28,14 @@ describe('The bundle object', () => {
 			.then(({ output }) => {
 				assert.deepEqual(
 					output.map(chunk => chunk.fileName),
-					['input1-02371fd35.js', 'input2-e064af6e9.js', 'generated-shared-4eca6591b.js'],
+					['input1-fffbf648.js', 'input2-ee435193.js', 'generated-shared-4eca6591.js'],
 					'fileName'
 				);
 				assert.deepEqual(
 					output.map(chunk => chunk.code),
 					[
-						`import { u as used, s as shared } from './generated-shared-4eca6591b.js';\n\nconsole.log("input1", used, shared);const out = true;\n\nexport { out };\n`,
-						`import './generated-shared-4eca6591b.js';\n\nconsole.log("input2");var input2 = 42;\n\nexport { input2 as default };\n`,
+						`import { u as used, s as shared } from './generated-shared-4eca6591.js';\n\nconsole.log("input1", used, shared);const out = true;\n\nexport { out };\n`,
+						`import './generated-shared-4eca6591.js';\n\nconsole.log("input2");var input2 = 42;\n\nexport { input2 as default };\n`,
 						`console.log("shared");const used = "used"; var shared = "stuff";\n\nexport { shared as s, used as u };\n`
 					],
 					'code'
@@ -62,14 +62,14 @@ describe('The bundle object', () => {
 				);
 				assert.deepEqual(
 					output.map(chunk => chunk.imports),
-					[['generated-shared-4eca6591b.js'], ['generated-shared-4eca6591b.js'], []],
+					[['generated-shared-4eca6591.js'], ['generated-shared-4eca6591.js'], []],
 					'imports'
 				);
 				assert.deepEqual(
 					output.map(chunk => chunk.importedBindings),
 					[
-						{ 'generated-shared-4eca6591b.js': ['u', 's'] },
-						{ 'generated-shared-4eca6591b.js': [] },
+						{ 'generated-shared-4eca6591.js': ['u', 's'] },
+						{ 'generated-shared-4eca6591.js': [] },
 						{}
 					],
 					'importedBindings'
diff --git a/test/misc/misc.js b/test/misc/misc.js
index ddee8a4b31d..368974e6ace 100644
--- a/test/misc/misc.js
+++ b/test/misc/misc.js
@@ -111,7 +111,7 @@ describe('misc', () => {
 				assert.equal(warnings.length, 0);
 				assert.deepEqual(
 					output.map(({ fileName }) => fileName),
-					['main1.js', 'main2.js', 'dep-31129d5e1.js', 'dyndep-d5d54b599.js']
+					['main1.js', 'main2.js', 'dep-9394ae8f.js', 'dyndep-d5d54b59.js']
 				);
 			});
 	});