diff --git a/html/browsers/windows/browsing-context-names/001-1.html b/html/browsers/windows/browsing-context-names/001-1.html
deleted file mode 100644
index d413c3019ff130..00000000000000
--- a/html/browsers/windows/browsing-context-names/001-1.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-001-1
-<script>
-if (window.opener !== null) {
-  window.opener.postMessage("FAIL", "*");
-}
-window.close();
-</script>
diff --git a/html/browsers/windows/browsing-context-names/001.html b/html/browsers/windows/browsing-context-names/001.html
deleted file mode 100644
index 2478cdc8fac104..00000000000000
--- a/html/browsers/windows/browsing-context-names/001.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!doctype html>
-<title>Link with target=_blank, rel=noreferrer</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id="log"></div>
-<a href="001-1.html" rel="noreferrer" target="_blank">Link</a>
-<script>
-var t = async_test();
-var a;
-t.step(function() {
-  a = document.getElementsByTagName("a")[0];
-  a.click();
-  //This is a bit hacky; if the test passes there isn't a link back to the parent
-  //window so we have to pass on a timeout. But opening the link could be slow in
-  //some cases, so there is some possibility of false passes
-  setTimeout(t.step_func(function() {
-               t.done();
-             }), 1000);
-});
-
-onmessage = t.step_func(function() {assert_unreached("Opened window had a reference to opener")});
-</script>
diff --git a/html/browsers/windows/browsing-context-names/002-1.html b/html/browsers/windows/browsing-context-names/002-1.html
deleted file mode 100644
index ca8a485de6132d..00000000000000
--- a/html/browsers/windows/browsing-context-names/002-1.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-002-1
-<script>
-if (window.opener !== null) {
-  window.opener.postMessage("PASS", "*");
-}
-window.close();
-</script>
diff --git a/html/browsers/windows/browsing-context-names/002.html b/html/browsers/windows/browsing-context-names/002.html
deleted file mode 100644
index 4a1df8e4d039ab..00000000000000
--- a/html/browsers/windows/browsing-context-names/002.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!doctype html>
-<title>Link with target=_blank, no rel</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id="log"></div>
-<a href="002-1.html" target="_blank">Link</a>
-<script>
-var a;
-async_test(function(t) {
-  a = document.getElementsByTagName("a")[0];
-  a.click();
-
-  // This is a bit hacky; if the test fails there isn't a link back to the parent
-  // window so we have to pass on a timeout. But opening the link could be slow in
-  // some cases, so there is some possibility of false fails
-  step_timeout(t.step_func(function() {
-                 assert_unreached("Failed to get callback from opened window");
-               }), 5000);
-
-  onmessage = t.step_func(function(e) {
-    assert_equals(e.data, "PASS");
-    t.done()
-  });
-});
-</script>
diff --git a/html/browsers/windows/browsing-context-names/browsing-context-choose-existing.html b/html/browsers/windows/browsing-context-names/browsing-context-choose-existing.html
deleted file mode 100644
index 2eaba22f6fa8fa..00000000000000
--- a/html/browsers/windows/browsing-context-names/browsing-context-choose-existing.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML Test: Choose browsing context - the given name is same as an existing browsing context's name</title>
-<link rel="author" title="Intel" href="http://www.intel.com/">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id="log"></div>
-<iframe src="existing.html" style="display:none"></iframe>
-<iframe name="existWin" style="display:none"></iframe>
-<script>
-
-var t = async_test("The browsing context must be chosen if the given name is same as its name");
-
-window.addEventListener("message", function (e) {
-  t.step(function() {
-    assert_equals(e.data.name, "existWin", "The browsing context name should be 'existWin'.");
-  });
-  t.done();
-}, false);
-
-frames[0].onload = t.step_func(function(e) {
-  frames[0].do_test();
-});
-
-</script>
diff --git a/html/browsers/windows/browsing-context-names/browsing-context-choose-self-1.html b/html/browsers/windows/browsing-context-names/browsing-context-choose-self-1.html
deleted file mode 100644
index 99d7fe7d3feb20..00000000000000
--- a/html/browsers/windows/browsing-context-names/browsing-context-choose-self-1.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML Test: Choose browsing context - the given name is '_self'</title>
-<link rel="author" title="Intel" href="http://www.intel.com/">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id="log"></div>
-<iframe src="self1.html" style="display:none"></iframe>
-<script>
-
-var t = async_test("The current browsing context must be chosen if the given name is '_self'");
-
-window.addEventListener("message", function (e) {
-  t.step(function () {
-    assert_equals(e.data.name, "selfWin1", "The browsing context name should be 'selfWin1'.");
-  });
-  t.done();
-}, false);
-
-</script>
diff --git a/html/browsers/windows/browsing-context-names/browsing-context-choose-self-2.html b/html/browsers/windows/browsing-context-names/browsing-context-choose-self-2.html
deleted file mode 100644
index e25a5b44240bdc..00000000000000
--- a/html/browsers/windows/browsing-context-names/browsing-context-choose-self-2.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML Test: Choose browsing context - the given name is empty string</title>
-<link rel="author" title="Intel" href="http://www.intel.com/">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id="log"></div>
-<iframe src="self2.html" style="display:none"></iframe>
-<script>
-
-var t = async_test("The current browsing context must be chosen if the given name is empty string");
-
-window.addEventListener("message", function (e) {
-  t.step(function () {
-    assert_equals(e.data.name, "selfWin2", "The browsing context name should be 'selfWin2'.");
-  });
-  t.done();
-}, false);
-
-</script>
diff --git a/html/browsers/windows/browsing-context-names/browsing-context-_blank.html b/html/browsers/windows/browsing-context-names/choose-_blank-001.html
similarity index 100%
rename from html/browsers/windows/browsing-context-names/browsing-context-_blank.html
rename to html/browsers/windows/browsing-context-names/choose-_blank-001.html
diff --git a/html/browsers/windows/browsing-context-names/choose-_blank-002.html b/html/browsers/windows/browsing-context-names/choose-_blank-002.html
new file mode 100644
index 00000000000000..aba9d52ba097f1
--- /dev/null
+++ b/html/browsers/windows/browsing-context-names/choose-_blank-002.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<title>Link with target=_blank, rel=noreferrer</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/PrefixedLocalStorage.js"></script>
+<div id="log"></div>
+<a href="resources/report-has-opener.html" rel="noreferrer" target="_blank">Link</a>
+<script>
+var prefixedStorage;
+setup (() => prefixedStorage = new PrefixedLocalStorageTest());
+
+async_test(t => {
+  t.add_cleanup(() => prefixedStorage.cleanup());
+  var a = document.getElementsByTagName('a')[0];
+  a.href = prefixedStorage.url(a.href);
+  prefixedStorage.onSet('hasOpener', t.step_func_done(e => {
+    assert_equals(e.newValue, 'false');
+  }));
+  a.click();
+}, 'Context for opened noreferrer link targeted to "_blank" should not have opener reference');
+</script>
diff --git a/html/browsers/windows/browsing-context-names/choose-_blank-003.html b/html/browsers/windows/browsing-context-names/choose-_blank-003.html
new file mode 100644
index 00000000000000..6912300ab2d969
--- /dev/null
+++ b/html/browsers/windows/browsing-context-names/choose-_blank-003.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<title>Link with target=_blank, no rel</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/PrefixedLocalStorage.js"></script>
+<div id="log"></div>
+<a href="resources/report-has-opener.html" target="_blank">Link</a>
+<script>
+var prefixedStorage;
+setup(() => prefixedStorage = new PrefixedLocalStorageTest());
+async_test(t => {
+  t.add_cleanup(() => prefixedStorage.cleanup());
+  prefixedStorage.onSet('hasOpener', t.step_func_done(e => {
+    assert_equals(e.newValue, 'true');
+  }));
+  var a = document.getElementsByTagName('a')[0];
+  a.href = prefixedStorage.url(a.href);
+  a.click();
+}, 'Context created by link targeting "_blank" should retain opener reference');
+</script>
diff --git a/html/browsers/windows/browsing-context-names/browsing-context-choose-parent-001.html b/html/browsers/windows/browsing-context-names/choose-_parent-001.html
similarity index 81%
rename from html/browsers/windows/browsing-context-names/browsing-context-choose-parent-001.html
rename to html/browsers/windows/browsing-context-names/choose-_parent-001.html
index e1495beb8b184d..35cbc101c7b3c7 100644
--- a/html/browsers/windows/browsing-context-names/browsing-context-choose-parent-001.html
+++ b/html/browsers/windows/browsing-context-names/choose-_parent-001.html
@@ -12,4 +12,4 @@
   }));
 }, 'The parent browsing context must be chosen if the given name is `_parent`');
 </script>
