diff --git a/tools/js2dart/spec/0-subfolder/library_spec.js b/tools/js2dart/spec/a-0-subfolder/library_spec.js
similarity index 100%
rename from tools/js2dart/spec/0-subfolder/library_spec.js
rename to tools/js2dart/spec/a-0-subfolder/library_spec.js
diff --git a/tools/js2dart/src/dart_writer.js b/tools/js2dart/src/dart_writer.js
index 79ffdbc106..e8999945bb 100644
--- a/tools/js2dart/src/dart_writer.js
+++ b/tools/js2dart/src/dart_writer.js
@@ -8,7 +8,7 @@ export class DartTreeWriter extends JavaScriptParseTreeWriter {
     super();
     this.libName = moduleName
         .replace(/\//g, '.')
-        .replace(/[^\w.]/, '_')
+        .replace(/[^\w.]/g, '_')
         .replace('.lib.', '.')
         .replace(/\.dart$/, '');
   }