diff --git a/tests/cases/fourslash/goToDefinitionExternamModuleName.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName.ts
similarity index 100%
rename from tests/cases/fourslash/goToDefinitionExternamModuleName.ts
rename to tests/cases/fourslash/goToDefinitionExternalModuleName.ts
diff --git a/tests/cases/fourslash/goToDefinitionExternamModuleName2.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName2.ts
similarity index 100%
rename from tests/cases/fourslash/goToDefinitionExternamModuleName2.ts
rename to tests/cases/fourslash/goToDefinitionExternalModuleName2.ts
diff --git a/tests/cases/fourslash/goToDefinitionExternamModuleName3.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName3.ts
similarity index 100%
rename from tests/cases/fourslash/goToDefinitionExternamModuleName3.ts
rename to tests/cases/fourslash/goToDefinitionExternalModuleName3.ts
diff --git a/tests/cases/fourslash/goToDefinitionExternamModuleName4.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName4.ts
similarity index 100%
rename from tests/cases/fourslash/goToDefinitionExternamModuleName4.ts
rename to tests/cases/fourslash/goToDefinitionExternalModuleName4.ts
diff --git a/tests/cases/fourslash/goToDefinitionExternamModuleName5.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName5.ts
similarity index 100%
rename from tests/cases/fourslash/goToDefinitionExternamModuleName5.ts
rename to tests/cases/fourslash/goToDefinitionExternalModuleName5.ts
diff --git a/tests/cases/fourslash/goToDefinitionExternamModuleName6.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName6.ts
similarity index 100%
rename from tests/cases/fourslash/goToDefinitionExternamModuleName6.ts
rename to tests/cases/fourslash/goToDefinitionExternalModuleName6.ts
diff --git a/tests/cases/fourslash/goToDefinitionExternamModuleName7.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName7.ts
similarity index 100%
rename from tests/cases/fourslash/goToDefinitionExternamModuleName7.ts
rename to tests/cases/fourslash/goToDefinitionExternalModuleName7.ts
diff --git a/tests/cases/fourslash/goToDefinitionExternamModuleName8.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName8.ts
similarity index 100%
rename from tests/cases/fourslash/goToDefinitionExternamModuleName8.ts
rename to tests/cases/fourslash/goToDefinitionExternalModuleName8.ts
diff --git a/tests/cases/fourslash/goToDefinitionExternamModuleName9.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName9.ts
similarity index 100%
rename from tests/cases/fourslash/goToDefinitionExternamModuleName9.ts
rename to tests/cases/fourslash/goToDefinitionExternalModuleName9.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureBindingPatterns.ts b/tests/cases/fourslash/navigationBarItemsBindingPatterns.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureBindingPatterns.ts
rename to tests/cases/fourslash/navigationBarItemsBindingPatterns.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureBindingPatternsInConstructor.ts b/tests/cases/fourslash/navigationBarItemsBindingPatternsInConstructor.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureBindingPatternsInConstructor.ts
rename to tests/cases/fourslash/navigationBarItemsBindingPatternsInConstructor.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureEmptyConstructors.ts b/tests/cases/fourslash/navigationBarItemsEmptyConstructors.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureEmptyConstructors.ts
rename to tests/cases/fourslash/navigationBarItemsEmptyConstructors.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureExports.ts b/tests/cases/fourslash/navigationBarItemsExports.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureExports.ts
rename to tests/cases/fourslash/navigationBarItemsExports.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureFunctions.ts b/tests/cases/fourslash/navigationBarItemsFunctions.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureFunctions.ts
rename to tests/cases/fourslash/navigationBarItemsFunctions.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureFunctionsBroken.ts b/tests/cases/fourslash/navigationBarItemsFunctionsBroken.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureFunctionsBroken.ts
rename to tests/cases/fourslash/navigationBarItemsFunctionsBroken.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureFunctionsBroken2.ts b/tests/cases/fourslash/navigationBarItemsFunctionsBroken2.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureFunctionsBroken2.ts
rename to tests/cases/fourslash/navigationBarItemsFunctionsBroken2.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureImports.ts b/tests/cases/fourslash/navigationBarItemsImports.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureImports.ts
rename to tests/cases/fourslash/navigationBarItemsImports.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureItems.ts b/tests/cases/fourslash/navigationBarItemsItems.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureItems.ts
rename to tests/cases/fourslash/navigationBarItemsItems.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureItems2.ts b/tests/cases/fourslash/navigationBarItemsItems2.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureItems2.ts
rename to tests/cases/fourslash/navigationBarItemsItems2.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureItemsContainsNoAnonymousFunctions.ts b/tests/cases/fourslash/navigationBarItemsItemsContainsNoAnonymousFunctions.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureItemsContainsNoAnonymousFunctions.ts
rename to tests/cases/fourslash/navigationBarItemsItemsContainsNoAnonymousFunctions.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureItemsExternalModules.ts b/tests/cases/fourslash/navigationBarItemsItemsExternalModules.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureItemsExternalModules.ts
rename to tests/cases/fourslash/navigationBarItemsItemsExternalModules.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureItemsExternalModules2.ts b/tests/cases/fourslash/navigationBarItemsItemsExternalModules2.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureItemsExternalModules2.ts
rename to tests/cases/fourslash/navigationBarItemsItemsExternalModules2.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureItemsExternalModules3.ts b/tests/cases/fourslash/navigationBarItemsItemsExternalModules3.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureItemsExternalModules3.ts
rename to tests/cases/fourslash/navigationBarItemsItemsExternalModules3.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureItemsModuleVariables.ts b/tests/cases/fourslash/navigationBarItemsItemsModuleVariables.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureItemsModuleVariables.ts
rename to tests/cases/fourslash/navigationBarItemsItemsModuleVariables.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureMissingName1.ts b/tests/cases/fourslash/navigationBarItemsMissingName1.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureMissingName1.ts
rename to tests/cases/fourslash/navigationBarItemsMissingName1.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureMissingName2.ts b/tests/cases/fourslash/navigationBarItemsMissingName2.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureMissingName2.ts
rename to tests/cases/fourslash/navigationBarItemsMissingName2.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureModules.ts b/tests/cases/fourslash/navigationBarItemsModules.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureModules.ts
rename to tests/cases/fourslash/navigationBarItemsModules.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureMultilineStringIdentifiers.ts b/tests/cases/fourslash/navigationBarItemsMultilineStringIdentifiers.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureMultilineStringIdentifiers.ts
rename to tests/cases/fourslash/navigationBarItemsMultilineStringIdentifiers.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructurePropertiesDefinedInConstructors.ts b/tests/cases/fourslash/navigationBarItemsPropertiesDefinedInConstructors.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructurePropertiesDefinedInConstructors.ts
rename to tests/cases/fourslash/navigationBarItemsPropertiesDefinedInConstructors.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureSymbols1.ts b/tests/cases/fourslash/navigationBarItemsSymbols1.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureSymbols1.ts
rename to tests/cases/fourslash/navigationBarItemsSymbols1.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureSymbols2.ts b/tests/cases/fourslash/navigationBarItemsSymbols2.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureSymbols2.ts
rename to tests/cases/fourslash/navigationBarItemsSymbols2.ts
diff --git a/tests/cases/fourslash/scriptLexicalStructureSymbols3.ts b/tests/cases/fourslash/navigationBarItemsSymbols3.ts
similarity index 100%
rename from tests/cases/fourslash/scriptLexicalStructureSymbols3.ts
rename to tests/cases/fourslash/navigationBarItemsSymbols3.ts
diff --git a/tests/cases/fourslash/underscoreTypings1.ts b/tests/cases/fourslash/underscoreTypings01.ts
similarity index 100%
rename from tests/cases/fourslash/underscoreTypings1.ts
rename to tests/cases/fourslash/underscoreTypings01.ts
diff --git a/tests/cases/fourslash/underscoreTyping1.ts b/tests/cases/fourslash/underscoreTypings02.ts
similarity index 100%
rename from tests/cases/fourslash/underscoreTyping1.ts
rename to tests/cases/fourslash/underscoreTypings02.ts