-<iframe id="embedded" src="resources/parent-iframe-1.html" name="parentWin" style="display:none"></iframe>
+<iframe id="embedded" src="resources/choose-_parent-001-iframe-1.html" name="parentWin" style="display:none"></iframe>
diff --git a/html/browsers/windows/browsing-context-names/browsing-context-choose-parent-002.html b/html/browsers/windows/browsing-context-names/choose-_parent-002.html
similarity index 87%
rename from html/browsers/windows/browsing-context-names/browsing-context-choose-parent-002.html
rename to html/browsers/windows/browsing-context-names/choose-_parent-002.html
index 9cdef8349f38c1..7b7d561030e5ad 100644
--- a/html/browsers/windows/browsing-context-names/browsing-context-choose-parent-002.html
+++ b/html/browsers/windows/browsing-context-names/choose-_parent-002.html
@@ -12,6 +12,6 @@
     assert_equals(e.data.name, 'iframeParent');
     assert_false(e.data.isTop, 'window.parent is not top');
   }));
-  topWindow = window.open('resources/parent-top.html', '_blank');
+  topWindow = window.open('resources/choose-_parent-002-window.html', '_blank');
 }, 'choosing _parent context: multiple nested contexts');
 </script>
diff --git a/html/browsers/windows/browsing-context-names/browsing-context-choose-parent-003.html b/html/browsers/windows/browsing-context-names/choose-_parent-003.html
similarity index 85%
rename from html/browsers/windows/browsing-context-names/browsing-context-choose-parent-003.html
rename to html/browsers/windows/browsing-context-names/choose-_parent-003.html
index f0a165e6844c7a..20dc9b0d2ac48d 100644
--- a/html/browsers/windows/browsing-context-names/browsing-context-choose-parent-003.html
+++ b/html/browsers/windows/browsing-context-names/choose-_parent-003.html
@@ -12,6 +12,6 @@
     assert_equals(e.data.name, 'parentTopReplace');
     assert_equals(e.data.isTop, true);
   }));
