Root -> UI in tests (#8908)

56 files changed, 187 insertions, 187 deletions

diff --git a/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java b/tests/server-side/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
index aa4fa22d06..9b4d9492a2 100644
--- a/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java
+++ b/tests/server-side/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
@@ -16,12 +16,12 @@ import com.vaadin.terminal.DeploymentConfiguration;
 import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.ui.UI;
 
-public class CustomRootClassLoader extends TestCase {
+public class CustomUIClassLoader extends TestCase {
 
     /**
      * Stub root
      */
-    public static class MyRoot extends UI {
+    public static class MyUI extends UI {
         @Override
         protected void init(WrappedRequest request) {
             // Nothing to see here
@@ -57,7 +57,7 @@ public class CustomRootClassLoader extends TestCase {
                 createConfigurationMock(), null));
 
         UI uI = application.getUIForRequest(createRequestMock(null));
-        assertTrue(uI instanceof MyRoot);
+        assertTrue(uI instanceof MyUI);
     }
 
     private static DeploymentConfiguration createConfigurationMock() {
@@ -103,9 +103,9 @@ public class CustomRootClassLoader extends TestCase {
 
         UI uI = application
                 .getUIForRequest(createRequestMock(loggingClassLoader));
-        assertTrue(uI instanceof MyRoot);
+        assertTrue(uI instanceof MyUI);
         assertEquals(1, loggingClassLoader.requestedClasses.size());
-        assertEquals(MyRoot.class.getName(),
+        assertEquals(MyUI.class.getName(),
                 loggingClassLoader.requestedClasses.get(0));
 
     }
@@ -119,7 +119,7 @@ public class CustomRootClassLoader extends TestCase {
             @Override
             public String getProperty(String name) {
                 if (name.equals(UI_PARAMETER)) {
-                    return MyRoot.class.getName();
+                    return MyUI.class.getName();
                 } else {
                     return super.getProperty(name);
                 }
diff --git a/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java b/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java
index e2db224f08..2a0a733140 100644
--- a/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java
+++ b/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java
@@ -100,12 +100,12 @@ public class AttachDetachWindow {
         }
     }
 
-    private class TestRoot extends UI implements TestContainer {
+    private class TestUI extends UI implements TestContainer {
         boolean rootAttachCalled = false;
         boolean rootDetachCalled = false;
         private TestContent testContent = new TestContent();;
 
-        public TestRoot() {
+        public TestUI() {
             setContent(testContent);
         }
 
@@ -142,7 +142,7 @@ public class AttachDetachWindow {
         }
     }
 
-    TestRoot main = new TestRoot();
+    TestUI main = new TestUI();
     TestWindow sub = new TestWindow();
 
     @Test
diff --git a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java b/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java
index f48ca28dbf..1e6509ab85 100644
--- a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java
+++ b/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 
 public class RefreshStatePreserve extends AbstractTestApplication {
-    public static class RefreshStateRoot extends UI {
+    public static class RefreshStateUI extends UI {
         @Override
         public void init(WrappedRequest request) {
             getContent().addComponent(
@@ -28,7 +28,7 @@ public class RefreshStatePreserve extends AbstractTestApplication {
             public Class<? extends UI> getUIClass(Application application,
                     WrappedRequest request)
                     throws UIRequiresMoreInformationException {
-                return RefreshStateRoot.class;
+                return RefreshStateUI.class;
             }
         });
     }
diff --git a/tests/testbench/com/vaadin/tests/components/AbstractTestRoot.java b/tests/testbench/com/vaadin/tests/components/AbstractTestUI.java
index cf4bfac426..7dd742952f 100644
--- a/tests/testbench/com/vaadin/tests/components/AbstractTestRoot.java
+++ b/tests/testbench/com/vaadin/tests/components/AbstractTestUI.java
@@ -11,7 +11,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
 
-public abstract class AbstractTestRoot extends UI {
+public abstract class AbstractTestUI extends UI {
 
     @Override
     public void init(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java b/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
index 100c30cdc9..34655be91d 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
+++ b/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
@@ -17,12 +17,12 @@ package com.vaadin.tests.components.abstractcomponent;
 
 import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.tests.VaadinClasses;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.GridLayout;
 
-public class AllComponentTooltipTest extends AbstractTestRoot {
+public class AllComponentTooltipTest extends AbstractTestUI {
 
     @Override
     protected void setup(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java
index 184f8a9261..a73c88cf73 100644
--- a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java
+++ b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java
@@ -16,11 +16,11 @@
 package com.vaadin.tests.components.formlayout;
 
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.PopupDateField;
 
-public class FormLayoutErrorHover extends AbstractTestRoot {
+public class FormLayoutErrorHover extends AbstractTestUI {
 
     @Override
     protected void setup(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
index 0b732e5948..a0df85a5b3 100644
--- a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
+++ b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
@@ -29,13 +29,13 @@ import com.vaadin.shared.ui.JavaScriptComponentState;
 import com.vaadin.terminal.ClassResource;
 import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.terminal.gwt.server.ResourceReference;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.AbstractJavaScriptComponent;
 import com.vaadin.ui.HasComponents;
 import com.vaadin.ui.JavaScriptFunction;
 
-public class BasicJavaScriptComponent extends AbstractTestRoot {
+public class BasicJavaScriptComponent extends AbstractTestUI {
 
     public interface TestRpc extends ServerRpc, ClientRpc {
         public void sendRpc(String message);
diff --git a/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java b/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java
index b1cf2957be..18d3b1e8ed 100644
--- a/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java
+++ b/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.label;
 
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbstractLayout;
 import com.vaadin.ui.Accordion;
 import com.vaadin.ui.GridLayout;
@@ -10,7 +10,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
 
-public class MarginsInLabels extends AbstractTestRoot {
+public class MarginsInLabels extends AbstractTestUI {
 
     @Override
     protected void setup(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormRootInLoginHandler.java b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java
index b9076a152d..b3ebb02751 100755
--- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormRootInLoginHandler.java
+++ b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.LoginForm.LoginEvent;
 import com.vaadin.ui.LoginForm.LoginListener;

 import com.vaadin.ui.UI;

 

-public class LoginFormRootInLoginHandler extends TestBase {

+public class LoginFormUIInLoginHandler extends TestBase {

 

     @Override

     protected void setup() {

@@ -34,7 +34,7 @@ public class LoginFormRootInLoginHandler extends TestBase {
             }

         });

         addComponent(lf);

-        getLayout().getUI().setData("This root");

+        getLayout().getUI().setData("This UI");

     }

 

     @Override

diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
index 08793e9a9c..5aaaaec6a6 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
+++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
@@ -8,7 +8,7 @@ import java.util.List;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.util.TestUtils;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Alignment;
@@ -20,7 +20,7 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.NativeSelect;
 import com.vaadin.ui.VerticalLayout;
 
-public class OrderedLayoutCases extends AbstractTestRoot {
+public class OrderedLayoutCases extends AbstractTestUI {
     private static final String[] dimensionValues = { "-1px", "5px", "350px",
             "800px", "100%", "50%" };
 
diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java b/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java
index f822af0779..a4067c3dcb 100644
--- a/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java
+++ b/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java
@@ -16,7 +16,7 @@
 package com.vaadin.tests.components.panel;
 
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
@@ -25,7 +25,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 
-public class PanelChangeContents extends AbstractTestRoot implements
+public class PanelChangeContents extends AbstractTestUI implements
         ClickListener {
 
     VerticalLayout stats = new VerticalLayout();
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java b/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java
index b450bfe811..99bfc7acfb 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java
+++ b/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java
@@ -16,13 +16,13 @@
 package com.vaadin.tests.components.popupview;
 
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.PopupView;
 
-public class ReopenPopupView extends AbstractTestRoot {
+public class ReopenPopupView extends AbstractTestUI {
     private final Log log = new Log(5);
 
     @Override
diff --git a/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.html b/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.html
deleted file mode 100644
index 5448a24816..0000000000
--- a/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="" />
-<title>New Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/run/com.vaadin.tests.components.root.LazyInitRoots/normalPath?restartApplication#normalFragment</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsrootLazyInitRoots::/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
-	<td>NormalRoot<br />pathInfo: /normalPath<br />parameters: [restartApplication]<br />uri fragment: normalFragment</td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/run/com.vaadin.tests.components.root.LazyInitRoots/lazyCreatePath?lazyCreate#lazyCreateFragment</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsrootLazyInitRoots::/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
-	<td>LazyCreateRoot<br />pathInfo: /lazyCreatePath<br />parameters: [lazyCreate]<br />uri fragment: lazyCreateFragment</td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/run/com.vaadin.tests.components.root.LazyInitRoots/eagerPath/?eagerInit#eagerFragment</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsrootLazyInitRoots::/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
-	<td>EagerInitRoot<br />pathInfo: /eagerPath/<br />parameters: [eagerInit]<br />uri fragment: null</td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableInTabsheet.java b/tests/testbench/com/vaadin/tests/components/table/TableInTabsheet.java
index 9a94a203f1..f54f685a1d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableInTabsheet.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableInTabsheet.java
@@ -4,7 +4,7 @@ import java.net.MalformedURLException;
 
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbsoluteLayout;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
@@ -14,7 +14,7 @@ import com.vaadin.ui.Table.Align;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.Reindeer;
 
-public class TableInTabsheet extends AbstractTestRoot {
+public class TableInTabsheet extends AbstractTestUI {
 
     @Override
     protected void setup(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/components/ui/LazyInitUIs.html b/tests/testbench/com/vaadin/tests/components/ui/LazyInitUIs.html
new file mode 100644
index 0000000000..d7e1544026
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/ui/LazyInitUIs.html
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.ui.LazyInitUIs/normalPath?restartApplication#normalFragment</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsuilazyInitUIs::/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>NormalUI<br />pathInfo: /normalPath<br />parameters: [restartApplication]<br />uri fragment: normalFragment</td>
+</tr>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.ui.LazyInitUIs/lazyCreatePath?lazyCreate#lazyCreateFragment</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsuilazyInitUIs::/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>LazyCreateUI<br />pathInfo: /lazyCreatePath<br />parameters: [lazyCreate]<br />uri fragment: lazyCreateFragment</td>
+</tr>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.ui.LazyInitUIs/eagerPath/?eagerInit#eagerFragment</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsuiLazyInitUIs::/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>EagerInitUI<br />pathInfo: /eagerPath/<br />parameters: [eagerInit]<br />uri fragment: null</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java b/tests/testbench/com/vaadin/tests/components/ui/LazyInitUIs.java
index 89b43d4bdf..75a98ba14e 100644
--- a/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java
+++ b/tests/testbench/com/vaadin/tests/components/ui/LazyInitUIs.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.root;
+package com.vaadin.tests.components.ui;
 
 import com.vaadin.UIRequiresMoreInformationException;
 import com.vaadin.annotations.EagerInit;
@@ -11,13 +11,13 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.UI;
 
-public class LazyInitRoots extends AbstractTestApplication {
+public class LazyInitUIs extends AbstractTestApplication {
 
     @EagerInit
-    private static class EagerInitRoot extends UI {
+    private static class EagerInitUI extends UI {
         @Override
         public void init(WrappedRequest request) {
-            addComponent(getRequestInfo("EagerInitRoot", request));
+            addComponent(getRequestInfo("EagerInitUI", request));
         }
     }
 
@@ -34,28 +34,28 @@ public class LazyInitRoots extends AbstractTestApplication {
                 UI uI = new UI() {
                     @Override
                     protected void init(WrappedRequest request) {
-                        addComponent(getRequestInfo("LazyCreateRoot", request));
+                        addComponent(getRequestInfo("LazyCreateUI", request));
                     }
                 };
                 return uI;
             }
         } else if (request.getParameter("eagerInit") != null) {
             // UI inited on first request
-            return new EagerInitRoot();
+            return new EagerInitUI();
         } else {
-            // The standard root
+            // The standard UI
             UI uI = new UI() {
                 @Override
                 protected void init(WrappedRequest request) {
-                    addComponent(getRequestInfo("NormalRoot", request));
+                    addComponent(getRequestInfo("NormalUI", request));
 
-                    Link lazyCreateLink = new Link("Open lazyCreate root",
+                    Link lazyCreateLink = new Link("Open lazyCreate UI",
                             new ExternalResource(getURL()
                                     + "?lazyCreate#lazyCreate"));
                     lazyCreateLink.setTargetName("_blank");
                     addComponent(lazyCreateLink);
 
-                    Link lazyInitLink = new Link("Open eagerInit root",
+                    Link lazyInitLink = new Link("Open eagerInit UI",
                             new ExternalResource(getURL()
                                     + "?eagerInit#eagerInit"));
                     lazyInitLink.setTargetName("_blank");
@@ -78,7 +78,7 @@ public class LazyInitRoots extends AbstractTestApplication {
 
     @Override
     protected String getTestDescription() {
-        return "BrowserDetails should be available in Application.getRoot if RootRequiresMoreInformation has been thrown and in UI.init if the root has the @RootInitRequiresBrowserDetals annotation";
+        return "BrowserDetails should be available in Application.getUI if UIRequiresMoreInformation has been thrown and in UI.init if the UI has the @UIInitRequiresBrowserDetals annotation";
     }
 
     @Override
diff --git a/tests/testbench/com/vaadin/tests/components/root/TestRootTheme.html b/tests/testbench/com/vaadin/tests/components/ui/TestUITheme.html
index 7d0f638325..ed2c0ec971 100644
--- a/tests/testbench/com/vaadin/tests/components/root/TestRootTheme.html
+++ b/tests/testbench/com/vaadin/tests/components/ui/TestUITheme.html
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/run/com.vaadin.tests.components.root.TestRootTheme?restartApplication</td>
+	<td>/run/com.vaadin.tests.components.ui.TestUITheme?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/tests/testbench/com/vaadin/tests/components/root/TestRootTheme.java b/tests/testbench/com/vaadin/tests/components/ui/TestUITheme.java
index 7a734e8497..39cc598094 100644
--- a/tests/testbench/com/vaadin/tests/components/root/TestRootTheme.java
+++ b/tests/testbench/com/vaadin/tests/components/ui/TestUITheme.java
@@ -1,12 +1,12 @@
-package com.vaadin.tests.components.root;
+package com.vaadin.tests.components.ui;
 
 import com.vaadin.annotations.Theme;
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Label;
 
 @Theme("tests-tickets")
-public class TestRootTheme extends AbstractTestRoot {
+public class TestUITheme extends AbstractTestUI {
 
     @Override
     protected void setup(WrappedRequest request) {
@@ -17,7 +17,7 @@ public class TestRootTheme extends AbstractTestRoot {
 
     @Override
     public String getTestDescription() {
-        return "UI with @RootTheme(\"tests-tickets\")";
+        return "UI with @Theme(\"tests-tickets\")";
     }
 
     @Override
diff --git a/tests/testbench/com/vaadin/tests/components/root/TestRootWidgetset.html b/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset.html
index c91d742581..2f0858b4c7 100644
--- a/tests/testbench/com/vaadin/tests/components/root/TestRootWidgetset.html
+++ b/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset.html
@@ -13,22 +13,22 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/run/com.vaadin.tests.components.root.TestRootWidgetset</td>
+	<td>/run/com.vaadin.tests.components.ui.TestUIWidgetset</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsrootTestRootWidgetset::/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[0]</td>
+	<td>vaadin=runcomvaadintestscomponentsuiTestUIWidgetset::/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[0]</td>
 	<td>This component is available in TestingWidgetset, but not in DefaultWidgetset</td>
 </tr>
 <tr>
 	<td>open</td>
-	<td>/run/com.vaadin.tests.components.root.TestRootWidgetset2</td>
+	<td>/run/com.vaadin.tests.components.ui.TestUIWidgetset2</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsrootTestRootWidgetset2::/VVerticalLayout[0]/VVerticalLayout[0]/VUnknownComponent[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=runcomvaadintestscomponentsuiTestUIWidgetset2::/VVerticalLayout[0]/VVerticalLayout[0]/VUnknownComponent[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>Widgetset does not contain implementation for com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent. Check its component connector's @Connect mapping, widgetsets GWT module description file and re-compile your widgetset. In case you have downloaded a vaadin add-on package, you might want to refer to add-on instructions.</td>
 </tr>
 </tbody></table>
diff --git a/tests/testbench/com/vaadin/tests/components/root/TestRootWidgetset.java b/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset.java
index b92815eeed..f26e94f243 100644
--- a/tests/testbench/com/vaadin/tests/components/root/TestRootWidgetset.java
+++ b/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset.java
@@ -1,12 +1,12 @@
-package com.vaadin.tests.components.root;
+package com.vaadin.tests.components.ui;
 
 import com.vaadin.annotations.Widgetset;
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent;
 
 @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet")
-public class TestRootWidgetset extends AbstractTestRoot {
+public class TestUIWidgetset extends AbstractTestUI {
 
     @Override
     protected void setup(WrappedRequest request) {
@@ -15,7 +15,7 @@ public class TestRootWidgetset extends AbstractTestRoot {
 
     @Override
     public String getTestDescription() {
-        return "This contents if this root should work as the component is present in TestingWidgetSet";
+        return "This contents if this UI should work as the component is present in TestingWidgetSet";
     }
 
     @Override
diff --git a/tests/testbench/com/vaadin/tests/components/root/TestRootWidgetset2.java b/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset2.java
index d3be29215e..84c0780240 100644
--- a/tests/testbench/com/vaadin/tests/components/root/TestRootWidgetset2.java
+++ b/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset2.java
@@ -1,10 +1,10 @@
-package com.vaadin.tests.components.root;
+package com.vaadin.tests.components.ui;
 
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent;
 
-public class TestRootWidgetset2 extends AbstractTestRoot {
+public class TestUIWidgetset2 extends AbstractTestUI {
 
     @Override
     protected void setup(WrappedRequest request) {
@@ -13,7 +13,7 @@ public class TestRootWidgetset2 extends AbstractTestRoot {
 
     @Override
     public String getTestDescription() {
-        return "This contents if this root should not work as the component is not present in DefaultWidgetSet";
+        return "This contents if this UI should not work as the component is not present in DefaultWidgetSet";
     }
 
     @Override
diff --git a/tests/testbench/com/vaadin/tests/components/root/RootInitException.java b/tests/testbench/com/vaadin/tests/components/ui/UIInitException.java
index b4cfa2a28d..29de6f6ac3 100644
--- a/tests/testbench/com/vaadin/tests/components/root/RootInitException.java
+++ b/tests/testbench/com/vaadin/tests/components/ui/UIInitException.java
@@ -1,9 +1,9 @@
-package com.vaadin.tests.components.root;
+package com.vaadin.tests.components.ui;
 
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 
-public class RootInitException extends AbstractTestRoot {
+public class UIInitException extends AbstractTestUI {
 
     @Override
     protected void setup(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/components/root/RootInitTest.java b/tests/testbench/com/vaadin/tests/components/ui/UIInitTest.java
index 16fecc62d2..6efe1d1b28 100644
--- a/tests/testbench/com/vaadin/tests/components/root/RootInitTest.java
+++ b/tests/testbench/com/vaadin/tests/components/ui/UIInitTest.java
@@ -2,22 +2,22 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.tests.components.root;
+package com.vaadin.tests.components.ui;
 
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Label;
 
-public class RootInitTest extends AbstractTestRoot {
+public class UIInitTest extends AbstractTestUI {
 
     @Override
     protected void setup(WrappedRequest request) {
-        addComponent(new Label("Hello root"));
+        addComponent(new Label("Hello UI"));
     }
 
     @Override
     public String getTestDescription() {
-        return "Testing basic root creation";
+        return "Testing basic UI creation";
     }
 
     @Override
diff --git a/tests/testbench/com/vaadin/tests/components/root/RootsInMultipleTabs.html b/tests/testbench/com/vaadin/tests/components/ui/UIsInMultipleTabs.html
index c9b83fdc4e..08561588c4 100644
--- a/tests/testbench/com/vaadin/tests/components/root/RootsInMultipleTabs.html
+++ b/tests/testbench/com/vaadin/tests/components/ui/UIsInMultipleTabs.html
@@ -13,33 +13,33 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/run/com.vaadin.tests.components.root.RootsInMultipleTabs?restartApplication</td>
+	<td>/run/com.vaadin.tests.components.ui.UIsInMultipleTabs?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsrootRootsInMultipleTabs::/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
-	<td>This is root number 1</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUIsInMultipleTabs::/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>This is UI number 1</td>
 </tr>
 <tr>
 	<td>open</td>
-	<td>/run/com.vaadin.tests.components.root.RootsInMultipleTabs</td>
+	<td>/run/com.vaadin.tests.components.ui.UIsInMultipleTabs</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsrootRootsInMultipleTabs::/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
-	<td>This is root number 2</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUIsInMultipleTabs::/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>This is UI number 2</td>
 </tr>
 <tr>
 	<td>open</td>
-	<td>/run/com.vaadin.tests.components.root.RootsInMultipleTabs?restartApplication</td>
+	<td>/run/com.vaadin.tests.components.ui.UIsInMultipleTabs?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsrootRootsInMultipleTabs::/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
-	<td>This is root number 1</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUIsInMultipleTabs::/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>This is UI number 1</td>
 </tr>
 
 </tbody></table>
diff --git a/tests/testbench/com/vaadin/tests/components/root/RootsInMultipleTabs.java b/tests/testbench/com/vaadin/tests/components/ui/UIsInMultipleTabs.java
index 97506f7ad6..8dd303a8e1 100644
--- a/tests/testbench/com/vaadin/tests/components/root/RootsInMultipleTabs.java
+++ b/tests/testbench/com/vaadin/tests/components/ui/UIsInMultipleTabs.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.root;
+package com.vaadin.tests.components.ui;
 
 import com.vaadin.Application;
 import com.vaadin.UIRequiresMoreInformationException;
@@ -8,27 +8,27 @@ import com.vaadin.tests.components.AbstractTestApplication;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 
-public class RootsInMultipleTabs extends AbstractTestApplication {
-    private int numberOfRootsOpened;
+public class UIsInMultipleTabs extends AbstractTestApplication {
+    private int numberOfUIsOpened;
 
-    public static class TabRoot extends UI {
+    public static class TabUI extends UI {
         @Override
         protected void init(WrappedRequest request) {
-            RootsInMultipleTabs application = (RootsInMultipleTabs) getApplication();
-            String message = "This is root number "
-                    + ++application.numberOfRootsOpened;
+            UIsInMultipleTabs application = (UIsInMultipleTabs) getApplication();
+            String message = "This is UI number "
+                    + ++application.numberOfUIsOpened;
 
             addComponent(new Label(message));
         }
     }
 
-    public RootsInMultipleTabs() {
+    public UIsInMultipleTabs() {
         addUIProvider(new AbstractUIProvider() {
             @Override
             public Class<? extends UI> getUIClass(Application application,
                     WrappedRequest request)
                     throws UIRequiresMoreInformationException {
-                return TabRoot.class;
+                return TabUI.class;
             }
         });
     }
diff --git a/tests/testbench/com/vaadin/tests/components/root/UriFragmentTest.html b/tests/testbench/com/vaadin/tests/components/ui/UriFragmentTest.html
index d4704fea65..bcb9f52afe 100644
--- a/tests/testbench/com/vaadin/tests/components/root/UriFragmentTest.html
+++ b/tests/testbench/com/vaadin/tests/components/ui/UriFragmentTest.html
@@ -13,22 +13,22 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/run/com.vaadin.tests.components.root.UriFragmentTest?restartApplication#urifragment</td>
+	<td>/run/com.vaadin.tests.components.ui.UriFragmentTest?restartApplication#urifragment</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsrootUriFragmentTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUriFragmentTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
 	<td>Current URI fragment: urifragment</td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>vaadin=runcomvaadintestscomponentsrootUriFragmentTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUriFragmentTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsrootUriFragmentTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUriFragmentTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
 	<td>Current URI fragment: test</td>
 </tr>
 <tr>
@@ -48,7 +48,7 @@
 </tr>
 <tr>
 	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsrootUriFragmentTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUriFragmentTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
 	<td>Current URI fragment: urifragment</td>
 </tr>
 <tr>
@@ -68,7 +68,7 @@
 </tr>
 <tr>
 	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsrootUriFragmentTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUriFragmentTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td>
 	<td>Current URI fragment: test</td>
 </tr>
 
diff --git a/tests/testbench/com/vaadin/tests/components/root/UriFragmentTest.java b/tests/testbench/com/vaadin/tests/components/ui/UriFragmentTest.java
index d34c7718ce..d2167e67c7 100644
--- a/tests/testbench/com/vaadin/tests/components/root/UriFragmentTest.java
+++ b/tests/testbench/com/vaadin/tests/components/ui/UriFragmentTest.java
@@ -1,14 +1,14 @@
-package com.vaadin.tests.components.root;
+package com.vaadin.tests.components.ui;
 
 import com.vaadin.terminal.Page;
 import com.vaadin.terminal.Page.FragmentChangedEvent;
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
 
-public class UriFragmentTest extends AbstractTestRoot {
+public class UriFragmentTest extends AbstractTestUI {
 
     private final Label fragmentLabel = new Label();
 
diff --git a/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java b/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java
index 59cd35c2cb..4d2f118ec7 100644
--- a/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java
+++ b/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components.window;
 
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
@@ -9,7 +9,7 @@ import com.vaadin.ui.Layout;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
 
-public class RepaintWindowContents extends AbstractTestRoot {
+public class RepaintWindowContents extends AbstractTestUI {
     private static final long serialVersionUID = 1L;
 
     @SuppressWarnings("serial")
diff --git a/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java b/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java
index 56be00b923..a77a1f7703 100644
--- a/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java
+++ b/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java
@@ -17,11 +17,11 @@
 package com.vaadin.tests.components.window;
 
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.Window;
 
-public class TooltipInWindow extends AbstractTestRoot {
+public class TooltipInWindow extends AbstractTestUI {
 
     @Override
     protected void setup(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.java b/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.java
index e774ee0286..daa2e78353 100644
--- a/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.java
+++ b/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.java
@@ -18,14 +18,14 @@ package com.vaadin.tests.extensions;
 
 import com.vaadin.annotations.Widgetset;
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Label;
 
 @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet")
-public class BasicExtensionTest extends AbstractTestRoot {
+public class BasicExtensionTest extends AbstractTestUI {
 
     @Override
     protected void setup(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java
index b389b77e97..e4646572db 100644
--- a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java
+++ b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java
@@ -17,12 +17,12 @@ package com.vaadin.tests.extensions;
 
 import com.vaadin.annotations.Widgetset;
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 
 @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet")
-public class HelloWorldExtensionTest extends AbstractTestRoot {
+public class HelloWorldExtensionTest extends AbstractTestUI {
 
     @Override
     protected void setup(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java b/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java
index 9d09436e45..6281f3eff4 100644
--- a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java
+++ b/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java
@@ -20,12 +20,12 @@ import com.vaadin.external.json.JSONArray;
 import com.vaadin.external.json.JSONException;
 import com.vaadin.external.json.JSONObject;
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.JavaScript;
 import com.vaadin.ui.JavaScriptFunction;
 
-public class JavascriptManagerTest extends AbstractTestRoot {
+public class JavascriptManagerTest extends AbstractTestUI {
 
     private Log log = new Log(5);
 
diff --git a/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java b/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java
index 7d4f41cfb3..c604516b9c 100644
--- a/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java
+++ b/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java
@@ -25,13 +25,13 @@ import com.vaadin.shared.communication.ClientRpc;
 import com.vaadin.shared.communication.ServerRpc;
 import com.vaadin.terminal.AbstractJavaScriptExtension;
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.JavaScriptFunction;
 import com.vaadin.ui.Notification;
 
-public class SimpleJavaScriptExtensionTest extends AbstractTestRoot {
+public class SimpleJavaScriptExtensionTest extends AbstractTestUI {
 
     public static class SimpleJavaScriptExtensionState extends
             JavaScriptExtensionState {
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java
index 89b4a0f8db..eb34747450 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryRoot.java
+++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.minitutorials.v7a1;
 
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.TextField;
 
-public class CustomConverterFactoryRoot extends AbstractTestRoot {
+public class CustomConverterFactoryUI extends AbstractTestUI {
     @Override
     public void setup(WrappedRequest request) {
         getApplication().setConverterFactory(new MyConverterFactory());
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineRootTheme.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java
index 6c9282eb01..12938f9f12 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineRootTheme.java
+++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java
@@ -30,7 +30,7 @@ import com.vaadin.ui.VerticalLayout;
  * @since 7.0.0
  */
 @Theme("hello-theme")
-public class DefineRootTheme extends UI {
+public class DefineUITheme extends UI {
 
     @Override
     protected void init(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java
index 81f225bc63..f3e96aaafc 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageRoot.java
+++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java
@@ -12,10 +12,10 @@ import com.vaadin.terminal.ExternalResource;
 import com.vaadin.terminal.RequestHandler;
 import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.terminal.WrappedResponse;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Embedded;
 
-public class DynamicImageRoot extends AbstractTestRoot {
+public class DynamicImageUI extends AbstractTestUI {
 
     @Override
     public void setup(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java
index a786ecb533..9830ee6aeb 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java
+++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java
@@ -32,7 +32,7 @@ import com.vaadin.ui.UI;
  * @author Vaadin Ltd
  * @since 7.0.0
  */
-public class FindCurrentRootAndApplication extends UI {
+public class FindCurrentUI extends UI {
 
     @Override
     protected void init(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
index 1e460b2f6e..2a8b228bc3 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
+++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
@@ -4,12 +4,12 @@ import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.fieldgroup.PropertyId;
 import com.vaadin.data.util.BeanItem;
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.TextField;
 
-public class FormUsingExistingLayout extends AbstractTestRoot {
+public class FormUsingExistingLayout extends AbstractTestUI {
 
     public static class Notice {
         String firstName;
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
index e487c6d3c4..5dd9322364 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
+++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
@@ -5,10 +5,10 @@ import java.util.Locale;
 
 import com.vaadin.data.util.converter.StringToNumberConverter;
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Table;
 
-public class FormatTableValue extends AbstractTestRoot {
+public class FormatTableValue extends AbstractTestUI {
 
     private static final String PERCENT_PROPERTY = "percent";
     private static final String CURRENCY_PROPERTY = "currency";
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
index af60b0e9e3..38a578189a 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
+++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.minitutorials.v7a1;
 import com.vaadin.data.Property;
 import com.vaadin.data.util.BeanItem;
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
@@ -11,7 +11,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.TextField;
 
-public class IntegerTextFieldDataSource extends AbstractTestRoot {
+public class IntegerTextFieldDataSource extends AbstractTestUI {
 
     public class MyBean {
         private int value;
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java
index f733b5df40..9d968f360a 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java
+++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.minitutorials.v7a1;
 import com.vaadin.data.util.converter.Converter.ConversionException;
 import com.vaadin.data.util.converter.StringToIntegerConverter;
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
@@ -11,7 +11,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.TextField;
 
-public class IntegerTextFieldStandalone extends AbstractTestRoot {
+public class IntegerTextFieldStandalone extends AbstractTestUI {
 
     @Override
     protected void setup(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
index c2393300f2..67a795a314 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
+++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
@@ -5,14 +5,14 @@ import java.util.Locale;
 import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.Converter.ConversionException;
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.TextField;
 
-public class StringMyTypeConverter extends AbstractTestRoot {
+public class StringMyTypeConverter extends AbstractTestUI {
 
     @Override
     protected void setup(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java
index b5bf8538ed..1bde122dbf 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateRoot.java
+++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java
@@ -14,7 +14,7 @@ import com.vaadin.ui.UI;
  * @since 7.0.0
  */
 @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet")
-public class ComponentInStateRoot extends UI {
+public class ComponentInStateUI extends UI {
     @Override
     protected void init(WrappedRequest request) {
         ComponentInStateComponent component = new ComponentInStateComponent();
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java
index 87aede8da9..d9091e4287 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentRoot.java
+++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java
@@ -33,7 +33,7 @@ import com.vaadin.ui.UI;
  * @since 7.0.0
  */
 @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet")
-public class MyComponentRoot extends UI {
+public class MyComponentUI extends UI {
 
     @Override
     protected void init(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java
index 04e2cf089e..37f4255cdd 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateRoot.java
+++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java
@@ -30,7 +30,7 @@ import com.vaadin.ui.UI;
  * @since 7.0.0
  */
 @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet")
-public class ResourceInStateRoot extends UI {
+public class ResourceInStateUI extends UI {
 
     @Override
     protected void init(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java
index 38f008d8a0..8c728548c0 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerRoot.java
+++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java
@@ -13,7 +13,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 
 @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet")
-public class WidgetcontainerRoot extends UI {
+public class WidgetcontainerUI extends UI {
     @Override
     public void init(WrappedRequest request) {
         Label label = new Label("Hello Vaadin user");
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java
index 05255d71cb..bae3c4fc9c 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsRoot.java
+++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java
@@ -21,7 +21,7 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.UI;
 
-public class AnalyticsRoot extends UI {
+public class AnalyticsUI extends UI {
 
     @Override
     protected void init(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java
index ffe654d0b3..093f3269e0 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRoot.java
+++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java
@@ -19,7 +19,7 @@ package com.vaadin.tests.minitutorials.v7a3;
 import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.ui.UI;
 
-public class ComplexTypesRoot extends UI {
+public class ComplexTypesUI extends UI {
 
     @Override
     protected void init(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java
index a8bf867fb5..02bd8a7cce 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptRoot.java
+++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java
@@ -21,7 +21,7 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.UI;
 
-public class FlotJavaScriptRoot extends UI {
+public class FlotJavaScriptUI extends UI {
 
     @Override
     protected void init(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java
index 73fba3fd7e..9384394870 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonRoot.java
+++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java
@@ -19,7 +19,7 @@ package com.vaadin.tests.minitutorials.v7a3;
 import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.ui.UI;
 
-public class RedButtonRoot extends UI {
+public class RedButtonUI extends UI {
     @Override
     protected void init(WrappedRequest request) {
         addComponent(new RedButton("My red button"));
diff --git a/tests/testbench/com/vaadin/tests/serialization/DelegateToWidgetTest.java b/tests/testbench/com/vaadin/tests/serialization/DelegateToWidgetTest.java
index 54170c880f..b775c18f8f 100644
--- a/tests/testbench/com/vaadin/tests/serialization/DelegateToWidgetTest.java
+++ b/tests/testbench/com/vaadin/tests/serialization/DelegateToWidgetTest.java
@@ -18,12 +18,12 @@ package com.vaadin.tests.serialization;
 
 import com.vaadin.annotations.Widgetset;
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.widgetset.TestingWidgetSet;
 import com.vaadin.tests.widgetset.server.DelegateToWidgetComponent;
 
 @Widgetset(TestingWidgetSet.NAME)
-public class DelegateToWidgetTest extends AbstractTestRoot {
+public class DelegateToWidgetTest extends AbstractTestUI {
     @Override
     protected void setup(WrappedRequest request) {
         addComponent(new DelegateToWidgetComponent());
diff --git a/tests/testbench/com/vaadin/tests/serialization/SerializerNamespaceTest.java b/tests/testbench/com/vaadin/tests/serialization/SerializerNamespaceTest.java
index 110475e5a9..0bb3b6c542 100644
--- a/tests/testbench/com/vaadin/tests/serialization/SerializerNamespaceTest.java
+++ b/tests/testbench/com/vaadin/tests/serialization/SerializerNamespaceTest.java
@@ -18,13 +18,13 @@ package com.vaadin.tests.serialization;
 
 import com.vaadin.annotations.Widgetset;
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.widgetset.TestingWidgetSet;
 import com.vaadin.tests.widgetset.server.DummyLabel;
 import com.vaadin.ui.Label;
 
 @Widgetset(TestingWidgetSet.NAME)
-public class SerializerNamespaceTest extends AbstractTestRoot {
+public class SerializerNamespaceTest extends AbstractTestUI {
 
     @Override
     protected void setup(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java b/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java
index 3e194010d1..6ad6b6d530 100644
--- a/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java
+++ b/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java
@@ -30,7 +30,7 @@ import com.vaadin.annotations.Widgetset;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.util.Log;
 import com.vaadin.tests.widgetset.client.ComplexTestBean;
 import com.vaadin.tests.widgetset.client.SerializerTestRpc;
@@ -38,7 +38,7 @@ import com.vaadin.tests.widgetset.client.SimpleTestBean;
 import com.vaadin.tests.widgetset.server.SerializerTestExtension;
 
 @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet")
-public class SerializerTest extends AbstractTestRoot {
+public class SerializerTest extends AbstractTestUI {
 
     private Log log = new Log(40);
 
diff --git a/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModify.html b/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyUI.html
index 8888f95d15..e6fafb14fa 100644
--- a/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModify.html
+++ b/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyUI.html
@@ -13,13 +13,13 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/run/com.vaadin.tests.vaadincontext.BootstrapModifyRoot?restartApplication</td>
+	<td>/run/com.vaadin.tests.vaadincontext.BootstrapModifyUI?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertText</td>
-	<td>vaadin=runcomvaadintestsvaadincontextBootstrapModifyRoot::/VVerticalLayout[0]/VLabel[0]</td>
-	<td>There should be two additional divs in the HTML of the bootstrap page for this Root</td>
+	<td>vaadin=runcomvaadintestsvaadincontextBootstrapModifyUI::/VVerticalLayout[0]/VLabel[0]</td>
+	<td>There should be two additional divs in the HTML of the bootstrap page for this UI</td>
 </tr>
 <tr>
 	<td>assertText</td>
diff --git a/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyRoot.java b/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java
index eefd37522b..c197bbde5d 100644
--- a/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyRoot.java
+++ b/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java
@@ -17,9 +17,9 @@
 package com.vaadin.tests.vaadincontext;
 
 import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.tests.components.AbstractTestRoot;
+import com.vaadin.tests.components.AbstractTestUI;
 
-public class BootstrapModifyRoot extends AbstractTestRoot {
+public class BootstrapModifyUI extends AbstractTestUI {
 
     @Override
     protected void setup(WrappedRequest request) {
diff --git a/tests/testbench/com/vaadin/tests/vaadincontext/TestAddonContextListener.java b/tests/testbench/com/vaadin/tests/vaadincontext/TestAddonContextListener.java
index 4fa007b11d..9cd67e24b6 100644
--- a/tests/testbench/com/vaadin/tests/vaadincontext/TestAddonContextListener.java
+++ b/tests/testbench/com/vaadin/tests/vaadincontext/TestAddonContextListener.java
@@ -44,7 +44,7 @@ public class TestAddonContextListener implements AddonContextListener {
             private boolean shouldModify(BootstrapResponse response) {
                 UI uI = response.getUI();
                 boolean shouldModify = uI != null
-                        && uI.getClass() == BootstrapModifyRoot.class;
+                        && uI.getClass() == BootstrapModifyUI.class;
                 return shouldModify;
             }