diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport01.ts b/tests/cases/fourslash/findAllRefsForDefaultExport01.ts
index ca2f982302c..2f40af93c02 100644
--- a/tests/cases/fourslash/findAllRefsForDefaultExport01.ts
+++ b/tests/cases/fourslash/findAllRefsForDefaultExport01.ts
@@ -6,10 +6,6 @@
 ////var x: [|DefaultExportedClass|];
 ////
 ////var y = new [|DefaultExportedClass|];
-////
-////namespace [|DefaultExportedClass|] {
-////    var local = 100;
-////}
 
 let ranges = test.ranges()
 for (let range of ranges) {
diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport02.ts b/tests/cases/fourslash/findAllRefsForDefaultExport02.ts
index 1a0a92241f4..db773c74e3c 100644
--- a/tests/cases/fourslash/findAllRefsForDefaultExport02.ts
+++ b/tests/cases/fourslash/findAllRefsForDefaultExport02.ts
@@ -7,10 +7,6 @@
 ////var x: typeof [|DefaultExportedFunction|];
 ////
 ////var y = [|DefaultExportedFunction|]();
-////
-////namespace [|DefaultExportedFunction|] {
-////    var local = 100;
-////}
 
 let ranges = test.ranges()
 for (let range of ranges) {
diff --git a/tests/cases/fourslash/renameForDefaultExport01.ts b/tests/cases/fourslash/renameForDefaultExport01.ts
index ec9c3900a5e..809c127a727 100644
--- a/tests/cases/fourslash/renameForDefaultExport01.ts
+++ b/tests/cases/fourslash/renameForDefaultExport01.ts
@@ -1,23 +1,18 @@
 /// <reference path='fourslash.ts'/>
 
-/////**
-//// *  Commenting [|DefaultExportedClass|]
-//// */
 ////export default class /*1*/[|DefaultExportedClass|] {
 ////}
+/////*
+//// *  Commenting [|DefaultExportedClass|]
+//// */
 ////
 ////var x: /*2*/[|DefaultExportedClass|];
 ////
 ////var y = new /*3*/[|DefaultExportedClass|];
-////
-////namespace /*4*/[|DefaultExportedClass|] {
-////    var local = 100;
-////}
 
 let markers = test.markers()
 for (let marker of markers) {
     goTo.position(marker.position);
 
     verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ true);
-    verify.renameInfoSucceeded("DefaultExportedClass");
 }
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameForDefaultExport02.ts b/tests/cases/fourslash/renameForDefaultExport02.ts
index eea63282f5f..ddf4b224023 100644
--- a/tests/cases/fourslash/renameForDefaultExport02.ts
+++ b/tests/cases/fourslash/renameForDefaultExport02.ts
@@ -1,24 +1,19 @@
 /// <reference path='fourslash.ts'/>
 
-/////**
-//// *  Commenting [|DefaultExportedFunction|]
-//// */
 ////export default function /*1*/[|DefaultExportedFunction|]() {
 ////    return /*2*/[|DefaultExportedFunction|]
 ////}
+/////**
+//// *  Commenting [|DefaultExportedFunction|]
+//// */
 ////
 ////var x: typeof /*3*/[|DefaultExportedFunction|];
 ////
 ////var y = /*4*/[|DefaultExportedFunction|]();
-////
-////namespace /*5*/[|DefaultExportedFunction|] {
-////    var local = 100;
-////}
 
 let markers = test.markers()
 for (let marker of markers) {
     goTo.position(marker.position);
 
     verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ true);
-    verify.renameInfoSucceeded("DefaultExportedFunction");
 }
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameForDefaultExport03.ts b/tests/cases/fourslash/renameForDefaultExport03.ts
index b36b04768ab..6f82d96fe5e 100644
--- a/tests/cases/fourslash/renameForDefaultExport03.ts
+++ b/tests/cases/fourslash/renameForDefaultExport03.ts
@@ -1,8 +1,5 @@
 /// <reference path='fourslash.ts'/>
 
-/////**
-//// *  Commenting [|f|]
-//// */
 ////function /*1*/[|f|]() {
 ////    return 100;
 ////}
@@ -13,6 +10,9 @@
 ////
 ////var y = /*4*/[|f|]();
 ////