-  topWindow = window.open('resources/parent-top-replace.html', 'parentTopReplace');
+  topWindow = window.open('resources/choose-_parent-003-window.html', 'parentTopReplace');
 }, '_parent should reuse window.parent context');
 </script>
diff --git a/html/browsers/windows/browsing-context-names/browsing-context-choose-parent-004.html b/html/browsers/windows/browsing-context-names/choose-_parent-004.html
similarity index 90%
rename from html/browsers/windows/browsing-context-names/browsing-context-choose-parent-004.html
rename to html/browsers/windows/browsing-context-names/choose-_parent-004.html
index ca98f66d172380..ab2606092a10a6 100644
--- a/html/browsers/windows/browsing-context-names/browsing-context-choose-parent-004.html
+++ b/html/browsers/windows/browsing-context-names/choose-_parent-004.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
-<iframe src="resources/parent-iframe-insensitive-1.html" name="parentWin" style="display:none"></iframe>
+<iframe src="resources/choose-_parent-004-iframe-1.html" name="parentWin" style="display:none"></iframe>
 
 <script>
 async_test(t => {
diff --git a/html/browsers/windows/browsing-context-names/choose-_self-001.html b/html/browsers/windows/browsing-context-names/choose-_self-001.html
new file mode 100644
index 00000000000000..ed7666846d5c77
--- /dev/null
+++ b/html/browsers/windows/browsing-context-names/choose-_self-001.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML Test: Choose browsing context - the given name is '_self'</title>
+<link rel="author" title="Intel" href="http://www.intel.com/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<iframe src="resources/choose-_self-001-iframe.html" style="display:none"></iframe>
+<script>
+async_test(t => {
+  window.addEventListener('message', t.step_func_done(e => {
+    assert_equals(e.data.name, 'myownself');
+  }), false);
+}, 'The current browsing context must be chosen if the given name is "_self"');
+</script>
diff --git a/html/browsers/windows/browsing-context-names/browsing-context-default-name.html b/html/browsers/windows/browsing-context-names/choose-default-001.html
similarity index 84%
rename from html/browsers/windows/browsing-context-names/browsing-context-default-name.html
rename to html/browsers/windows/browsing-context-names/choose-default-001.html
index 470e244643cf46..c21159e0a618f3 100644
--- a/html/browsers/windows/browsing-context-names/browsing-context-default-name.html
+++ b/html/browsers/windows/browsing-context-names/choose-default-001.html
@@ -20,10 +20,4 @@
   assert_equals(win.name, "");
   win.close();
 }, "A browsing context which is opened by window.open() method with '_blank' parameter has empty-string default name");
-
-//This test must be run when the current browsing context's name is not set
-test(t => {
-  assert_equals(window.name, "");
-}, "A browsing context has an empty-string default name");
-
 </script>
diff --git a/html/browsers/windows/browsing-context-names/choose-default-002.html b/html/browsers/windows/browsing-context-names/choose-default-002.html
new file mode 100644
index 00000000000000..748ee689731843
--- /dev/null
+++ b/html/browsers/windows/browsing-context-names/choose-default-002.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML Test: Browsing context names - empty string</title>
+<link rel="author" title="Intel" href="http://www.intel.com/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+async_test(t => {
+  window.addEventListener('message', t.step_func_done(e => {
+    assert_equals(e.data.isTop, false);
+    assert_equals(e.data.name, 'hellothere', 'Empty-string browsing context should choose current context');
+  }), false);
+}, 'The current browsing context must be chosen if the given name is empty string');
+</script>
+<iframe name="hellothere" src="resources/choose-default-002-iframe.html"></iframe>
diff --git a/html/browsers/windows/browsing-context-names/choose-existing-001.html b/html/browsers/windows/browsing-context-names/choose-existing-001.html
new file mode 100644
index 00000000000000..fdf74b8a797bb2
--- /dev/null
+++ b/html/browsers/windows/browsing-context-names/choose-existing-001.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML Test: Choose browsing context - the given name is same as an existing browsing context's name</title>
+<link rel="author" title="Intel" href="http://www.intel.com/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<iframe src="resources/choose-existing-001-iframe.html" style="display:none"></iframe>
+<iframe name="iExist" style="display:none"></iframe>
+<script>
+async_test(t => {
+  window.addEventListener('message', t.step_func_done(e => {
+    assert_equals(e.data.name, 'iExist');
+  }), false);
+
+}, 'An existing browsing context must be chosen if the given name is the same as its name');
+</script>
diff --git a/html/browsers/windows/browsing-context-names/resources/parent-iframe-1.html b/html/browsers/windows/browsing-context-names/resources/choose-_parent-001-iframe-1.html
similarity index 77%
rename from html/browsers/windows/browsing-context-names/resources/parent-iframe-1.html
rename to html/browsers/windows/browsing-context-names/resources/choose-_parent-001-iframe-1.html
index 3d7accffd7806e..04dd74f1a53bda 100644
--- a/html/browsers/windows/browsing-context-names/resources/parent-iframe-1.html
+++ b/html/browsers/windows/browsing-context-names/resources/choose-_parent-001-iframe-1.html
@@ -2,4 +2,4 @@
 <meta charset="utf-8">
 <title>HTML Test: browsing context name - parent</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<iframe src="parent-iframe-2.html"></iframe>