+/////**
+//// *  Commenting [|f|]
+//// */
 ////namespace /*5*/[|f|] {
 ////    var local = 100;
 ////}
@@ -22,5 +22,4 @@ for (let marker of markers) {
     goTo.position(marker.position);
 
     verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ true);
-    verify.renameInfoSucceeded("f");
 }
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameForDefaultExport04.ts b/tests/cases/fourslash/renameForDefaultExport04.ts
new file mode 100644
index 00000000000..44dd764682f
--- /dev/null
+++ b/tests/cases/fourslash/renameForDefaultExport04.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts'/>
+
+////export default class /**/[|DefaultExportedClass|] {
+////}
+/////*
+//// *  Commenting DefaultExportedClass
+//// */
+////
+////var x: DefaultExportedClass;
+////
+////var y = new DefaultExportedClass;
+
+goTo.marker();
+verify.renameInfoSucceeded("DefaultExportedClass", "DefaultExportedClass");
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameForDefaultExport05.ts b/tests/cases/fourslash/renameForDefaultExport05.ts
new file mode 100644
index 00000000000..926fa5dd6fd
--- /dev/null
+++ b/tests/cases/fourslash/renameForDefaultExport05.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts'/>
+
+////export default class DefaultExportedClass {
+////}
+/////*
+//// *  Commenting DefaultExportedClass
+//// */
+////
+////var x: /**/[|DefaultExportedClass|];
+////
+////var y = new DefaultExportedClass;
+
+goTo.marker();
+verify.renameInfoSucceeded("DefaultExportedClass", "DefaultExportedClass");
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameForDefaultExport06.ts b/tests/cases/fourslash/renameForDefaultExport06.ts
new file mode 100644
index 00000000000..da3ca8d92a4
--- /dev/null
+++ b/tests/cases/fourslash/renameForDefaultExport06.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts'/>
+
+////export default class DefaultExportedClass {
+////}
+/////*
+//// *  Commenting DefaultExportedClass
+//// */
+////
+////var x: DefaultExportedClass;
+////
+////var y = new /**/[|DefaultExportedClass|];
+
+goTo.marker();
+verify.renameInfoSucceeded("DefaultExportedClass", "DefaultExportedClass");
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameForDefaultExport07.ts b/tests/cases/fourslash/renameForDefaultExport07.ts
new file mode 100644
index 00000000000..9b1010580bf
--- /dev/null
+++ b/tests/cases/fourslash/renameForDefaultExport07.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts'/>
+
+////export default function /**/[|DefaultExportedFunction|]() {
+////    return DefaultExportedFunction
+////}
+/////**
+//// *  Commenting DefaultExportedFunction
+//// */
+////
+////var x: typeof DefaultExportedFunction;
+////
+////var y = DefaultExportedFunction();
+
+goTo.marker();
+verify.renameInfoSucceeded("DefaultExportedFunction", "DefaultExportedFunction");
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameForDefaultExport08.ts b/tests/cases/fourslash/renameForDefaultExport08.ts
new file mode 100644
index 00000000000..033b20516be
--- /dev/null
+++ b/tests/cases/fourslash/renameForDefaultExport08.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts'/>
+
+////export default function DefaultExportedFunction() {
+////    return /**/[|DefaultExportedFunction|]
+////}
+/////**
+//// *  Commenting DefaultExportedFunction
+//// */
+////
+////var x: typeof DefaultExportedFunction;
+////
+////var y = DefaultExportedFunction();
+
+goTo.marker();
+verify.renameInfoSucceeded("DefaultExportedFunction", "DefaultExportedFunction");
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameForDefaultExport09.ts b/tests/cases/fourslash/renameForDefaultExport09.ts
new file mode 100644
index 00000000000..568eb18a84e
--- /dev/null
+++ b/tests/cases/fourslash/renameForDefaultExport09.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts'/>
+
+////function /**/[|f|]() {
+////    return 100;
+////}
+////
+////export default f;
+////
+////var x: typeof f;
+////
+////var y = f();
+////
+/////**
+//// *  Commenting f
+//// */
+////namespace f {
+////    var local = 100;
+////}
+
+goTo.marker();
+verify.renameInfoSucceeded("f", "f");
\ No newline at end of file