+<iframe src="open-in-_parent.html"></iframe>
diff --git a/html/browsers/windows/browsing-context-names/resources/parent-top-nested.html b/html/browsers/windows/browsing-context-names/resources/choose-_parent-002-iframe.html
similarity index 63%
rename from html/browsers/windows/browsing-context-names/resources/parent-top-nested.html
rename to html/browsers/windows/browsing-context-names/resources/choose-_parent-002-iframe.html
index ffe35113233935..52da8986b0ad35 100644
--- a/html/browsers/windows/browsing-context-names/resources/parent-top-nested.html
+++ b/html/browsers/windows/browsing-context-names/resources/choose-_parent-002-iframe.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>HTML Test: browsing context name - parent: nested context</title>
-<iframe name="iframeChild" src="parent-iframe-2.html"></iframe>
+<iframe name="iframeChild" src="open-in-_parent.html"></iframe>
diff --git a/html/browsers/windows/browsing-context-names/resources/parent-top.html b/html/browsers/windows/browsing-context-names/resources/choose-_parent-002-window.html
similarity index 80%
rename from html/browsers/windows/browsing-context-names/resources/parent-top.html
rename to html/browsers/windows/browsing-context-names/resources/choose-_parent-002-window.html
index 6ad72f969be9cd..558193742f6836 100644
--- a/html/browsers/windows/browsing-context-names/resources/parent-top.html
+++ b/html/browsers/windows/browsing-context-names/resources/choose-_parent-002-window.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>HTML Test: browsing context name - parent: top-level context</title>
-<iframe name="iframeParent" src="parent-top-nested.html"></iframe>
+<iframe name="iframeParent" src="choose-_parent-002-iframe.html"></iframe>
 <script>
 // Relay a message from child context to opener context
 window.addEventListener('message', e => {
diff --git a/html/browsers/windows/browsing-context-names/resources/parent-iframe-3.html b/html/browsers/windows/browsing-context-names/resources/choose-_parent-003-iframe.html
similarity index 100%
rename from html/browsers/windows/browsing-context-names/resources/parent-iframe-3.html
rename to html/browsers/windows/browsing-context-names/resources/choose-_parent-003-iframe.html
diff --git a/html/browsers/windows/browsing-context-names/resources/parent-top-replace.html b/html/browsers/windows/browsing-context-names/resources/choose-_parent-003-window.html
similarity index 63%
rename from html/browsers/windows/browsing-context-names/resources/parent-top-replace.html
rename to html/browsers/windows/browsing-context-names/resources/choose-_parent-003-window.html
index 9b334c326693c0..bd1802aed6f8a1 100644
--- a/html/browsers/windows/browsing-context-names/resources/parent-top-replace.html
+++ b/html/browsers/windows/browsing-context-names/resources/choose-_parent-003-window.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>HTML Test: browsing context name - parent: top-level context (gets replaced)</title>
-<iframe name="iframeOpener" src="parent-iframe-3.html"></iframe>
+<iframe name="iframeOpener" src="choose-_parent-003-iframe.html"></iframe>
diff --git a/html/browsers/windows/browsing-context-names/resources/parent-iframe-insensitive-1.html b/html/browsers/windows/browsing-context-names/resources/choose-_parent-004-iframe-1.html
similarity index 62%
rename from html/browsers/windows/browsing-context-names/resources/parent-iframe-insensitive-1.html
rename to html/browsers/windows/browsing-context-names/resources/choose-_parent-004-iframe-1.html
index 8ddbf44a3b5e40..faa8190523c66f 100644
--- a/html/browsers/windows/browsing-context-names/resources/parent-iframe-insensitive-1.html
+++ b/html/browsers/windows/browsing-context-names/resources/choose-_parent-004-iframe-1.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>HTML Test: browsing context name - parent</title>
-<iframe src="parent-iframe-insensitive-2.html"></iframe>
+<iframe src="choose-_parent-004-iframe-2.html"></iframe>
diff --git a/html/browsers/windows/browsing-context-names/resources/parent-iframe-insensitive-2.html b/html/browsers/windows/browsing-context-names/resources/choose-_parent-004-iframe-2.html
similarity index 100%
rename from html/browsers/windows/browsing-context-names/resources/parent-iframe-insensitive-2.html
rename to html/browsers/windows/browsing-context-names/resources/choose-_parent-004-iframe-2.html
diff --git a/html/browsers/windows/browsing-context-names/self2.html b/html/browsers/windows/browsing-context-names/resources/choose-_self-001-iframe.html
similarity index 68%
rename from html/browsers/windows/browsing-context-names/self2.html
rename to html/browsers/windows/browsing-context-names/resources/choose-_self-001-iframe.html
index b3b4f59b535974..0ad79d6e16404a 100644
--- a/html/browsers/windows/browsing-context-names/self2.html
+++ b/html/browsers/windows/browsing-context-names/resources/choose-_self-001-iframe.html
@@ -3,9 +3,7 @@
 <title>HTML Test: browsing context name - self</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
 <script>
-
-window.name = "selfWin2";
-var win = window.open("resources/post-to-top.html", "");
+window.name = 'myownself';
+var win = window.open('post-to-top.html', '_self');
 win.close();
-
 </script>
diff --git a/html/browsers/windows/browsing-context-names/resources/choose-default-002-iframe.html b/html/browsers/windows/browsing-context-names/resources/choose-default-002-iframe.html
new file mode 100644
index 00000000000000..567e4ea3103fb7
--- /dev/null
+++ b/html/browsers/windows/browsing-context-names/resources/choose-default-002-iframe.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<meta charset="utf-8">
+<title>HTML Test: browsing context name - Empty string</title>
+<link rel="author" title="Intel" href="http://www.intel.com/">
+<body onload="followLink()">
+</body>
+<script>
+function followLink() {
+  var a = document.createElement('a');
+  a.href = 'post-to-top.html';
+  a.target = ''; // Target is empty string
+  document.body.appendChild(a);
+  a.click();
+}
+</script>
+</html>
diff --git a/html/browsers/windows/browsing-context-names/existing.html b/html/browsers/windows/browsing-context-names/resources/choose-existing-001-iframe.html
similarity index 65%
rename from html/browsers/windows/browsing-context-names/existing.html
rename to html/browsers/windows/browsing-context-names/resources/choose-existing-001-iframe.html
index 6023319cebfd31..cb0b554854fe0b 100644
--- a/html/browsers/windows/browsing-context-names/existing.html
+++ b/html/browsers/windows/browsing-context-names/resources/choose-existing-001-iframe.html
@@ -3,9 +3,5 @@
 <title>This is a test page</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
 <script>
-
-function do_test() {
-  window.open("resources/post-to-top.html", "existWin");
-}
-
+window.open("post-to-top.html", "iExist");
 </script>
diff --git a/html/browsers/windows/browsing-context-names/resources/parent-iframe-2.html b/html/browsers/windows/browsing-context-names/resources/open-in-_parent.html
similarity index 100%
rename from html/browsers/windows/browsing-context-names/resources/parent-iframe-2.html
rename to html/browsers/windows/browsing-context-names/resources/open-in-_parent.html
diff --git a/html/browsers/windows/browsing-context-names/resources/report-has-opener.html b/html/browsers/windows/browsing-context-names/resources/report-has-opener.html
new file mode 100644
index 00000000000000..37d8cedc6da479
--- /dev/null
+++ b/html/browsers/windows/browsing-context-names/resources/report-has-opener.html
@@ -0,0 +1,8 @@
+<!doctype html>
+<script src="/common/PrefixedLocalStorage.js"></script>
+<script>
+var prefixedStorage = new PrefixedLocalStorageResource({
+  close_on_cleanup: true
+});
+prefixedStorage.setItem('hasOpener', window.opener !== null);
+</script>
diff --git a/html/browsers/windows/browsing-context-names/self1.html b/html/browsers/windows/browsing-context-names/self1.html
deleted file mode 100644
index d72df6f86420cb..00000000000000
--- a/html/browsers/windows/browsing-context-names/self1.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML Test: browsing context name - self</title>
-<link rel="author" title="Intel" href="http://www.intel.com/">
-<script>
-
-window.name = "selfWin1";
-var win = window.open("resources/post-to-top.html", "_self");
-win.close();
-
-</script>
