Renamed Paintable component classes to Connector

115 files changed, 344 insertions, 392 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
index d98e33aca4..f7afd745d1 100644
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
@@ -17,7 +17,7 @@ import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.Timer;
-import com.vaadin.terminal.gwt.client.ui.VUnknownComponentPaintable;
+import com.vaadin.terminal.gwt.client.ui.UnknownComponentConnector;
 
 public class ApplicationConfiguration implements EntryPoint {
 
@@ -388,7 +388,7 @@ public class ApplicationConfiguration implements EntryPoint {
             return classes[parseInt];
         } catch (Exception e) {
             // component was not present in mappings
-            return VUnknownComponentPaintable.class;
+            return UnknownComponentConnector.class;
         }
     }
 
@@ -398,7 +398,7 @@ public class ApplicationConfiguration implements EntryPoint {
             String key = keyArray.get(i).intern();
             int value = valueMap.getInt(key);
             classes[value] = widgetSet.getImplementationByClassName(key);
-            if (classes[value] == VUnknownComponentPaintable.class) {
+            if (classes[value] == UnknownComponentConnector.class) {
                 if (unknownComponents == null) {
                     unknownComponents = new HashMap<String, String>();
                 }
diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index ccfab49ef8..4eadb59287 100644
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -36,16 +36,14 @@ import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConfiguration.ErrorMessage;
-import com.vaadin.terminal.gwt.client.RenderInformation.FloatSize;
-import com.vaadin.terminal.gwt.client.RenderInformation.Size;
 import com.vaadin.terminal.gwt.client.communication.JsonDecoder;
 import com.vaadin.terminal.gwt.client.communication.JsonEncoder;
 import com.vaadin.terminal.gwt.client.communication.MethodInvocation;
 import com.vaadin.terminal.gwt.client.communication.SharedState;
+import com.vaadin.terminal.gwt.client.ui.RootConnector;
 import com.vaadin.terminal.gwt.client.ui.VContextMenu;
 import com.vaadin.terminal.gwt.client.ui.VNotification;
 import com.vaadin.terminal.gwt.client.ui.VNotification.HideEvent;
-import com.vaadin.terminal.gwt.client.ui.VViewPaintable;
 import com.vaadin.terminal.gwt.client.ui.dd.VDragAndDropManager;
 import com.vaadin.terminal.gwt.server.AbstractCommunicationManager;
 
@@ -56,8 +54,8 @@ import com.vaadin.terminal.gwt.server.AbstractCommunicationManager;
  * 
  * Client-side widgets receive updates from the corresponding server-side
  * components as calls to
- * {@link ComponentConnector#updateFromUIDL(UIDL, ApplicationConnection)} (not to
- * be confused with the server side interface
+ * {@link ComponentConnector#updateFromUIDL(UIDL, ApplicationConnection)} (not
+ * to be confused with the server side interface
  * {@link com.vaadin.terminal.Paintable} ). Any client-side changes (typically
  * resulting from user actions) are sent back to the server as variable changes
  * (see {@link #updateVariable()}).
@@ -137,7 +135,7 @@ public class ApplicationConnection {
     private Timer loadTimer3;
     private Element loadElement;
 
-    private final VViewPaintable view;
+    private final RootConnector view;
 
     protected boolean applicationRunning = false;
 
@@ -170,7 +168,7 @@ public class ApplicationConnection {
     private final LayoutManager layoutManager = new LayoutManager(this);
 
     public ApplicationConnection() {
-        view = GWT.create(VViewPaintable.class);
+        view = GWT.create(RootConnector.class);
         view.setConnection(this);
     }
 
@@ -826,8 +824,7 @@ public class ApplicationConnection {
         if (loadElement == null) {
             loadElement = DOM.createDiv();
             DOM.setStyleAttribute(loadElement, "position", "absolute");
-            DOM.appendChild(view.getWidget().getElement(),
-                    loadElement);
+            DOM.appendChild(view.getWidget().getElement(), loadElement);
             VConsole.log("inserting load indicator");
         }
         DOM.setElementProperty(loadElement, "className", "v-loading-indicator");
@@ -923,6 +920,7 @@ public class ApplicationConnection {
 
     protected void handleUIDLMessage(final Date start, final String jsonText,
             final ValueMap json) {
+        VConsole.log("Handling message from server");
         // Handle redirect
         if (json.containsKey("redirect")) {
             String url = json.getValueMap("redirect").getString("url");
@@ -956,6 +954,7 @@ public class ApplicationConnection {
                 VConsole.dirUIDL(json, configuration);
 
                 if (json.containsKey("locales")) {
+                    VConsole.log(" * Handling locales");
                     // Store locale data
                     JsArray<ValueMap> valueMapArray = json
                             .getJSValueMapArray("locales");
@@ -965,6 +964,7 @@ public class ApplicationConnection {
                 boolean repaintAll = false;
                 ValueMap meta = null;
                 if (json.containsKey("meta")) {
+                    VConsole.log(" * Handling meta information");
                     meta = json.getValueMap("meta");
                     if (meta.containsKey("repaintAll")) {
                         repaintAll = true;
@@ -1009,6 +1009,7 @@ public class ApplicationConnection {
 
                 int length = changes.length();
 
+                VConsole.log(" * Creating connectors (if needed)");
                 // create paintables if necessary
                 for (int i = 0; i < length; i++) {
                     try {
@@ -1027,6 +1028,7 @@ public class ApplicationConnection {
                     }
                 }
 
+                VConsole.log(" * Updating connector states");
                 // set states for all paintables mentioned in "state"
                 ValueMap states = json.getValueMap("state");
                 JsArrayString keyArray = states.getKeyArray();
@@ -1050,6 +1052,7 @@ public class ApplicationConnection {
                     }
                 }
 
+                VConsole.log(" * Passing UIDL to Vaadin 6 style connectors");
                 // update paintables
                 for (int i = 0; i < length; i++) {
                     try {
@@ -1869,11 +1872,11 @@ public class ApplicationConnection {
     }
 
     /**
-     * Gets the main view, a.k.a top-level window.
+     * Gets the main view
      * 
      * @return the main view
      */
-    public VViewPaintable getView() {
+    public RootConnector getView() {
         return view;
     }
 
diff --git a/src/com/vaadin/terminal/gwt/client/LayoutManager.java b/src/com/vaadin/terminal/gwt/client/LayoutManager.java
index 23c653cd0d..b362d140f2 100644
--- a/src/com/vaadin/terminal/gwt/client/LayoutManager.java
+++ b/src/com/vaadin/terminal/gwt/client/LayoutManager.java
@@ -78,7 +78,8 @@ public class LayoutManager {
         return element.vMeasuredSize || defaultSize;
     }-*/;
 
-    private static final MeasuredSize getMeasuredSize(ComponentConnector paintable) {
+    private static final MeasuredSize getMeasuredSize(
+            ComponentConnector paintable) {
         Element element = paintable.getWidget().getElement();
         MeasuredSize measuredSize = getMeasuredSize(element, null);
         if (measuredSize == null) {
@@ -101,6 +102,8 @@ public class LayoutManager {
     }
 
     public void doLayout() {
+        VConsole.log("Starting layout phase");
+
         ConnectorMap paintableMap = connection.getConnectorMap();
         ComponentConnector[] paintableWidgets = paintableMap
                 .getRegisteredComponentConnectors();
@@ -213,21 +216,23 @@ public class LayoutManager {
             }
         }
 
+        VConsole.log("Layout phase done");
+        VConsole.log("Calling post layout listeners");
+
         for (ComponentConnector vPaintableWidget : paintableWidgets) {
             if (vPaintableWidget instanceof PostLayoutListener) {
                 ((PostLayoutListener) vPaintableWidget).postLayout();
             }
         }
 
-        VConsole.log("Total layout time: " + totalDuration.elapsedMillis()
-                + "ms");
+        VConsole.log("Total layout phase time: "
+                + totalDuration.elapsedMillis() + "ms");
     }
 
     private void measureElements(ComponentConnector[] paintableWidgets) {
 
         for (ComponentConnector paintableWidget : paintableWidgets) {
-            Element element = paintableWidget.getWidget()
-                    .getElement();
+            Element element = paintableWidget.getWidget().getElement();
             MeasuredSize measuredSize = getMeasuredSize(paintableWidget);
             measuredAndUpdate(element, measuredSize);
         }
diff --git a/src/com/vaadin/terminal/gwt/client/MeasuredSize.java b/src/com/vaadin/terminal/gwt/client/MeasuredSize.java
index 9a70ff06d3..499503e7da 100644
--- a/src/com/vaadin/terminal/gwt/client/MeasuredSize.java
+++ b/src/com/vaadin/terminal/gwt/client/MeasuredSize.java
@@ -152,7 +152,6 @@ public class MeasuredSize {
         boolean wasWidthChanged = widthChanged;
 
         ComputedStyle computedStyle = new ComputedStyle(element);
-
         int[] paddings = computedStyle.getPadding();
         if (!heightChanged && hasHeightChanged(this.paddings, paddings)) {
             heightChanged = true;
@@ -185,6 +184,7 @@ public class MeasuredSize {
         setOuterHeight(requiredHeight + marginHeight);
 
         int requiredWidth = Util.getRequiredWidth(element);
+        VConsole.log("Width of " + element.toString() + " is " + requiredWidth);
         int marginWidth = sumWidths(margins);
         setOuterWidth(requiredWidth + marginWidth);
 
diff --git a/src/com/vaadin/terminal/gwt/client/VCaption.java b/src/com/vaadin/terminal/gwt/client/VCaption.java
index 1d293ef5bf..2f2621c153 100644
--- a/src/com/vaadin/terminal/gwt/client/VCaption.java
+++ b/src/com/vaadin/terminal/gwt/client/VCaption.java
@@ -10,7 +10,7 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.HTML;
 import com.vaadin.terminal.gwt.client.ui.Icon;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.VTabsheetBasePaintable;
+import com.vaadin.terminal.gwt.client.ui.TabsheetBaseConnector;
 
 public class VCaption extends HTML {
 
@@ -404,7 +404,7 @@ public class VCaption extends HTML {
         } else {
             // TODO fallback for cases where the caption has no owner (Tabsheet,
             // Accordion)
-            if (uidl.getStringAttribute(VTabsheetBasePaintable.ATTRIBUTE_TAB_CAPTION) != null) {
+            if (uidl.getStringAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_CAPTION) != null) {
                 return true;
             }
         }
diff --git a/src/com/vaadin/terminal/gwt/client/VUIDLBrowser.java b/src/com/vaadin/terminal/gwt/client/VUIDLBrowser.java
index 7e2df6e74d..3642d0ff2e 100644
--- a/src/com/vaadin/terminal/gwt/client/VUIDLBrowser.java
+++ b/src/com/vaadin/terminal/gwt/client/VUIDLBrowser.java
@@ -24,7 +24,7 @@ import com.google.gwt.event.dom.client.MouseOutEvent;
 import com.google.gwt.event.dom.client.MouseOutHandler;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ui.VUnknownComponentPaintable;
+import com.vaadin.terminal.gwt.client.ui.UnknownComponentConnector;
 import com.vaadin.terminal.gwt.client.ui.VWindow;
 
 public class VUIDLBrowser extends SimpleTree {
@@ -101,7 +101,7 @@ public class VUIDLBrowser extends SimpleTree {
                 String name) {
             Class<? extends ComponentConnector> widgetClassByDecodedTag = conf
                     .getWidgetClassByEncodedTag(name);
-            if (widgetClassByDecodedTag == VUnknownComponentPaintable.class) {
+            if (widgetClassByDecodedTag == UnknownComponentConnector.class) {
                 return conf.getUnknownServerClassNameByEncodedTagName(name)
                         + "(NO CLIENT IMPLEMENTATION FOUND)";
             } else {
diff --git a/src/com/vaadin/terminal/gwt/client/WidgetSet.java b/src/com/vaadin/terminal/gwt/client/WidgetSet.java
index 189487cf5a..656c92e285 100644
--- a/src/com/vaadin/terminal/gwt/client/WidgetSet.java
+++ b/src/com/vaadin/terminal/gwt/client/WidgetSet.java
@@ -6,7 +6,7 @@ package com.vaadin.terminal.gwt.client;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ui.VUnknownComponentPaintable;
+import com.vaadin.terminal.gwt.client.ui.UnknownComponentConnector;
 
 public class WidgetSet {
 
@@ -43,11 +43,11 @@ public class WidgetSet {
         Class<? extends ComponentConnector> classType = resolveWidgetType(tag,
                 conf);
 
-        if (classType == null || classType == VUnknownComponentPaintable.class) {
+        if (classType == null || classType == UnknownComponentConnector.class) {
             String serverSideName = conf
                     .getUnknownServerClassNameByEncodedTagName(tag);
-            VUnknownComponentPaintable c = GWT
-                    .create(VUnknownComponentPaintable.class);
+            UnknownComponentConnector c = GWT
+                    .create(UnknownComponentConnector.class);
             c.setServerSideClassName(serverSideName);
             return c;
         } else {
@@ -80,7 +80,7 @@ public class WidgetSet {
     public Class<? extends ComponentConnector> getImplementationByClassName(
             String fullyqualifiedName) {
         if (fullyqualifiedName == null) {
-            return VUnknownComponentPaintable.class;
+            return UnknownComponentConnector.class;
         }
         Class<? extends ComponentConnector> implementationByServerSideClassName = widgetMap
                 .getImplementationByServerSideClassName(fullyqualifiedName);
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayoutPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/AbsoluteLayoutConnector.java
index 5b4821519b..04ecb4484a 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayoutPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/AbsoluteLayoutConnector.java
@@ -21,7 +21,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.ui.VAbsoluteLayout.AbsoluteWrapper;
 
-public class VAbsoluteLayoutPaintable extends AbstractComponentContainerConnector
+public class AbsoluteLayoutConnector extends AbstractComponentContainerConnector
         implements DirectionalManagedLayout {
 
     private LayoutClickEventHandler clickEventHandler = new LayoutClickEventHandler(
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VDateFieldPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractDateFieldConnector.java
index bf747ad579..1a3ce139a1 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VDateFieldPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractDateFieldConnector.java
@@ -12,7 +12,7 @@ import com.vaadin.terminal.gwt.client.LocaleNotLoadedException;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.VConsole;
 
-public class VDateFieldPaintable extends AbstractComponentConnector {
+public class AbstractDateFieldConnector extends AbstractComponentConnector {
 
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayoutPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java
index 3d3bc60d2b..d3cbddd57e 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayoutPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java
@@ -11,17 +11,17 @@ import com.google.gwt.dom.client.Style;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.ComponentConnector;
+import com.vaadin.terminal.gwt.client.ConnectorMap;
 import com.vaadin.terminal.gwt.client.DirectionalManagedLayout;
 import com.vaadin.terminal.gwt.client.LayoutManager;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.VCaption;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.ValueMap;
 import com.vaadin.terminal.gwt.client.ui.layout.VLayoutSlot;
-import com.vaadin.terminal.gwt.client.ui.layout.VPaintableLayoutSlot;
+import com.vaadin.terminal.gwt.client.ui.layout.ComponentConnectorLayoutSlot;
 
-public abstract class VMeasuringOrderedLayoutPaintable extends
+public abstract class AbstractOrderedLayoutConnector extends
         AbstractComponentContainerConnector implements DirectionalManagedLayout {
 
     @Override
@@ -79,7 +79,7 @@ public abstract class VMeasuringOrderedLayoutPaintable extends
             VLayoutSlot slot = layout.getSlotForChild(widget);
 
             if (widget.getParent() != layout) {
-                slot = new VPaintableLayoutSlot(getWidget()
+                slot = new ComponentConnectorLayoutSlot(getWidget()
                         .getStylePrimaryName(), child);
             }
             layout.addOrMove(slot, currentIndex++);
@@ -176,11 +176,9 @@ public abstract class VMeasuringOrderedLayoutPaintable extends
 
     private int getInnerSizeInDirection(boolean isVertical) {
         if (isVertical) {
-            return getLayoutManager().getInnerHeight(
-                    getWidget().getElement());
+            return getLayoutManager().getInnerHeight(getWidget().getElement());
         } else {
-            return getLayoutManager().getInnerWidth(
-                    getWidget().getElement());
+            return getLayoutManager().getInnerWidth(getWidget().getElement());
         }
     }
 
@@ -242,13 +240,10 @@ public abstract class VMeasuringOrderedLayoutPaintable extends
         Style ownStyle = getWidget().getElement().getStyle();
 
         if (isUndefined) {
-            ownStyle.setPropertyPx(
-                    getSizeProperty(!getWidget().isVertical),
-                    getSizeForInnerSize(allocatedSize,
-                            !getWidget().isVertical));
+            ownStyle.setPropertyPx(getSizeProperty(!getWidget().isVertical),
+                    getSizeForInnerSize(allocatedSize, !getWidget().isVertical));
         } else {
-            ownStyle.setProperty(
-                    getSizeProperty(!getWidget().isVertical),
+            ownStyle.setProperty(getSizeProperty(!getWidget().isVertical),
                     getDefinedSize(!getWidget().isVertical));
         }
     }
@@ -263,11 +258,9 @@ public abstract class VMeasuringOrderedLayoutPaintable extends
 
     private int getStartPadding(boolean isVertical) {
         if (isVertical) {
-            return getLayoutManager().getPaddingTop(
-                    getWidget().getElement());
+            return getLayoutManager().getPaddingTop(getWidget().getElement());
         } else {
-            return getLayoutManager().getPaddingLeft(
-                    getWidget().getElement());
+            return getLayoutManager().getPaddingLeft(getWidget().getElement());
         }
     }
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAbstractSplitPanelPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractSplitPanelConnector.java
index 08fc6ac26c..91ee5a148a 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VAbstractSplitPanelPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractSplitPanelConnector.java
@@ -11,11 +11,11 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
+import com.vaadin.terminal.gwt.client.ConnectorMap;
+import com.vaadin.terminal.gwt.client.UIDL;
 
-public abstract class VAbstractSplitPanelPaintable extends
+public abstract class AbstractSplitPanelConnector extends
         AbstractComponentContainerConnector implements SimpleManagedLayout {
 
     public static final String SPLITTER_CLICK_EVENT_IDENTIFIER = "sp_click";
@@ -79,16 +79,14 @@ public abstract class VAbstractSplitPanelPaintable extends
 
         clickEventHandler.handleEventHandlerRegistration(client);
         if (getState().hasStyles()) {
-            getWidget().componentStyleNames = getState().getStyle()
-                    .split(" ");
+            getWidget().componentStyleNames = getState().getStyle().split(" ");
         } else {
             getWidget().componentStyleNames = new String[0];
         }
 
         getWidget().setLocked(uidl.getBooleanAttribute("locked"));
 
-        getWidget().setPositionReversed(
-                uidl.getBooleanAttribute("reversed"));
+        getWidget().setPositionReversed(uidl.getBooleanAttribute("reversed"));
 
         getWidget().setStylenames();
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAccordionPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/AccordionConnector.java
index ad4360642a..179d5f7808 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VAccordionPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/AccordionConnector.java
@@ -12,7 +12,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.ui.VAccordion.StackItem;
 
-public class VAccordionPaintable extends VTabsheetBasePaintable implements
+public class AccordionConnector extends TabsheetBaseConnector implements
         SimpleManagedLayout {
 
     @Override
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAudioPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/AudioConnector.java
index de3b7d2bca..fe1993a35d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VAudioPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/AudioConnector.java
@@ -11,7 +11,7 @@ import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.BrowserInfo;
 import com.vaadin.terminal.gwt.client.UIDL;
 
-public class VAudioPaintable extends VMediaBasePaintable {
+public class AudioConnector extends MediaBaseConnector {
 
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VButtonPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/ButtonConnector.java
index 5924d3f589..f0df09458a 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VButtonPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ButtonConnector.java
@@ -13,7 +13,7 @@ import com.vaadin.terminal.gwt.client.EventHelper;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.communication.ClientToServerRpc;
 
-public class VButtonPaintable extends AbstractComponentConnector {
+public class ButtonConnector extends AbstractComponentConnector {
 
     /**
      * RPC interface for calls from client to server.
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCheckBoxPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/CheckBoxConnector.java
index 72107ab658..f33cc35a46 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VCheckBoxPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/CheckBoxConnector.java
@@ -12,7 +12,7 @@ import com.vaadin.terminal.gwt.client.EventHelper;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.VTooltip;
 
-public class VCheckBoxPaintable extends AbstractComponentConnector {
+public class CheckBoxConnector extends AbstractComponentConnector {
 
     @Override
     protected boolean delegateCaptionHandling() {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelectPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/ComboBoxConnector.java
index b164081a2e..7de3c3ac3a 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelectPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ComboBoxConnector.java
@@ -12,7 +12,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.ui.VFilterSelect.FilterSelectSuggestion;
 
-public class VFilterSelectPaintable extends AbstractComponentConnector implements
+public class ComboBoxConnector extends AbstractComponentConnector implements
         SimpleManagedLayout {
 
     /*
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCssLayoutPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/CssLayoutConnector.java
index 5f074326fa..0cbe58b4fd 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VCssLayoutPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/CssLayoutConnector.java
@@ -14,7 +14,7 @@ import com.vaadin.terminal.gwt.client.EventId;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 
-public class VCssLayoutPaintable extends AbstractComponentContainerConnector {
+public class CssLayoutConnector extends AbstractComponentContainerConnector {
 
     private LayoutClickEventHandler clickEventHandler = new LayoutClickEventHandler(
             this, EventId.LAYOUT_CLICK) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCustomComponentPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/CustomComponentConnector.java
index 345a059149..3b84c700e3 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VCustomComponentPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/CustomComponentConnector.java
@@ -10,7 +10,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ConnectorMap;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 
-public class VCustomComponentPaintable extends
+public class CustomComponentConnector extends
         AbstractComponentContainerConnector {
 
     @Override
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCustomLayoutPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/CustomLayoutConnector.java
index ab409afda2..1f1422415f 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VCustomLayoutPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/CustomLayoutConnector.java
@@ -14,7 +14,7 @@ import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 
-public class VCustomLayoutPaintable extends AbstractComponentContainerConnector
+public class CustomLayoutConnector extends AbstractComponentContainerConnector
         implements SimpleManagedLayout {
 
     /** Update the layout from UIDL */
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VDragAndDropWrapperPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/DragAndDropWrapperConnector.java
index 07749c4527..4b44585caa 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VDragAndDropWrapperPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/DragAndDropWrapperConnector.java
@@ -11,7 +11,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
 
-public class VDragAndDropWrapperPaintable extends VCustomComponentPaintable {
+public class DragAndDropWrapperConnector extends CustomComponentConnector {
 
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
@@ -25,8 +25,7 @@ public class VDragAndDropWrapperPaintable extends VCustomComponentPaintable {
                 if (getWidget().dropHandler == null) {
                     getWidget().dropHandler = getWidget().new CustomDropHandler();
                 }
-                getWidget().dropHandler
-                        .updateAcceptRules(acceptCrit);
+                getWidget().dropHandler.updateAcceptRules(acceptCrit);
             }
 
             Set<String> variableNames = uidl.getVariableNames();
@@ -39,15 +38,13 @@ public class VDragAndDropWrapperPaintable extends VCustomComponentPaintable {
                     }
                     if ("".equals(receiverUrl)) {
                         Integer id = Integer.parseInt(fileId);
-                        int indexOf = getWidget().fileIds
-                                .indexOf(id);
+                        int indexOf = getWidget().fileIds.indexOf(id);
                         if (indexOf != -1) {
                             getWidget().files.remove(indexOf);
                             getWidget().fileIds.remove(indexOf);
                         }
                     } else {
-                        getWidget().fileIdToReceiver.put(fileId,
-                                receiverUrl);
+                        getWidget().fileIdToReceiver.put(fileId, receiverUrl);
                     }
                 }
             }
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VEmbeddedPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/EmbeddedConnector.java
index 822800aed9..df7eb2528c 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VEmbeddedPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/EmbeddedConnector.java
@@ -24,7 +24,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.VConsole;
 import com.vaadin.terminal.gwt.client.VTooltip;
 
-public class VEmbeddedPaintable extends AbstractComponentConnector {
+public class EmbeddedConnector extends AbstractComponentConnector {
 
     public static final String CLICK_EVENT_IDENTIFIER = "click";
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFormPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/FormConnector.java
index 2d0b5cea25..0665ec4401 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VFormPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/FormConnector.java
@@ -12,7 +12,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ConnectorMap;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 
-public class VFormPaintable extends AbstractComponentContainerConnector implements
+public class FormConnector extends AbstractComponentContainerConnector implements
         SimpleManagedLayout {
 
     @Override
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFormLayoutPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/FormLayoutConnector.java
index 5991163ef0..df658aa2c0 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VFormLayoutPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/FormLayoutConnector.java
@@ -9,7 +9,7 @@ import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 
-public class VFormLayoutPaintable extends AbstractComponentContainerConnector {
+public class FormLayoutConnector extends AbstractComponentContainerConnector {
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         getWidget().client = client;
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VGridLayoutPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/GridLayoutConnector.java
index ee02bf5e94..f3b4ef4d64 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VGridLayoutPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/GridLayoutConnector.java
@@ -22,7 +22,7 @@ import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.ui.VGridLayout.Cell;
 import com.vaadin.terminal.gwt.client.ui.layout.VLayoutSlot;
 
-public class VGridLayoutPaintable extends AbstractComponentContainerConnector
+public class GridLayoutConnector extends AbstractComponentContainerConnector
         implements DirectionalManagedLayout {
     private LayoutClickEventHandler clickEventHandler = new LayoutClickEventHandler(
             this, EventId.LAYOUT_CLICK) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VHorizontalLayoutPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/HorizontalLayoutConnector.java
index e62ac8b430..fc370fcd2d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VHorizontalLayoutPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/HorizontalLayoutConnector.java
@@ -5,8 +5,7 @@ package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.core.client.GWT;
 
-public class VHorizontalLayoutPaintable extends
-        VMeasuringOrderedLayoutPaintable {
+public class HorizontalLayoutConnector extends AbstractOrderedLayoutConnector {
 
     @Override
     public VHorizontalLayout getWidget() {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VHorizontalSplitPanelPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/HorizontalSplitPanelConnector.java
index 44141107aa..17d264a707 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VHorizontalSplitPanelPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/HorizontalSplitPanelConnector.java
@@ -5,8 +5,7 @@ package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.core.client.GWT;
 
-public class VHorizontalSplitPanelPaintable extends
-        VAbstractSplitPanelPaintable {
+public class HorizontalSplitPanelConnector extends AbstractSplitPanelConnector {
 
     @Override
     protected VAbstractSplitPanel createWidget() {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendarPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/InlineDateFieldConnector.java
index 4868287f1e..9e8dd14100 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendarPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/InlineDateFieldConnector.java
@@ -13,7 +13,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ui.VCalendarPanel.FocusChangeListener;
 import com.vaadin.terminal.gwt.client.ui.VCalendarPanel.TimeChangeListener;
 
-public class VDateFieldCalendarPaintable extends VDateFieldPaintable {
+public class InlineDateFieldConnector extends AbstractDateFieldConnector {
 
     @Override
     @SuppressWarnings("deprecation")
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VLinkPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/LinkConnector.java
index 79ea801376..1cd70371bb 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VLinkPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/LinkConnector.java
@@ -10,7 +10,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
 
-public class VLinkPaintable extends AbstractComponentConnector {
+public class LinkConnector extends AbstractComponentConnector {
 
     @Override
     protected boolean delegateCaptionHandling() {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VListSelectPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/ListSelectConnector.java
index 0e4d19da61..c470acbcf1 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VListSelectPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ListSelectConnector.java
@@ -7,7 +7,7 @@ package com.vaadin.terminal.gwt.client.ui;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
 
-public class VListSelectPaintable extends VOptionGroupBasePaintable {
+public class ListSelectConnector extends OptionGroupBaseConnector {
 
     @Override
     protected Widget createWidget() {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMediaBasePaintable.java b/src/com/vaadin/terminal/gwt/client/ui/MediaBaseConnector.java
index 22e14b8b7f..1ba3fd6930 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VMediaBasePaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/MediaBaseConnector.java
@@ -7,7 +7,7 @@ import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
 
-public abstract class VMediaBasePaintable extends AbstractComponentConnector {
+public abstract class MediaBaseConnector extends AbstractComponentConnector {
 
     public static final String TAG_SOURCE = "src";
 
@@ -36,8 +36,8 @@ public abstract class VMediaBasePaintable extends AbstractComponentConnector {
         for (int ix = 0; ix < uidl.getChildCount(); ix++) {
             UIDL child = uidl.getChildUIDL(ix);
             if (TAG_SOURCE.equals(child.getTag())) {
-                getWidget().addSource(getSourceUrl(child),
-                        getSourceType(child));
+                getWidget()
+                        .addSource(getSourceUrl(child), getSourceType(child));
             }
         }
         setAltText(uidl);
@@ -85,7 +85,7 @@ public abstract class VMediaBasePaintable extends AbstractComponentConnector {
      */
     private String getSourceUrl(UIDL uidl) {
         String url = getConnection().translateVaadinUri(
-                uidl.getStringAttribute(VMediaBasePaintable.ATTR_RESOURCE));
+                uidl.getStringAttribute(MediaBaseConnector.ATTR_RESOURCE));
         if (url == null) {
             return "";
         }
@@ -97,11 +97,11 @@ public abstract class VMediaBasePaintable extends AbstractComponentConnector {
      * @return the mime type of the media
      */
     private String getSourceType(UIDL uidl) {
-        return uidl.getStringAttribute(VMediaBasePaintable.ATTR_RESOURCE_TYPE);
+        return uidl.getStringAttribute(MediaBaseConnector.ATTR_RESOURCE_TYPE);
     }
 
     private void setAltText(UIDL uidl) {
-        String alt = uidl.getStringAttribute(VMediaBasePaintable.ATTR_ALT_TEXT);
+        String alt = uidl.getStringAttribute(MediaBaseConnector.ATTR_ALT_TEXT);
 
         if (alt == null || "".equals(alt)) {
             alt = getWidget().getDefaultAltHtml();
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBarPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/MenuBarConnector.java
index 6606493a86..873f995962 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBarPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/MenuBarConnector.java
@@ -14,7 +14,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.ui.VMenuBar.CustomMenuItem;
 
-public class VMenuBarPaintable extends AbstractComponentConnector implements
+public class MenuBarConnector extends AbstractComponentConnector implements
         SimpleManagedLayout {
     /**
      * This method must be implemented to update the client-side component from
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VNativeButtonPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/NativeButtonConnector.java
index 33afcf38f8..87f7943773 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VNativeButtonPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/NativeButtonConnector.java
@@ -10,9 +10,9 @@ import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.ComponentState;
 import com.vaadin.terminal.gwt.client.EventHelper;
 import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.VButtonPaintable.ButtonClientToServerRpc;
+import com.vaadin.terminal.gwt.client.ui.ButtonConnector.ButtonClientToServerRpc;
 
-public class VNativeButtonPaintable extends AbstractComponentConnector {
+public class NativeButtonConnector extends AbstractComponentConnector {
 
     @Override
     public void init() {
@@ -39,12 +39,10 @@ public class VNativeButtonPaintable extends AbstractComponentConnector {
         }
 
         getWidget().disableOnClick = getState().isDisableOnClick();
-        getWidget().focusHandlerRegistration = EventHelper
-                .updateFocusHandler(this, client,
-                        getWidget().focusHandlerRegistration);
-        getWidget().blurHandlerRegistration = EventHelper
-                .updateBlurHandler(this, client,
-                        getWidget().blurHandlerRegistration);
+        getWidget().focusHandlerRegistration = EventHelper.updateFocusHandler(
+                this, client, getWidget().focusHandlerRegistration);
+        getWidget().blurHandlerRegistration = EventHelper.updateBlurHandler(
+                this, client, getWidget().blurHandlerRegistration);
 
         // Save details
         getWidget().client = client;
@@ -56,8 +54,7 @@ public class VNativeButtonPaintable extends AbstractComponentConnector {
         // handle error
         if (uidl.hasAttribute("error")) {
             if (getWidget().errorIndicatorElement == null) {
-                getWidget().errorIndicatorElement = DOM
-                        .createSpan();
+                getWidget().errorIndicatorElement = DOM.createSpan();
                 getWidget().errorIndicatorElement
                         .setClassName("v-errorindicator");
             }
@@ -78,8 +75,7 @@ public class VNativeButtonPaintable extends AbstractComponentConnector {
                         getWidget().icon.getElement(),
                         getWidget().captionElement);
             }
-            getWidget().icon.setUri(uidl
-                    .getStringAttribute(ATTRIBUTE_ICON));
+            getWidget().icon.setUri(uidl.getStringAttribute(ATTRIBUTE_ICON));
         } else {
             if (getWidget().icon != null) {
                 getWidget().getElement().removeChild(
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VNativeSelectPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/NativeSelectConnector.java
index 5175369045..c425ccb93d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VNativeSelectPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/NativeSelectConnector.java
@@ -7,7 +7,7 @@ package com.vaadin.terminal.gwt.client.ui;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
 
-public class VNativeSelectPaintable extends VOptionGroupBasePaintable {
+public class NativeSelectConnector extends OptionGroupBaseConnector {
 
     @Override
     protected Widget createWidget() {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VOptionGroupBasePaintable.java b/src/com/vaadin/terminal/gwt/client/ui/OptionGroupBaseConnector.java
index d730d50365..7cdb55457d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VOptionGroupBasePaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/OptionGroupBaseConnector.java
@@ -7,7 +7,7 @@ package com.vaadin.terminal.gwt.client.ui;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
 
-public abstract class VOptionGroupBasePaintable extends
+public abstract class OptionGroupBaseConnector extends
         AbstractComponentConnector {
 
     @Override
@@ -22,8 +22,7 @@ public abstract class VOptionGroupBasePaintable extends
             return;
         }
 
-        getWidget().selectedKeys = uidl
-                .getStringArrayVariableAsSet("selected");
+        getWidget().selectedKeys = uidl.getStringArrayVariableAsSet("selected");
 
         getWidget().readonly = getState().isReadOnly();
         getWidget().disabled = getState().isDisabled();
@@ -45,8 +44,7 @@ public abstract class VOptionGroupBasePaintable extends
         final UIDL ops = uidl.getChildUIDL(0);
 
         if (getWidget().getColumns() > 0) {
-            getWidget().container.setWidth(getWidget()
-                    .getColumns() + "em");
+            getWidget().container.setWidth(getWidget().getColumns() + "em");
             if (getWidget().container != getWidget().optionsContainer) {
                 getWidget().optionsContainer.setWidth("100%");
             }
@@ -58,37 +56,26 @@ public abstract class VOptionGroupBasePaintable extends
             if (getWidget().newItemField == null) {
                 getWidget().newItemButton = new VNativeButton();
                 getWidget().newItemButton.setText("+");
-                getWidget().newItemButton
-                        .addClickHandler(getWidget());
+                getWidget().newItemButton.addClickHandler(getWidget());
                 getWidget().newItemField = new VTextField();
-                getWidget().newItemField
-                        .addKeyPressHandler(getWidget());
+                getWidget().newItemField.addKeyPressHandler(getWidget());
             }
-            getWidget().newItemField
-                    .setEnabled(!getWidget().disabled
-                            && !getWidget().readonly);
-            getWidget().newItemButton
-                    .setEnabled(!getWidget().disabled
-                            && !getWidget().readonly);
+            getWidget().newItemField.setEnabled(!getWidget().disabled
+                    && !getWidget().readonly);
+            getWidget().newItemButton.setEnabled(!getWidget().disabled
+                    && !getWidget().readonly);
 
             if (getWidget().newItemField == null
                     || getWidget().newItemField.getParent() != getWidget().container) {
-                getWidget().container
-                        .add(getWidget().newItemField);
-                getWidget().container
-                        .add(getWidget().newItemButton);
-                final int w = getWidget().container
-                        .getOffsetWidth()
-                        - getWidget().newItemButton
-                                .getOffsetWidth();
-                getWidget().newItemField.setWidth(Math.max(w, 0)
-                        + "px");
+                getWidget().container.add(getWidget().newItemField);
+                getWidget().container.add(getWidget().newItemButton);
+                final int w = getWidget().container.getOffsetWidth()
+                        - getWidget().newItemButton.getOffsetWidth();
+                getWidget().newItemField.setWidth(Math.max(w, 0) + "px");
             }
         } else if (getWidget().newItemField != null) {
-            getWidget().container
-                    .remove(getWidget().newItemField);
-            getWidget().container
-                    .remove(getWidget().newItemButton);
+            getWidget().container.remove(getWidget().newItemField);
+            getWidget().container.remove(getWidget().newItemButton);
         }
 
         getWidget().setTabIndex(
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VOptionGroupPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/OptionGroupConnector.java
index 5def912491..76204bcb07 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VOptionGroupPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/OptionGroupConnector.java
@@ -14,7 +14,7 @@ import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.EventId;
 import com.vaadin.terminal.gwt.client.UIDL;
 
-public class VOptionGroupPaintable extends VOptionGroupBasePaintable {
+public class OptionGroupConnector extends OptionGroupBaseConnector {
 
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
@@ -23,8 +23,8 @@ public class VOptionGroupPaintable extends VOptionGroupBasePaintable {
 
         super.updateFromUIDL(uidl, client);
 
-        getWidget().sendFocusEvents = client.hasEventListeners(
-                this, EventId.FOCUS);
+        getWidget().sendFocusEvents = client.hasEventListeners(this,
+                EventId.FOCUS);
         getWidget().sendBlurEvents = client.hasEventListeners(this,
                 EventId.BLUR);
 
@@ -42,8 +42,7 @@ public class VOptionGroupPaintable extends VOptionGroupBasePaintable {
             getWidget().blurHandlers = null;
         }
 
-        if (getWidget().sendFocusEvents
-                || getWidget().sendBlurEvents) {
+        if (getWidget().sendFocusEvents || getWidget().sendBlurEvents) {
             getWidget().focusHandlers = new ArrayList<HandlerRegistration>();
             getWidget().blurHandlers = new ArrayList<HandlerRegistration>();
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPanelPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java
index 0cf7d7fef8..27f0f5adb0 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VPanelPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java
@@ -15,7 +15,7 @@ import com.vaadin.terminal.gwt.client.LayoutManager;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 
-public class VPanelPaintable extends AbstractComponentContainerConnector
+public class PanelConnector extends AbstractComponentContainerConnector
         implements SimpleManagedLayout, PostLayoutListener {
 
     public static final String CLICK_EVENT_IDENTIFIER = "click";
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPasswordFieldPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/PasswordFieldConnector.java
index 085df27702..5086bdb416 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VPasswordFieldPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/PasswordFieldConnector.java
@@ -9,7 +9,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
 
-public class VPasswordFieldPaintable extends VTextFieldPaintable {
+public class PasswordFieldConnector extends TextFieldConnector {
 
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendarPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/PopupDateFieldConnector.java
index 3ff85cccfe..4c315046aa 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendarPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/PopupDateFieldConnector.java
@@ -14,7 +14,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ui.VCalendarPanel.FocusChangeListener;
 import com.vaadin.terminal.gwt.client.ui.VCalendarPanel.TimeChangeListener;
 
-public class VPopupCalendarPaintable extends VTextualDatePaintable {
+public class PopupDateFieldConnector extends TextualDateConnector {
 
     /*
      * (non-Javadoc)
@@ -44,25 +44,20 @@ public class VPopupCalendarPaintable extends VTextualDatePaintable {
                         .resolutionToString(getWidget().currentResolution);
         getWidget().popup.setStyleName(popupStyleNames);
 
-        getWidget().calendar
-                .setDateTimeService(getWidget()
-                        .getDateTimeService());
-        getWidget().calendar
-                .setShowISOWeekNumbers(getWidget()
-                        .isShowISOWeekNumbers());
+        getWidget().calendar.setDateTimeService(getWidget()
+                .getDateTimeService());
+        getWidget().calendar.setShowISOWeekNumbers(getWidget()
+                .isShowISOWeekNumbers());
         if (getWidget().calendar.getResolution() != getWidget().currentResolution) {
-            getWidget().calendar
-                    .setResolution(getWidget().currentResolution);
+            getWidget().calendar.setResolution(getWidget().currentResolution);
             if (getWidget().calendar.getDate() != null) {
-                getWidget().calendar
-                        .setDate((Date) getWidget()
-                                .getCurrentDate().clone());
+                getWidget().calendar.setDate((Date) getWidget()
+                        .getCurrentDate().clone());
                 // force re-render when changing resolution only
                 getWidget().calendar.renderCalendar();
             }
         }
-        getWidget().calendarToggle
-                .setEnabled(getWidget().enabled);
+        getWidget().calendarToggle.setEnabled(getWidget().enabled);
 
         if (getWidget().currentResolution <= VPopupCalendar.RESOLUTION_MONTH) {
             getWidget().calendar
@@ -70,8 +65,7 @@ public class VPopupCalendarPaintable extends VTextualDatePaintable {
                         public void focusChanged(Date date) {
                             getWidget().updateValue(date);
                             getWidget().buildDate();
-                            Date date2 = getWidget().calendar
-                                    .getDate();
+                            Date date2 = getWidget().calendar.getDate();
                             date2.setYear(date.getYear());
                             date2.setMonth(date.getMonth());
                         }
@@ -89,8 +83,8 @@ public class VPopupCalendarPaintable extends VTextualDatePaintable {
                                 // date currently null, use the value from
                                 // calendarPanel
                                 // (~ client time at the init of the widget)
-                                d = (Date) getWidget().calendar
-                                        .getDate().clone();
+                                d = (Date) getWidget().calendar.getDate()
+                                        .clone();
                             }
                             d.setHours(hour);
                             d.setMinutes(min);
@@ -107,12 +101,11 @@ public class VPopupCalendarPaintable extends VTextualDatePaintable {
         }
 
         if (getWidget().readonly) {
-            getWidget().calendarToggle
-                    .addStyleName(VPopupCalendar.CLASSNAME + "-button-readonly");
+            getWidget().calendarToggle.addStyleName(VPopupCalendar.CLASSNAME
+                    + "-button-readonly");
         } else {
-            getWidget().calendarToggle
-                    .removeStyleName(VPopupCalendar.CLASSNAME
-                            + "-button-readonly");
+            getWidget().calendarToggle.removeStyleName(VPopupCalendar.CLASSNAME
+                    + "-button-readonly");
         }
 
         getWidget().calendarToggle.setEnabled(true);
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupViewPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/PopupViewConnector.java
index 0950d31806..9211f50722 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VPopupViewPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/PopupViewConnector.java
@@ -11,7 +11,7 @@ import com.vaadin.terminal.gwt.client.VCaption;
 import com.vaadin.terminal.gwt.client.VCaptionWrapper;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 
-public class VPopupViewPaintable extends AbstractComponentContainerConnector {
+public class PopupViewConnector extends AbstractComponentContainerConnector {
 
     @Override
     protected boolean delegateCaptionHandling() {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VProgressIndicatorPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/ProgressIndicatorConnector.java
index 93fe850430..1d48bf6017 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VProgressIndicatorPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ProgressIndicatorConnector.java
@@ -10,7 +10,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
 
-public class VProgressIndicatorPaintable extends AbstractComponentConnector {
+public class ProgressIndicatorConnector extends AbstractComponentConnector {
 
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VViewPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java
index d26c5b71f5..c495ce5a2b 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VViewPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java
@@ -20,16 +20,16 @@ import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.ComponentConnector;
+import com.vaadin.terminal.gwt.client.ConnectorMap;
 import com.vaadin.terminal.gwt.client.Focusable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
 
-public class VViewPaintable extends AbstractComponentContainerConnector {
+public class RootConnector extends AbstractComponentContainerConnector {
 
-    private static final String CLICK_EVENT_IDENTIFIER = VPanelPaintable.CLICK_EVENT_IDENTIFIER;
+    private static final String CLICK_EVENT_IDENTIFIER = PanelConnector.CLICK_EVENT_IDENTIFIER;
 
     @Override
     public void updateFromUIDL(final UIDL uidl, ApplicationConnection client) {
@@ -42,11 +42,9 @@ public class VViewPaintable extends AbstractComponentContainerConnector {
         getWidget().connection = client;
 
         getWidget().immediate = getState().isImmediate();
-        getWidget().resizeLazy = uidl
-                .hasAttribute(VView.RESIZE_LAZY);
+        getWidget().resizeLazy = uidl.hasAttribute(VView.RESIZE_LAZY);
         String newTheme = uidl.getStringAttribute("theme");
-        if (getWidget().theme != null
-                && !newTheme.equals(getWidget().theme)) {
+        if (getWidget().theme != null && !newTheme.equals(getWidget().theme)) {
             // Complete page refresh is needed due css can affect layout
             // calculations etc
             getWidget().reloadHostPage();
@@ -54,14 +52,14 @@ public class VViewPaintable extends AbstractComponentContainerConnector {
             getWidget().theme = newTheme;
         }
         // this also implicitly removes old styles
-        getWidget().setStyleName(
-                getWidget().getStylePrimaryName() + " "
-                        + getState().getStyle());
+        getWidget()
+                .setStyleName(
+                        getWidget().getStylePrimaryName() + " "
+                                + getState().getStyle());
 
         clickEventHandler.handleEventHandlerRegistration(client);
 
-        if (!getWidget().isEmbedded()
-                && getState().getCaption() != null) {
+        if (!getWidget().isEmbedded() && getState().getCaption() != null) {
             // only change window title if we're in charge of the whole page
             com.google.gwt.user.client.Window.setTitle(getState().getCaption());
         }
@@ -155,8 +153,7 @@ public class VViewPaintable extends AbstractComponentContainerConnector {
                     getWidget().actionHandler = new ShortcutActionHandler(
                             getWidget().id, client);
                 }
-                getWidget().actionHandler
-                        .updateActionMap(childUidl);
+                getWidget().actionHandler.updateActionMap(childUidl);
             } else if (tag == "execJS") {
                 String script = childUidl.getStringAttribute("script");
                 VView.eval(script);
@@ -168,7 +165,7 @@ public class VViewPaintable extends AbstractComponentContainerConnector {
                 }
             } else {
                 // subwindows
-                final VWindowPaintable w = (VWindowPaintable) client
+                final WindowConnector w = (WindowConnector) client
                         .getPaintable(childUidl);
                 VWindow windowWidget = w.getWidget();
                 if (getWidget().subWindows.contains(windowWidget)) {
@@ -197,8 +194,7 @@ public class VViewPaintable extends AbstractComponentContainerConnector {
                     ComponentConnector paintable = (ComponentConnector) uidl
                             .getPaintableAttribute("focused", getConnection());
 
-                    final Widget toBeFocused = paintable
-                            .getWidget();
+                    final Widget toBeFocused = paintable.getWidget();
                     /*
                      * Two types of Widgets can be focused, either implementing
                      * GWT HasFocus of a thinner Vaadin specific Focusable
@@ -228,14 +224,12 @@ public class VViewPaintable extends AbstractComponentContainerConnector {
         // finally set scroll position from UIDL
         if (uidl.hasVariable("scrollTop")) {
             getWidget().scrollable = true;
-            getWidget().scrollTop = uidl
-                    .getIntVariable("scrollTop");
-            DOM.setElementPropertyInt(getWidget().getElement(),
-                    "scrollTop", getWidget().scrollTop);
-            getWidget().scrollLeft = uidl
-                    .getIntVariable("scrollLeft");
-            DOM.setElementPropertyInt(getWidget().getElement(),
-                    "scrollLeft", getWidget().scrollLeft);
+            getWidget().scrollTop = uidl.getIntVariable("scrollTop");
+            DOM.setElementPropertyInt(getWidget().getElement(), "scrollTop",
+                    getWidget().scrollTop);
+            getWidget().scrollLeft = uidl.getIntVariable("scrollLeft");
+            DOM.setElementPropertyInt(getWidget().getElement(), "scrollLeft",
+                    getWidget().scrollLeft);
         } else {
             getWidget().scrollable = false;
         }
@@ -251,8 +245,7 @@ public class VViewPaintable extends AbstractComponentContainerConnector {
         if (uidl.hasAttribute(VView.FRAGMENT_VARIABLE)) {
             getWidget().currentFragment = uidl
                     .getStringAttribute(VView.FRAGMENT_VARIABLE);
-            if (!getWidget().currentFragment.equals(History
-                    .getToken())) {
+            if (!getWidget().currentFragment.equals(History.getToken())) {
                 History.newItem(getWidget().currentFragment, true);
             }
         } else {
@@ -261,8 +254,7 @@ public class VViewPaintable extends AbstractComponentContainerConnector {
             getWidget().currentFragment = History.getToken();
 
             // Include current fragment in the next request
-            client.updateVariable(getWidget().id,
-                    VView.FRAGMENT_VARIABLE,
+            client.updateVariable(getWidget().id, VView.FRAGMENT_VARIABLE,
                     getWidget().currentFragment, false);
         }
 
@@ -276,8 +268,7 @@ public class VViewPaintable extends AbstractComponentContainerConnector {
 
         // iview is focused when created so element needs tabIndex
         // 1 due 0 is at the end of natural tabbing order
-        DOM.setElementProperty(getWidget().getElement(),
-                "tabIndex", "1");
+        DOM.setElementProperty(getWidget().getElement(), "tabIndex", "1");
 
         RootPanel root = RootPanel.get(rootPanelId);
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VSliderPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/SliderConnector.java
index 96df1a81a5..d1fac2ecbe 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VSliderPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/SliderConnector.java
@@ -10,7 +10,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
 
-public class VSliderPaintable extends AbstractComponentConnector {
+public class SliderConnector extends AbstractComponentConnector {
 
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTablePaintable.java b/src/com/vaadin/terminal/gwt/client/ui/TableConnector.java
index 80df4e41b0..df762ef24e 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTablePaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/TableConnector.java
@@ -15,7 +15,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 
-public class VScrollTablePaintable extends AbstractComponentContainerConnector
+public class TableConnector extends AbstractComponentContainerConnector
         implements DirectionalManagedLayout {
 
     /*
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTabsheetBasePaintable.java b/src/com/vaadin/terminal/gwt/client/ui/TabsheetBaseConnector.java
index 389b347e37..3475f2d716 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTabsheetBasePaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/TabsheetBaseConnector.java
@@ -8,11 +8,11 @@ import java.util.Iterator;
 
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
+import com.vaadin.terminal.gwt.client.ConnectorMap;
+import com.vaadin.terminal.gwt.client.UIDL;
 
-public abstract class VTabsheetBasePaintable extends
+public abstract class TabsheetBaseConnector extends
         AbstractComponentContainerConnector {
 
     public static final String ATTRIBUTE_TAB_DISABLED = "disabled";
@@ -38,8 +38,8 @@ public abstract class VTabsheetBasePaintable extends
 
         // Paintables in the TabSheet before update
         ArrayList<Widget> oldWidgets = new ArrayList<Widget>();
-        for (Iterator<Widget> iterator = getWidget()
-                .getWidgetIterator(); iterator.hasNext();) {
+        for (Iterator<Widget> iterator = getWidget().getWidgetIterator(); iterator
+                .hasNext();) {
             oldWidgets.add(iterator.next());
         }
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTabsheetPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/TabsheetConnector.java
index c4b3a6065f..ad53bae4f4 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTabsheetPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/TabsheetConnector.java
@@ -7,10 +7,10 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
+import com.vaadin.terminal.gwt.client.UIDL;
 
-public class VTabsheetPaintable extends VTabsheetBasePaintable implements
+public class TabsheetConnector extends TabsheetBaseConnector implements
         SimpleManagedLayout {
 
     @Override
@@ -33,13 +33,11 @@ public class VTabsheetPaintable extends VTabsheetBasePaintable implements
             // and then back to original width
             // update width later, in updateTabScroller();
             DOM.setStyleAttribute(getWidget().tabs, "width", "1px");
-            DOM.setStyleAttribute(getWidget().tabs, "overflow",
-                    "hidden");
+            DOM.setStyleAttribute(getWidget().tabs, "overflow", "hidden");
         } else {
             getWidget().showAllTabs();
             DOM.setStyleAttribute(getWidget().tabs, "width", "");
-            DOM.setStyleAttribute(getWidget().tabs, "overflow",
-                    "visible");
+            DOM.setStyleAttribute(getWidget().tabs, "overflow", "visible");
             getWidget().updateDynamicWidth();
         }
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextAreaPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/TextAreaConnector.java
index c9e573c659..d5dc6dea4e 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTextAreaPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/TextAreaConnector.java
@@ -10,7 +10,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
 
-public class VTextAreaPaintable extends VTextFieldPaintable {
+public class TextAreaConnector extends TextFieldConnector {
 
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextFieldPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/TextFieldConnector.java
index a2908c4ab2..ae2b9253c1 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTextFieldPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/TextFieldConnector.java
@@ -13,7 +13,7 @@ import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutActionListener;
 
-public class VTextFieldPaintable extends AbstractComponentConnector implements
+public class TextFieldConnector extends AbstractComponentConnector implements
         BeforeShortcutActionListener {
 
     @Override
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextualDatePaintable.java b/src/com/vaadin/terminal/gwt/client/ui/TextualDateConnector.java
index eb5e503903..bb833dcaf5 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTextualDatePaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/TextualDateConnector.java
@@ -9,7 +9,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
 
-public class VTextualDatePaintable extends VDateFieldPaintable {
+public class TextualDateConnector extends AbstractDateFieldConnector {
 
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTreePaintable.java b/src/com/vaadin/terminal/gwt/client/ui/TreeConnector.java
index 4cbcc666b6..1b88c63b74 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTreePaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/TreeConnector.java
@@ -12,7 +12,7 @@ import com.vaadin.terminal.gwt.client.TooltipInfo;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ui.VTree.TreeNode;
 
-public class VTreePaintable extends AbstractComponentConnector {
+public class TreeConnector extends AbstractComponentConnector {
 
     public static final String ATTRIBUTE_NODE_STYLE = "style";
     public static final String ATTRIBUTE_NODE_CAPTION = "caption";
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTreeTablePaintable.java b/src/com/vaadin/terminal/gwt/client/ui/TreeTableConnector.java
index f597d89b19..575eea0288 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTreeTablePaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/TreeTableConnector.java
@@ -10,7 +10,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ui.VScrollTable.VScrollTableBody.VScrollTableRow;
 import com.vaadin.terminal.gwt.client.ui.VTreeTable.PendingNavigationEvent;
 
-public class VTreeTablePaintable extends VScrollTablePaintable {
+public class TreeTableConnector extends TableConnector {
     public static final String ATTRIBUTE_HIERARCHY_COLUMN_INDEX = "hci";
 
     @Override
@@ -18,12 +18,10 @@ public class VTreeTablePaintable extends VScrollTablePaintable {
         FocusableScrollPanel widget = null;
         int scrollPosition = 0;
         if (getWidget().collapseRequest) {
-            widget = (FocusableScrollPanel) getWidget()
-                    .getWidget(1);
+            widget = (FocusableScrollPanel) getWidget().getWidget(1);
             scrollPosition = widget.getScrollPosition();
         }
-        getWidget().animationsEnabled = uidl
-                .getBooleanAttribute("animate");
+        getWidget().animationsEnabled = uidl.getBooleanAttribute("animate");
         getWidget().colIndexOfHierarchy = uidl
                 .hasAttribute(ATTRIBUTE_HIERARCHY_COLUMN_INDEX) ? uidl
                 .getIntAttribute(ATTRIBUTE_HIERARCHY_COLUMN_INDEX) : 0;
@@ -32,9 +30,8 @@ public class VTreeTablePaintable extends VScrollTablePaintable {
         if (getWidget().collapseRequest) {
             if (getWidget().collapsedRowKey != null
                     && getWidget().scrollBody != null) {
-                VScrollTableRow row = getWidget()
-                        .getRenderedRowByKey(
-                                getWidget().collapsedRowKey);
+                VScrollTableRow row = getWidget().getRenderedRowByKey(
+                        getWidget().collapsedRowKey);
                 if (row != null) {
                     getWidget().setRowFocus(row);
                     getWidget().focus();
@@ -67,8 +64,7 @@ public class VTreeTablePaintable extends VScrollTablePaintable {
         }
         if (uidl.hasAttribute("focusedRow")) {
             String key = uidl.getStringAttribute("focusedRow");
-            getWidget().setRowFocus(
-                    getWidget().getRenderedRowByKey(key));
+            getWidget().setRowFocus(getWidget().getRenderedRowByKey(key));
             getWidget().focusParentResponsePending = false;
         } else if (uidl.hasAttribute("clearFocusPending")) {
             // Special case to detect a response to a focusParent request that
@@ -84,8 +80,8 @@ public class VTreeTablePaintable extends VScrollTablePaintable {
             // potential content changes pending
             PendingNavigationEvent event = getWidget().pendingNavigationEvents
                     .removeFirst();
-            getWidget().handleNavigation(event.keycode, event.ctrl,
-                    event.shift);
+            getWidget()
+                    .handleNavigation(event.keycode, event.ctrl, event.shift);
         }
     }
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelectPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/TwinColSelectConnector.java
index 663861c376..89a526a95c 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelectPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/TwinColSelectConnector.java
@@ -9,7 +9,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
 
-public class VTwinColSelectPaintable extends VOptionGroupBasePaintable {
+public class TwinColSelectConnector extends OptionGroupBaseConnector {
 
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VUnknownComponentPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/UnknownComponentConnector.java
index 289e4c7668..ae8ab78252 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VUnknownComponentPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/UnknownComponentConnector.java
@@ -10,7 +10,7 @@ import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.VUIDLBrowser;
 
-public class VUnknownComponentPaintable extends AbstractComponentConnector {
+public class UnknownComponentConnector extends AbstractComponentConnector {
 
     @Override
     protected boolean delegateCaptionHandling() {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VUploadPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/UploadConnector.java
index 92ab5b071a..1a98c84c91 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VUploadPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/UploadConnector.java
@@ -9,7 +9,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
 
-public class VUploadPaintable extends AbstractComponentConnector {
+public class UploadConnector extends AbstractComponentConnector {
 
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java b/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java
index d2b601f42a..13886cd621 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java
@@ -441,9 +441,9 @@ public class VAccordion extends VTabsheetBase {
             // TODO need to call this because the caption does not have an owner
             caption.updateCaptionWithoutOwner(
                     uidl,
-                    uidl.getStringAttribute(VTabsheetBasePaintable.ATTRIBUTE_TAB_CAPTION),
-                    uidl.hasAttribute(VTabsheetBasePaintable.ATTRIBUTE_TAB_DISABLED),
-                    uidl.hasAttribute(VTabsheetBasePaintable.ATTRIBUTE_TAB_DESCRIPTION));
+                    uidl.getStringAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_CAPTION),
+                    uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_DISABLED),
+                    uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_DESCRIPTION));
         }
 
         public int getWidgetWidth() {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VButton.java b/src/com/vaadin/terminal/gwt/client/ui/VButton.java
index 60a6a895e6..bd287f048f 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VButton.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VButton.java
@@ -25,7 +25,7 @@ import com.vaadin.terminal.gwt.client.EventId;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.VTooltip;
-import com.vaadin.terminal.gwt.client.ui.VButtonPaintable.ButtonClientToServerRpc;
+import com.vaadin.terminal.gwt.client.ui.ButtonConnector.ButtonClientToServerRpc;
 
 public class VButton extends FocusWidget implements ClickHandler, FocusHandler,
         BlurHandler {
@@ -88,7 +88,7 @@ public class VButton extends FocusWidget implements ClickHandler, FocusHandler,
     protected HandlerRegistration blurHandlerRegistration;
 
     protected int clickShortcut = 0;
-    //TODO Move this to VButtonPaintable
+    // TODO Move this to VButtonPaintable
     ButtonClientToServerRpc buttonRpcProxy;
 
     public VButton() {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
index 2b466aec77..dbffcc1f0b 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
@@ -24,7 +24,7 @@ import com.vaadin.terminal.gwt.client.VCaption;
 import com.vaadin.terminal.gwt.client.ConnectorMap;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.ui.layout.VLayoutSlot;
-import com.vaadin.terminal.gwt.client.ui.layout.VPaintableLayoutSlot;
+import com.vaadin.terminal.gwt.client.ui.layout.ComponentConnectorLayoutSlot;
 
 public class VGridLayout extends ComplexPanel {
 
@@ -528,7 +528,7 @@ public class VGridLayout extends ComplexPanel {
 
         private AlignmentInfo alignment;
 
-        VPaintableLayoutSlot slot;
+        ComponentConnectorLayoutSlot slot;
 
         public void updateFromUidl(UIDL cellUidl) {
             // Set cell width
@@ -554,7 +554,7 @@ public class VGridLayout extends ComplexPanel {
                 ComponentConnector paintable = client.getPaintable(childUidl);
 
                 if (slot == null || slot.getPaintable() != paintable) {
-                    slot = new VPaintableLayoutSlot(CLASSNAME, paintable);
+                    slot = new ComponentConnectorLayoutSlot(CLASSNAME, paintable);
                     Element slotWrapper = slot.getWrapperElement();
                     getElement().appendChild(slotWrapper);
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java b/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
index 039acbd342..e9bbcc6984 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
@@ -21,7 +21,7 @@ import com.vaadin.terminal.gwt.client.EventId;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.VTooltip;
-import com.vaadin.terminal.gwt.client.ui.VButtonPaintable.ButtonClientToServerRpc;
+import com.vaadin.terminal.gwt.client.ui.ButtonConnector.ButtonClientToServerRpc;
 
 public class VNativeButton extends Button implements ClickHandler,
         FocusHandler, BlurHandler {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
index fcca633cef..3b3f581a51 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
@@ -196,12 +196,12 @@ public class VTabsheet extends VTabsheetBase {
 
         @Override
         public boolean updateCaption(UIDL uidl) {
-            if (uidl.hasAttribute(VTabsheetBasePaintable.ATTRIBUTE_TAB_DESCRIPTION)
+            if (uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_DESCRIPTION)
                     || uidl.hasAttribute(AbstractComponentConnector.ATTRIBUTE_ERROR)) {
                 TooltipInfo tooltipInfo = new TooltipInfo();
                 tooltipInfo
                         .setTitle(uidl
-                                .getStringAttribute(VTabsheetBasePaintable.ATTRIBUTE_TAB_DESCRIPTION));
+                                .getStringAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_DESCRIPTION));
                 if (uidl.hasAttribute(AbstractComponentConnector.ATTRIBUTE_ERROR)) {
                     tooltipInfo.setErrorUidl(uidl.getErrors());
                 }
@@ -215,9 +215,9 @@ public class VTabsheet extends VTabsheetBase {
             // not have an owner
             boolean ret = updateCaptionWithoutOwner(
                     uidl,
-                    uidl.getStringAttribute(VTabsheetBasePaintable.ATTRIBUTE_TAB_CAPTION),
-                    uidl.hasAttribute(VTabsheetBasePaintable.ATTRIBUTE_TAB_DISABLED),
-                    uidl.hasAttribute(VTabsheetBasePaintable.ATTRIBUTE_TAB_DESCRIPTION));
+                    uidl.getStringAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_CAPTION),
+                    uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_DISABLED),
+                    uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_DESCRIPTION));
 
             setClosable(uidl.hasAttribute("closable"));
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VVerticalLayoutPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/VerticalLayoutConnector.java
index a65d1ec777..0d17186786 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VVerticalLayoutPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VerticalLayoutConnector.java
@@ -5,7 +5,7 @@ package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.core.client.GWT;
 
-public class VVerticalLayoutPaintable extends VMeasuringOrderedLayoutPaintable {
+public class VerticalLayoutConnector extends AbstractOrderedLayoutConnector {
 
     @Override
     public VVerticalLayout getWidget() {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VVerticalSplitPanelPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/VerticalSplitPanelConnector.java
index a2dc1fbbb2..26e393f5d6 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VVerticalSplitPanelPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VerticalSplitPanelConnector.java
@@ -5,7 +5,7 @@ package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.core.client.GWT;
 
-public class VVerticalSplitPanelPaintable extends VAbstractSplitPanelPaintable {
+public class VerticalSplitPanelConnector extends AbstractSplitPanelConnector {
 
     @Override
     protected VAbstractSplitPanel createWidget() {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VVideoPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/VideoConnector.java
index 647fd7d87d..c4e3555b07 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VVideoPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VideoConnector.java
@@ -8,7 +8,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
 
-public class VVideoPaintable extends VMediaBasePaintable {
+public class VideoConnector extends MediaBaseConnector {
     public static final String ATTR_POSTER = "poster";
 
     @Override
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VWindowPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java
index b27114aef8..4af4c0fc77 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VWindowPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java
@@ -18,11 +18,11 @@ import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutActionListener;
 
-public class VWindowPaintable extends AbstractComponentContainerConnector
+public class WindowConnector extends AbstractComponentContainerConnector
         implements BeforeShortcutActionListener, SimpleManagedLayout,
         PostLayoutListener {
 
-    private static final String CLICK_EVENT_IDENTIFIER = VPanelPaintable.CLICK_EVENT_IDENTIFIER;
+    private static final String CLICK_EVENT_IDENTIFIER = PanelConnector.CLICK_EVENT_IDENTIFIER;
 
     private ClickEventHandler clickEventHandler = new ClickEventHandler(this,
             CLICK_EVENT_IDENTIFIER) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/label/VLabelPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/label/LabelConnector.java
index 5b7ce96cab..d76afaf962 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/label/VLabelPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/label/LabelConnector.java
@@ -12,8 +12,8 @@ import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
 
-public class VLabelPaintable extends AbstractComponentConnector {
-    public VLabelPaintable() {
+public class LabelConnector extends AbstractComponentConnector {
+    public LabelConnector() {
     }
 
     @Override
@@ -47,11 +47,9 @@ public class VLabelPaintable extends AbstractComponentConnector {
             }
             sinkOnloads = true;
         } else if ("xml".equals(mode)) {
-            getWidget().setHTML(
-                    uidl.getChildUIDL(0).getChildString(0));
+            getWidget().setHTML(uidl.getChildUIDL(0).getChildString(0));
         } else if ("raw".equals(mode)) {
-            getWidget().setHTML(
-                    uidl.getChildUIDL(0).getChildString(0));
+            getWidget().setHTML(uidl.getChildUIDL(0).getChildString(0));
             sinkOnloads = true;
         } else {
             getWidget().setText("");
diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/VPaintableLayoutSlot.java b/src/com/vaadin/terminal/gwt/client/ui/layout/ComponentConnectorLayoutSlot.java
index 4d1b607460..33210b69f8 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/layout/VPaintableLayoutSlot.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/layout/ComponentConnectorLayoutSlot.java
@@ -8,12 +8,12 @@ import com.vaadin.terminal.gwt.client.VCaption;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.ui.ManagedLayout;
 
-public class VPaintableLayoutSlot extends VLayoutSlot {
+public class ComponentConnectorLayoutSlot extends VLayoutSlot {
 
     final ComponentConnector paintable;
     private LayoutManager layoutManager;
 
-    public VPaintableLayoutSlot(String baseClassName, ComponentConnector paintable) {
+    public ComponentConnectorLayoutSlot(String baseClassName, ComponentConnector paintable) {
         super(baseClassName, paintable.getWidget());
         this.paintable = paintable;
         layoutManager = paintable.getLayoutManager();
diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextAreaPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/RichTextAreaConnector.java
index c4ef733662..da32c1730e 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextAreaPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/RichTextAreaConnector.java
@@ -8,10 +8,10 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutActionListener;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
+import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutActionListener;
 
-public class VRichTextAreaPaintable extends AbstractComponentConnector implements
+public class RichTextAreaConnector extends AbstractComponentConnector implements
         BeforeShortcutActionListener {
 
     @Override
@@ -20,14 +20,11 @@ public class VRichTextAreaPaintable extends AbstractComponentConnector implement
         getWidget().id = uidl.getId();
 
         if (uidl.hasVariable("text")) {
-            getWidget().currentValue = uidl
-                    .getStringVariable("text");
+            getWidget().currentValue = uidl.getStringVariable("text");
             if (getWidget().rta.isAttached()) {
-                getWidget().rta
-                        .setHTML(getWidget().currentValue);
+                getWidget().rta.setHTML(getWidget().currentValue);
             } else {
-                getWidget().html
-                        .setHTML(getWidget().currentValue);
+                getWidget().html.setHTML(getWidget().currentValue);
             }
         }
         if (isRealUpdate(uidl)) {
diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java
index 0ae8e47df3..266b919c86 100644
--- a/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java
+++ b/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java
@@ -24,7 +24,8 @@ import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
 import com.google.gwt.user.rebind.SourceWriter;
 import com.vaadin.terminal.Paintable;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.VViewPaintable;
+import com.vaadin.terminal.gwt.client.ui.RootConnector;
+import com.vaadin.terminal.gwt.client.ui.UnknownComponentConnector;
 import com.vaadin.ui.ClientWidget;
 import com.vaadin.ui.ClientWidget.LoadStyle;
 import com.vaadin.ui.Root;
@@ -71,7 +72,8 @@ import com.vaadin.ui.Root;
  */
 public class WidgetMapGenerator extends Generator {
 
-    private static String paintableClassName = ComponentConnector.class.getName();
+    private static String paintableClassName = ComponentConnector.class
+            .getName();
 
     private String packageName;
     private String className;
@@ -258,8 +260,8 @@ public class WidgetMapGenerator extends Generator {
             if (widgetsWithInstantiator.contains(clientClass)) {
                 continue;
             }
-            if (clientClass == VViewPaintable.class) {
-                // VView's are not instantiated by widgetset
+            if (clientClass == RootConnector.class) {
+                // Roots are not instantiated by widgetset
                 continue;
             }
             if (!first) {
@@ -373,8 +375,8 @@ public class WidgetMapGenerator extends Generator {
             sourceWriter.println(".class;}");
             sourceWriter.print("else ");
         }
-        sourceWriter
-                .println("return com.vaadin.terminal.gwt.client.ui.VUnknownComponentPaintable.class;");
+        sourceWriter.println("return "
+                + UnknownComponentConnector.class.getName() + ".class;");
         sourceWriter.outdent();
         sourceWriter.println("}");
 
@@ -384,7 +386,7 @@ public class WidgetMapGenerator extends Generator {
             Class<? extends Paintable> class1) {
         Class<? extends com.vaadin.terminal.gwt.client.ComponentConnector> clientClass;
         if (Root.class == class1) {
-            clientClass = VViewPaintable.class;
+            clientClass = RootConnector.class;
         } else {
             ClientWidget annotation = class1.getAnnotation(ClientWidget.class);
             clientClass = annotation.value();
diff --git a/src/com/vaadin/ui/AbsoluteLayout.java b/src/com/vaadin/ui/AbsoluteLayout.java
index c75073c02b..ca9f8405b9 100644
--- a/src/com/vaadin/ui/AbsoluteLayout.java
+++ b/src/com/vaadin/ui/AbsoluteLayout.java
@@ -17,7 +17,7 @@ import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Sizeable;
 import com.vaadin.terminal.gwt.client.EventId;
-import com.vaadin.terminal.gwt.client.ui.VAbsoluteLayoutPaintable;
+import com.vaadin.terminal.gwt.client.ui.AbsoluteLayoutConnector;
 
 /**
  * AbsoluteLayout is a layout implementation that mimics html absolute
@@ -25,7 +25,7 @@ import com.vaadin.terminal.gwt.client.ui.VAbsoluteLayoutPaintable;
  * 
  */
 @SuppressWarnings("serial")
-@ClientWidget(VAbsoluteLayoutPaintable.class)
+@ClientWidget(AbsoluteLayoutConnector.class)
 public class AbsoluteLayout extends AbstractLayout implements
         LayoutClickNotifier {
 
diff --git a/src/com/vaadin/ui/AbstractMedia.java b/src/com/vaadin/ui/AbstractMedia.java
index 369ef773b9..3c02d73858 100644
--- a/src/com/vaadin/ui/AbstractMedia.java
+++ b/src/com/vaadin/ui/AbstractMedia.java
@@ -12,7 +12,7 @@ import java.util.List;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.gwt.client.ui.VMediaBasePaintable;
+import com.vaadin.terminal.gwt.client.ui.MediaBaseConnector;
 
 /**
  * Abstract base class for the HTML5 media components.
@@ -203,27 +203,27 @@ public class AbstractMedia extends AbstractComponent {
     @Override
     public void paintContent(PaintTarget target) throws PaintException {
         super.paintContent(target);
-        target.addAttribute(VMediaBasePaintable.ATTR_CONTROLS, isShowControls());
+        target.addAttribute(MediaBaseConnector.ATTR_CONTROLS, isShowControls());
         if (getAltText() != null) {
-            target.addAttribute(VMediaBasePaintable.ATTR_ALT_TEXT, getAltText());
+            target.addAttribute(MediaBaseConnector.ATTR_ALT_TEXT, getAltText());
         }
-        target.addAttribute(VMediaBasePaintable.ATTR_HTML,
+        target.addAttribute(MediaBaseConnector.ATTR_HTML,
                 isHtmlContentAllowed());
-        target.addAttribute(VMediaBasePaintable.ATTR_AUTOPLAY, isAutoplay());
+        target.addAttribute(MediaBaseConnector.ATTR_AUTOPLAY, isAutoplay());
         for (Resource r : getSources()) {
-            target.startTag(VMediaBasePaintable.TAG_SOURCE);
-            target.addAttribute(VMediaBasePaintable.ATTR_RESOURCE, r);
-            target.addAttribute(VMediaBasePaintable.ATTR_RESOURCE_TYPE,
+            target.startTag(MediaBaseConnector.TAG_SOURCE);
+            target.addAttribute(MediaBaseConnector.ATTR_RESOURCE, r);
+            target.addAttribute(MediaBaseConnector.ATTR_RESOURCE_TYPE,
                     r.getMIMEType());
-            target.endTag(VMediaBasePaintable.TAG_SOURCE);
+            target.endTag(MediaBaseConnector.TAG_SOURCE);
         }
-        target.addAttribute(VMediaBasePaintable.ATTR_MUTED, isMuted());
+        target.addAttribute(MediaBaseConnector.ATTR_MUTED, isMuted());
         if (play) {
-            target.addAttribute(VMediaBasePaintable.ATTR_PLAY, true);
+            target.addAttribute(MediaBaseConnector.ATTR_PLAY, true);
             play = false;
         }
         if (pause) {
-            target.addAttribute(VMediaBasePaintable.ATTR_PAUSE, true);
+            target.addAttribute(MediaBaseConnector.ATTR_PAUSE, true);
             pause = false;
         }
     }
diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java
index 47f132aa77..f069954869 100644
--- a/src/com/vaadin/ui/AbstractSelect.java
+++ b/src/com/vaadin/ui/AbstractSelect.java
@@ -35,6 +35,7 @@ import com.vaadin.terminal.Resource;
 import com.vaadin.terminal.gwt.client.ui.dd.VIsOverId;
 import com.vaadin.terminal.gwt.client.ui.dd.VItemIdIs;
 import com.vaadin.terminal.gwt.client.ui.dd.VerticalDropLocation;
+import com.vaadin.ui.AbstractSelect.ItemCaptionMode;
 
 /**
  * <p>
diff --git a/src/com/vaadin/ui/AbstractSplitPanel.java b/src/com/vaadin/ui/AbstractSplitPanel.java
index e03e73a781..6cbbcaf2e4 100644
--- a/src/com/vaadin/ui/AbstractSplitPanel.java
+++ b/src/com/vaadin/ui/AbstractSplitPanel.java
@@ -15,7 +15,7 @@ import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Sizeable;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
-import com.vaadin.terminal.gwt.client.ui.VAbstractSplitPanelPaintable;
+import com.vaadin.terminal.gwt.client.ui.AbstractSplitPanelConnector;
 import com.vaadin.tools.ReflectTools;
 
 /**
@@ -43,7 +43,7 @@ public abstract class AbstractSplitPanel extends AbstractLayout {
 
     private boolean locked = false;
 
-    private static final String SPLITTER_CLICK_EVENT = VAbstractSplitPanelPaintable.SPLITTER_CLICK_EVENT_IDENTIFIER;
+    private static final String SPLITTER_CLICK_EVENT = AbstractSplitPanelConnector.SPLITTER_CLICK_EVENT_IDENTIFIER;
 
     /**
      * Modifiable and Serializable Iterator for the components, used by
diff --git a/src/com/vaadin/ui/Accordion.java b/src/com/vaadin/ui/Accordion.java
index 4ee75326ff..7efc2d47ec 100644
--- a/src/com/vaadin/ui/Accordion.java
+++ b/src/com/vaadin/ui/Accordion.java
@@ -3,7 +3,7 @@
  */
 package com.vaadin.ui;
 
-import com.vaadin.terminal.gwt.client.ui.VAccordionPaintable;
+import com.vaadin.terminal.gwt.client.ui.AccordionConnector;
 
 /**
  * An accordion is a component similar to a {@link TabSheet}, but with a
@@ -16,7 +16,7 @@ import com.vaadin.terminal.gwt.client.ui.VAccordionPaintable;
  * 
  * @see TabSheet
  */
-@ClientWidget(VAccordionPaintable.class)
+@ClientWidget(AccordionConnector.class)
 public class Accordion extends TabSheet {
 
 }
diff --git a/src/com/vaadin/ui/Audio.java b/src/com/vaadin/ui/Audio.java
index 048ef81c10..9759b130f6 100644
--- a/src/com/vaadin/ui/Audio.java
+++ b/src/com/vaadin/ui/Audio.java
@@ -5,7 +5,7 @@
 package com.vaadin.ui;
 
 import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.gwt.client.ui.VAudioPaintable;
+import com.vaadin.terminal.gwt.client.ui.AudioConnector;
 
 /**
  * The Audio component translates into an HTML5 &lt;audio&gt; element and as
@@ -28,7 +28,7 @@ import com.vaadin.terminal.gwt.client.ui.VAudioPaintable;
  * @author Vaadin Ltd
  * @since 6.7.0
  */
-@ClientWidget(VAudioPaintable.class)
+@ClientWidget(AudioConnector.class)
 public class Audio extends AbstractMedia {
 
     public Audio() {
diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java
index 61f3002bcc..eb84d852dd 100644
--- a/src/com/vaadin/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -20,9 +20,9 @@ import com.vaadin.event.ShortcutAction.ModifierKey;
 import com.vaadin.event.ShortcutListener;
 import com.vaadin.terminal.gwt.client.ComponentState;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.terminal.gwt.client.ui.ButtonConnector;
+import com.vaadin.terminal.gwt.client.ui.ButtonConnector.ButtonClientToServerRpc;
 import com.vaadin.terminal.gwt.client.ui.ButtonState;
-import com.vaadin.terminal.gwt.client.ui.VButtonPaintable;
-import com.vaadin.terminal.gwt.client.ui.VButtonPaintable.ButtonClientToServerRpc;
 import com.vaadin.terminal.gwt.server.RpcTarget;
 import com.vaadin.tools.ReflectTools;
 import com.vaadin.ui.ClientWidget.LoadStyle;
@@ -37,7 +37,7 @@ import com.vaadin.ui.Component.Focusable;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-@ClientWidget(value = VButtonPaintable.class, loadStyle = LoadStyle.EAGER)
+@ClientWidget(value = ButtonConnector.class, loadStyle = LoadStyle.EAGER)
 public class Button extends AbstractComponent implements
         FieldEvents.BlurNotifier, FieldEvents.FocusNotifier, Focusable,
         Action.ShortcutNotifier, RpcTarget {
diff --git a/src/com/vaadin/ui/CheckBox.java b/src/com/vaadin/ui/CheckBox.java
index 9dc96bb55d..8cc4a7f1eb 100644
--- a/src/com/vaadin/ui/CheckBox.java
+++ b/src/com/vaadin/ui/CheckBox.java
@@ -13,9 +13,10 @@ import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.gwt.client.ui.CheckBoxConnector;
 import com.vaadin.terminal.gwt.client.ui.VCheckBox;
 
-@ClientWidget(com.vaadin.terminal.gwt.client.ui.VCheckBoxPaintable.class)
+@ClientWidget(CheckBoxConnector.class)
 public class CheckBox extends AbstractField<Boolean> {
     /**
      * Creates a new checkbox.
diff --git a/src/com/vaadin/ui/ComboBox.java b/src/com/vaadin/ui/ComboBox.java
index 12db8c18af..60349b0a43 100644
--- a/src/com/vaadin/ui/ComboBox.java
+++ b/src/com/vaadin/ui/ComboBox.java
@@ -9,8 +9,8 @@ import java.util.Collection;
 import com.vaadin.data.Container;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.gwt.client.ui.ComboBoxConnector;
 import com.vaadin.terminal.gwt.client.ui.VFilterSelect;
-import com.vaadin.terminal.gwt.client.ui.VFilterSelectPaintable;
 
 /**
  * A filtering dropdown single-select. Suitable for newItemsAllowed, but it's
@@ -21,7 +21,7 @@ import com.vaadin.terminal.gwt.client.ui.VFilterSelectPaintable;
  * 
  */
 @SuppressWarnings("serial")
-@ClientWidget(VFilterSelectPaintable.class)
+@ClientWidget(ComboBoxConnector.class)
 public class ComboBox extends Select {
 
     private String inputPrompt = null;
diff --git a/src/com/vaadin/ui/CssLayout.java b/src/com/vaadin/ui/CssLayout.java
index ebfee5a787..e3a081e23e 100644
--- a/src/com/vaadin/ui/CssLayout.java
+++ b/src/com/vaadin/ui/CssLayout.java
@@ -14,7 +14,7 @@ import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Paintable;
 import com.vaadin.terminal.gwt.client.EventId;
-import com.vaadin.terminal.gwt.client.ui.VCssLayoutPaintable;
+import com.vaadin.terminal.gwt.client.ui.CssLayoutConnector;
 
 /**
  * CssLayout is a layout component that can be used in browser environment only.
@@ -57,7 +57,7 @@ import com.vaadin.terminal.gwt.client.ui.VCssLayoutPaintable;
  * @since 6.1 brought in from "FastLayouts" incubator project
  * 
  */
-@ClientWidget(VCssLayoutPaintable.class)
+@ClientWidget(CssLayoutConnector.class)
 public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
 
     private static final String CLICK_EVENT = EventId.LAYOUT_CLICK;
diff --git a/src/com/vaadin/ui/CustomComponent.java b/src/com/vaadin/ui/CustomComponent.java
index 7aba34b6bb..c11a96101a 100644
--- a/src/com/vaadin/ui/CustomComponent.java
+++ b/src/com/vaadin/ui/CustomComponent.java
@@ -9,7 +9,7 @@ import java.util.Iterator;
 
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.gwt.client.ui.VCustomComponentPaintable;
+import com.vaadin.terminal.gwt.client.ui.CustomComponentConnector;
 import com.vaadin.ui.ClientWidget.LoadStyle;
 
 /**
@@ -27,7 +27,7 @@ import com.vaadin.ui.ClientWidget.LoadStyle;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-@ClientWidget(value = VCustomComponentPaintable.class, loadStyle = LoadStyle.EAGER)
+@ClientWidget(value = CustomComponentConnector.class, loadStyle = LoadStyle.EAGER)
 public class CustomComponent extends AbstractComponentContainer {
 
     /**
diff --git a/src/com/vaadin/ui/CustomField.java b/src/com/vaadin/ui/CustomField.java
index 73f9050363..5804c847af 100644
--- a/src/com/vaadin/ui/CustomField.java
+++ b/src/com/vaadin/ui/CustomField.java
@@ -11,7 +11,7 @@ import java.util.Iterator;
 import com.vaadin.data.Property;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.gwt.client.ui.VCustomComponentPaintable;
+import com.vaadin.terminal.gwt.client.ui.CustomComponentConnector;
 
 /**
  * A {@link Field} whose UI content can be constructed by the user, enabling the
@@ -35,7 +35,7 @@ import com.vaadin.terminal.gwt.client.ui.VCustomComponentPaintable;
  * 
  * @since 7.0
  */
-@ClientWidget(VCustomComponentPaintable.class)
+@ClientWidget(CustomComponentConnector.class)
 public abstract class CustomField<T> extends AbstractField<T> implements
         ComponentContainer {
 
diff --git a/src/com/vaadin/ui/CustomLayout.java b/src/com/vaadin/ui/CustomLayout.java
index fb0c369969..a97a317b9d 100644
--- a/src/com/vaadin/ui/CustomLayout.java
+++ b/src/com/vaadin/ui/CustomLayout.java
@@ -12,7 +12,7 @@ import java.util.Iterator;
 
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.gwt.client.ui.VCustomLayoutPaintable;
+import com.vaadin.terminal.gwt.client.ui.CustomLayoutConnector;
 
 /**
  * <p>
@@ -44,7 +44,7 @@ import com.vaadin.terminal.gwt.client.ui.VCustomLayoutPaintable;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-@ClientWidget(VCustomLayoutPaintable.class)
+@ClientWidget(CustomLayoutConnector.class)
 public class CustomLayout extends AbstractLayout {
 
     private static final int BUFFER_SIZE = 10000;
diff --git a/src/com/vaadin/ui/DateField.java b/src/com/vaadin/ui/DateField.java
index 9589414f4d..4e6be98f7a 100644
--- a/src/com/vaadin/ui/DateField.java
+++ b/src/com/vaadin/ui/DateField.java
@@ -26,8 +26,8 @@ import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.gwt.client.ui.PopupDateFieldConnector;
 import com.vaadin.terminal.gwt.client.ui.VDateField;
-import com.vaadin.terminal.gwt.client.ui.VPopupCalendarPaintable;
 
 /**
  * <p>
@@ -50,7 +50,7 @@ import com.vaadin.terminal.gwt.client.ui.VPopupCalendarPaintable;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-@ClientWidget(VPopupCalendarPaintable.class)
+@ClientWidget(PopupDateFieldConnector.class)
 public class DateField extends AbstractField<Date> implements
         FieldEvents.BlurNotifier, FieldEvents.FocusNotifier {
 
diff --git a/src/com/vaadin/ui/DragAndDropWrapper.java b/src/com/vaadin/ui/DragAndDropWrapper.java
index 512b70e118..dcefc545d9 100644
--- a/src/com/vaadin/ui/DragAndDropWrapper.java
+++ b/src/com/vaadin/ui/DragAndDropWrapper.java
@@ -21,13 +21,13 @@ import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.StreamVariable;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.terminal.gwt.client.ui.DragAndDropWrapperConnector;
 import com.vaadin.terminal.gwt.client.ui.VDragAndDropWrapper;
-import com.vaadin.terminal.gwt.client.ui.VDragAndDropWrapperPaintable;
 import com.vaadin.terminal.gwt.client.ui.dd.HorizontalDropLocation;
 import com.vaadin.terminal.gwt.client.ui.dd.VerticalDropLocation;
 
 @SuppressWarnings("serial")
-@ClientWidget(VDragAndDropWrapperPaintable.class)
+@ClientWidget(DragAndDropWrapperConnector.class)
 public class DragAndDropWrapper extends CustomComponent implements DropTarget,
         DragSource {
 
diff --git a/src/com/vaadin/ui/Embedded.java b/src/com/vaadin/ui/Embedded.java
index f655b55711..bc4c2a3ff4 100644
--- a/src/com/vaadin/ui/Embedded.java
+++ b/src/com/vaadin/ui/Embedded.java
@@ -14,7 +14,7 @@ import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Resource;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
-import com.vaadin.terminal.gwt.client.ui.VEmbeddedPaintable;
+import com.vaadin.terminal.gwt.client.ui.EmbeddedConnector;
 
 /**
  * Component for embedding external objects.
@@ -25,10 +25,10 @@ import com.vaadin.terminal.gwt.client.ui.VEmbeddedPaintable;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-@ClientWidget(VEmbeddedPaintable.class)
+@ClientWidget(EmbeddedConnector.class)
 public class Embedded extends AbstractComponent {
 
-    private static final String CLICK_EVENT = VEmbeddedPaintable.CLICK_EVENT_IDENTIFIER;
+    private static final String CLICK_EVENT = EmbeddedConnector.CLICK_EVENT_IDENTIFIER;
 
     /**
      * General object type.
diff --git a/src/com/vaadin/ui/Form.java b/src/com/vaadin/ui/Form.java
index dd3710cd2c..1e30eb94bf 100644
--- a/src/com/vaadin/ui/Form.java
+++ b/src/com/vaadin/ui/Form.java
@@ -27,7 +27,7 @@ import com.vaadin.terminal.CompositeErrorMessage;
 import com.vaadin.terminal.ErrorMessage;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.gwt.client.ui.VFormPaintable;
+import com.vaadin.terminal.gwt.client.ui.FormConnector;
 
 /**
  * Form component provides easy way of creating and managing sets fields.
@@ -62,7 +62,7 @@ import com.vaadin.terminal.gwt.client.ui.VFormPaintable;
  * @deprecated Use {@link FieldGroup} instead of {@link Form} for more
  *             flexibility.
  */
-@ClientWidget(VFormPaintable.class)
+@ClientWidget(FormConnector.class)
 @Deprecated
 public class Form extends AbstractField<Object> implements Item.Editor,
         Buffered, Item, Validatable, Action.Notifier {
diff --git a/src/com/vaadin/ui/FormLayout.java b/src/com/vaadin/ui/FormLayout.java
index c5c211924e..756c79a4b1 100644
--- a/src/com/vaadin/ui/FormLayout.java
+++ b/src/com/vaadin/ui/FormLayout.java
@@ -4,7 +4,7 @@
 
 package com.vaadin.ui;
 
-import com.vaadin.terminal.gwt.client.ui.VFormLayoutPaintable;
+import com.vaadin.terminal.gwt.client.ui.FormLayoutConnector;
 
 /**
  * FormLayout is used by {@link Form} to layout fields. It may also be used
@@ -21,7 +21,7 @@ import com.vaadin.terminal.gwt.client.ui.VFormLayoutPaintable;
  * bottom are by default on.
  * 
  */
-@ClientWidget(VFormLayoutPaintable.class)
+@ClientWidget(FormLayoutConnector.class)
 public class FormLayout extends AbstractOrderedLayout {
 
     public FormLayout() {
diff --git a/src/com/vaadin/ui/GridLayout.java b/src/com/vaadin/ui/GridLayout.java
index 4588328345..596773b870 100644
--- a/src/com/vaadin/ui/GridLayout.java
+++ b/src/com/vaadin/ui/GridLayout.java
@@ -18,7 +18,7 @@ import com.vaadin.event.LayoutEvents.LayoutClickNotifier;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.gwt.client.EventId;
-import com.vaadin.terminal.gwt.client.ui.VGridLayoutPaintable;
+import com.vaadin.terminal.gwt.client.ui.GridLayoutConnector;
 
 /**
  * <p>
@@ -41,7 +41,7 @@ import com.vaadin.terminal.gwt.client.ui.VGridLayoutPaintable;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-@ClientWidget(VGridLayoutPaintable.class)
+@ClientWidget(GridLayoutConnector.class)
 public class GridLayout extends AbstractLayout implements
         Layout.AlignmentHandler, Layout.SpacingHandler, LayoutClickNotifier {
 
diff --git a/src/com/vaadin/ui/HorizontalLayout.java b/src/com/vaadin/ui/HorizontalLayout.java
index ba685ec410..c053d711e2 100644
--- a/src/com/vaadin/ui/HorizontalLayout.java
+++ b/src/com/vaadin/ui/HorizontalLayout.java
@@ -3,7 +3,7 @@
  */
 package com.vaadin.ui;
 
-import com.vaadin.terminal.gwt.client.ui.VHorizontalLayoutPaintable;
+import com.vaadin.terminal.gwt.client.ui.HorizontalLayoutConnector;
 import com.vaadin.ui.ClientWidget.LoadStyle;
 
 /**
@@ -18,7 +18,7 @@ import com.vaadin.ui.ClientWidget.LoadStyle;
  * @since 5.3
  */
 @SuppressWarnings("serial")
-@ClientWidget(value = VHorizontalLayoutPaintable.class, loadStyle = LoadStyle.EAGER)
+@ClientWidget(value = HorizontalLayoutConnector.class, loadStyle = LoadStyle.EAGER)
 public class HorizontalLayout extends AbstractOrderedLayout {
 
     public HorizontalLayout() {
diff --git a/src/com/vaadin/ui/HorizontalSplitPanel.java b/src/com/vaadin/ui/HorizontalSplitPanel.java
index d4a1e7cc0e..db3223aa88 100644
--- a/src/com/vaadin/ui/HorizontalSplitPanel.java
+++ b/src/com/vaadin/ui/HorizontalSplitPanel.java
@@ -3,7 +3,7 @@
  */
 package com.vaadin.ui;
 
-import com.vaadin.terminal.gwt.client.ui.VHorizontalSplitPanelPaintable;
+import com.vaadin.terminal.gwt.client.ui.HorizontalSplitPanelConnector;
 import com.vaadin.ui.ClientWidget.LoadStyle;
 
 /**
@@ -29,7 +29,7 @@ import com.vaadin.ui.ClientWidget.LoadStyle;
  * @VERSION@
  * @since 6.5
  */
-@ClientWidget(value = VHorizontalSplitPanelPaintable.class, loadStyle = LoadStyle.EAGER)
+@ClientWidget(value = HorizontalSplitPanelConnector.class, loadStyle = LoadStyle.EAGER)
 public class HorizontalSplitPanel extends AbstractSplitPanel {
     public HorizontalSplitPanel() {
         super();
diff --git a/src/com/vaadin/ui/InlineDateField.java b/src/com/vaadin/ui/InlineDateField.java
index b4160604ff..3ae77dd856 100644
--- a/src/com/vaadin/ui/InlineDateField.java
+++ b/src/com/vaadin/ui/InlineDateField.java
@@ -7,7 +7,7 @@ package com.vaadin.ui;
 import java.util.Date;
 
 import com.vaadin.data.Property;
-import com.vaadin.terminal.gwt.client.ui.VDateFieldCalendarPaintable;
+import com.vaadin.terminal.gwt.client.ui.InlineDateFieldConnector;
 
 /**
  * <p>
@@ -22,7 +22,7 @@ import com.vaadin.terminal.gwt.client.ui.VDateFieldCalendarPaintable;
  * @VERSION@
  * @since 5.0
  */
-@ClientWidget(VDateFieldCalendarPaintable.class)
+@ClientWidget(InlineDateFieldConnector.class)
 public class InlineDateField extends DateField {
 
     public InlineDateField() {
diff --git a/src/com/vaadin/ui/Label.java b/src/com/vaadin/ui/Label.java
index 576bbd967f..3092faa251 100644
--- a/src/com/vaadin/ui/Label.java
+++ b/src/com/vaadin/ui/Label.java
@@ -10,7 +10,7 @@ import com.vaadin.data.Property;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.gwt.client.ui.label.VLabelPaintable;
+import com.vaadin.terminal.gwt.client.ui.label.LabelConnector;
 import com.vaadin.ui.ClientWidget.LoadStyle;
 
 /**
@@ -38,7 +38,7 @@ import com.vaadin.ui.ClientWidget.LoadStyle;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-@ClientWidget(value = VLabelPaintable.class, loadStyle = LoadStyle.EAGER)
+@ClientWidget(value = LabelConnector.class, loadStyle = LoadStyle.EAGER)
 // TODO generics for interface Property
 public class Label extends AbstractComponent implements Property,
         Property.Viewer, Property.ValueChangeListener,
diff --git a/src/com/vaadin/ui/Link.java b/src/com/vaadin/ui/Link.java
index 0b11151be7..3be5265bf3 100644
--- a/src/com/vaadin/ui/Link.java
+++ b/src/com/vaadin/ui/Link.java
@@ -7,7 +7,7 @@ package com.vaadin.ui;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.gwt.client.ui.VLinkPaintable;
+import com.vaadin.terminal.gwt.client.ui.LinkConnector;
 
 /**
  * Link is used to create external or internal URL links.
@@ -18,7 +18,7 @@ import com.vaadin.terminal.gwt.client.ui.VLinkPaintable;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-@ClientWidget(VLinkPaintable.class)
+@ClientWidget(LinkConnector.class)
 public class Link extends AbstractComponent {
 
     /* Target window border type constant: No window border */
diff --git a/src/com/vaadin/ui/ListSelect.java b/src/com/vaadin/ui/ListSelect.java
index cf0e6773f2..cf76babaca 100644
--- a/src/com/vaadin/ui/ListSelect.java
+++ b/src/com/vaadin/ui/ListSelect.java
@@ -9,14 +9,14 @@ import java.util.Collection;
 import com.vaadin.data.Container;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.gwt.client.ui.VListSelectPaintable;
+import com.vaadin.terminal.gwt.client.ui.ListSelectConnector;
 
 /**
  * This is a simple list select without, for instance, support for new items,
  * lazyloading, and other advanced features.
  */
 @SuppressWarnings("serial")
-@ClientWidget(VListSelectPaintable.class)
+@ClientWidget(ListSelectConnector.class)
 public class ListSelect extends AbstractSelect {
 
     private int columns = 0;
diff --git a/src/com/vaadin/ui/MenuBar.java b/src/com/vaadin/ui/MenuBar.java
index c9de432d7e..7d0d307daa 100644
--- a/src/com/vaadin/ui/MenuBar.java
+++ b/src/com/vaadin/ui/MenuBar.java
@@ -13,8 +13,8 @@ import java.util.Stack;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Resource;
+import com.vaadin.terminal.gwt.client.ui.MenuBarConnector;
 import com.vaadin.terminal.gwt.client.ui.VMenuBar;
-import com.vaadin.terminal.gwt.client.ui.VMenuBarPaintable;
 import com.vaadin.ui.ClientWidget.LoadStyle;
 
 /**
@@ -25,7 +25,7 @@ import com.vaadin.ui.ClientWidget.LoadStyle;
  * </p>
  */
 @SuppressWarnings("serial")
-@ClientWidget(value = VMenuBarPaintable.class, loadStyle = LoadStyle.LAZY)
+@ClientWidget(value = MenuBarConnector.class, loadStyle = LoadStyle.LAZY)
 public class MenuBar extends AbstractComponent {
 
     // Items of the top-level menu
diff --git a/src/com/vaadin/ui/NativeButton.java b/src/com/vaadin/ui/NativeButton.java
index b7b7fcb38c..ede63f6d78 100644
--- a/src/com/vaadin/ui/NativeButton.java
+++ b/src/com/vaadin/ui/NativeButton.java
@@ -3,10 +3,10 @@
  */
 package com.vaadin.ui;
 
-import com.vaadin.terminal.gwt.client.ui.VNativeButtonPaintable;
+import com.vaadin.terminal.gwt.client.ui.NativeButtonConnector;
 
 @SuppressWarnings("serial")
-@ClientWidget(VNativeButtonPaintable.class)
+@ClientWidget(NativeButtonConnector.class)
 public class NativeButton extends Button {
 
     public NativeButton() {
diff --git a/src/com/vaadin/ui/NativeSelect.java b/src/com/vaadin/ui/NativeSelect.java
index b0070426ad..e7db9aa3ec 100644
--- a/src/com/vaadin/ui/NativeSelect.java
+++ b/src/com/vaadin/ui/NativeSelect.java
@@ -9,7 +9,7 @@ import java.util.Collection;
 import com.vaadin.data.Container;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.gwt.client.ui.VNativeSelectPaintable;
+import com.vaadin.terminal.gwt.client.ui.NativeSelectConnector;
 
 /**
  * This is a simple drop-down select without, for instance, support for
@@ -18,7 +18,7 @@ import com.vaadin.terminal.gwt.client.ui.VNativeSelectPaintable;
  * better choice.
  */
 @SuppressWarnings("serial")
-@ClientWidget(VNativeSelectPaintable.class)
+@ClientWidget(NativeSelectConnector.class)
 public class NativeSelect extends AbstractSelect {
 
     // width in characters, mimics TextField
diff --git a/src/com/vaadin/ui/OptionGroup.java b/src/com/vaadin/ui/OptionGroup.java
index ae6636a33c..789c16202d 100644
--- a/src/com/vaadin/ui/OptionGroup.java
+++ b/src/com/vaadin/ui/OptionGroup.java
@@ -17,14 +17,14 @@ import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.gwt.client.ui.OptionGroupConnector;
 import com.vaadin.terminal.gwt.client.ui.VOptionGroup;
-import com.vaadin.terminal.gwt.client.ui.VOptionGroupPaintable;
 
 /**
  * Configures select to be used as an option group.
  */
 @SuppressWarnings("serial")
-@ClientWidget(VOptionGroupPaintable.class)
+@ClientWidget(OptionGroupConnector.class)
 public class OptionGroup extends AbstractSelect implements
         FieldEvents.BlurNotifier, FieldEvents.FocusNotifier {
 
diff --git a/src/com/vaadin/ui/Panel.java b/src/com/vaadin/ui/Panel.java
index 390279a62f..63b57866c7 100644
--- a/src/com/vaadin/ui/Panel.java
+++ b/src/com/vaadin/ui/Panel.java
@@ -16,7 +16,7 @@ import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Scrollable;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
-import com.vaadin.terminal.gwt.client.ui.VPanelPaintable;
+import com.vaadin.terminal.gwt.client.ui.PanelConnector;
 import com.vaadin.ui.Component.Focusable;
 import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.ui.themes.Runo;
@@ -30,12 +30,12 @@ import com.vaadin.ui.themes.Runo;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-@ClientWidget(VPanelPaintable.class)
+@ClientWidget(PanelConnector.class)
 public class Panel extends AbstractComponentContainer implements Scrollable,
         ComponentContainer.ComponentAttachListener,
         ComponentContainer.ComponentDetachListener, Action.Notifier, Focusable {
 
-    private static final String CLICK_EVENT = VPanelPaintable.CLICK_EVENT_IDENTIFIER;
+    private static final String CLICK_EVENT = PanelConnector.CLICK_EVENT_IDENTIFIER;
 
     /**
      * Removes extra decorations from the Panel.
diff --git a/src/com/vaadin/ui/PasswordField.java b/src/com/vaadin/ui/PasswordField.java
index d5be4f378d..725376d617 100644
--- a/src/com/vaadin/ui/PasswordField.java
+++ b/src/com/vaadin/ui/PasswordField.java
@@ -4,13 +4,13 @@
 package com.vaadin.ui;
 
 import com.vaadin.data.Property;
-import com.vaadin.terminal.gwt.client.ui.VPasswordFieldPaintable;
+import com.vaadin.terminal.gwt.client.ui.PasswordFieldConnector;
 
 /**
  * A field that is used to enter secret text information like passwords. The
  * entered text is not displayed on the screen.
  */
-@ClientWidget(VPasswordFieldPaintable.class)
+@ClientWidget(PasswordFieldConnector.class)
 public class PasswordField extends AbstractTextField {
 
     /**
diff --git a/src/com/vaadin/ui/PopupView.java b/src/com/vaadin/ui/PopupView.java
index 5637ef69d7..ef17b9135f 100644
--- a/src/com/vaadin/ui/PopupView.java
+++ b/src/com/vaadin/ui/PopupView.java
@@ -10,7 +10,7 @@ import java.util.Map;
 
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.gwt.client.ui.VPopupViewPaintable;
+import com.vaadin.terminal.gwt.client.ui.PopupViewConnector;
 
 /**
  * 
@@ -22,7 +22,7 @@ import com.vaadin.terminal.gwt.client.ui.VPopupViewPaintable;
  * @author Vaadin Ltd.
  */
 @SuppressWarnings("serial")
-@ClientWidget(VPopupViewPaintable.class)
+@ClientWidget(PopupViewConnector.class)
 public class PopupView extends AbstractComponentContainer {
 
     private Content content;
diff --git a/src/com/vaadin/ui/ProgressIndicator.java b/src/com/vaadin/ui/ProgressIndicator.java
index 9152a3adab..334727e449 100644
--- a/src/com/vaadin/ui/ProgressIndicator.java
+++ b/src/com/vaadin/ui/ProgressIndicator.java
@@ -8,7 +8,7 @@ import com.vaadin.data.Property;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.gwt.client.ui.VProgressIndicatorPaintable;
+import com.vaadin.terminal.gwt.client.ui.ProgressIndicatorConnector;
 
 /**
  * <code>ProgressIndicator</code> is component that shows user state of a
@@ -25,7 +25,7 @@ import com.vaadin.terminal.gwt.client.ui.VProgressIndicatorPaintable;
  * @since 4
  */
 @SuppressWarnings("serial")
-@ClientWidget(VProgressIndicatorPaintable.class)
+@ClientWidget(ProgressIndicatorConnector.class)
 public class ProgressIndicator extends AbstractField<Number> implements
         Property.Viewer, Property.ValueChangeListener {
 
diff --git a/src/com/vaadin/ui/RichTextArea.java b/src/com/vaadin/ui/RichTextArea.java
index 240063caf3..8646f84c99 100644
--- a/src/com/vaadin/ui/RichTextArea.java
+++ b/src/com/vaadin/ui/RichTextArea.java
@@ -10,7 +10,7 @@ import java.util.Map;
 import com.vaadin.data.Property;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.gwt.client.ui.richtextarea.VRichTextAreaPaintable;
+import com.vaadin.terminal.gwt.client.ui.richtextarea.RichTextAreaConnector;
 import com.vaadin.ui.ClientWidget.LoadStyle;
 
 /**
@@ -20,7 +20,7 @@ import com.vaadin.ui.ClientWidget.LoadStyle;
  * {@link RichTextArea} may produce unexpected results as formatting is counted
  * into length of field.
  */
-@ClientWidget(value = VRichTextAreaPaintable.class, loadStyle = LoadStyle.LAZY)
+@ClientWidget(value = RichTextAreaConnector.class, loadStyle = LoadStyle.LAZY)
 public class RichTextArea extends AbstractField<String> {
 
     /**
diff --git a/src/com/vaadin/ui/Root.java b/src/com/vaadin/ui/Root.java
index 47dcedd12a..3d9f734a2c 100644
--- a/src/com/vaadin/ui/Root.java
+++ b/src/com/vaadin/ui/Root.java
@@ -72,7 +72,7 @@ import com.vaadin.ui.Window.CloseListener;
  * 
  * @since 7.0
  */
-// @ClientWidget(VView.class) - Can't have annotation because of eager
+// @ClientWidget(View.class) - Can't have annotation because of eager
 // classloaders in application servers and hard coded logic in client side code
 public abstract class Root extends AbstractComponentContainer implements
         Action.Container, Action.Notifier {
diff --git a/src/com/vaadin/ui/Select.java b/src/com/vaadin/ui/Select.java
index 5519750e89..e4eb2e68b3 100644
--- a/src/com/vaadin/ui/Select.java
+++ b/src/com/vaadin/ui/Select.java
@@ -24,7 +24,7 @@ import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Resource;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.VFilterSelectPaintable;
+import com.vaadin.terminal.gwt.client.ui.ComboBoxConnector;
 
 /**
  * <p>
@@ -45,7 +45,7 @@ import com.vaadin.terminal.gwt.client.ui.VFilterSelectPaintable;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-@ClientWidget(VFilterSelectPaintable.class)
+@ClientWidget(ComboBoxConnector.class)
 public class Select extends AbstractSelect implements AbstractSelect.Filtering,
         FieldEvents.BlurNotifier, FieldEvents.FocusNotifier {
 
@@ -276,8 +276,8 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering,
 
         // Hide the error indicator if needed
         if (shouldHideErrors()) {
-            target.addAttribute(AbstractComponentConnector.ATTRIBUTE_HIDEERRORS,
-                    true);
+            target.addAttribute(
+                    AbstractComponentConnector.ATTRIBUTE_HIDEERRORS, true);
         }
     }
 
diff --git a/src/com/vaadin/ui/Slider.java b/src/com/vaadin/ui/Slider.java
index aad1b60f87..59aa5cd214 100644
--- a/src/com/vaadin/ui/Slider.java
+++ b/src/com/vaadin/ui/Slider.java
@@ -8,7 +8,7 @@ import java.util.Map;
 
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.gwt.client.ui.VSliderPaintable;
+import com.vaadin.terminal.gwt.client.ui.SliderConnector;
 
 /**
  * A component for selecting a numerical value within a range.
@@ -46,7 +46,7 @@ import com.vaadin.terminal.gwt.client.ui.VSliderPaintable;
  * 
  * @author Vaadin Ltd.
  */
-@ClientWidget(VSliderPaintable.class)
+@ClientWidget(SliderConnector.class)
 public class Slider extends AbstractField<Double> {
 
     public static final int ORIENTATION_HORIZONTAL = 0;
diff --git a/src/com/vaadin/ui/TabSheet.java b/src/com/vaadin/ui/TabSheet.java
index 398ded3212..a651f05cc3 100644
--- a/src/com/vaadin/ui/TabSheet.java
+++ b/src/com/vaadin/ui/TabSheet.java
@@ -20,9 +20,9 @@ import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Resource;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
+import com.vaadin.terminal.gwt.client.ui.TabsheetBaseConnector;
+import com.vaadin.terminal.gwt.client.ui.TabsheetConnector;
 import com.vaadin.terminal.gwt.client.ui.VTabsheet;
-import com.vaadin.terminal.gwt.client.ui.VTabsheetBasePaintable;
-import com.vaadin.terminal.gwt.client.ui.VTabsheetPaintable;
 import com.vaadin.terminal.gwt.server.CommunicationManager;
 import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.ui.themes.Runo;
@@ -56,7 +56,7 @@ import com.vaadin.ui.themes.Runo;
  * @VERSION@
  * @since 3.0
  */
-@ClientWidget(VTabsheetPaintable.class)
+@ClientWidget(TabsheetConnector.class)
 public class TabSheet extends AbstractComponentContainer {
 
     /**
@@ -379,7 +379,7 @@ public class TabSheet extends AbstractComponentContainer {
             target.startTag("tab");
             if (!tab.isEnabled() && tab.isVisible()) {
                 target.addAttribute(
-                        VTabsheetBasePaintable.ATTRIBUTE_TAB_DISABLED, true);
+                        TabsheetBaseConnector.ATTRIBUTE_TAB_DISABLED, true);
             }
 
             if (!tab.isVisible()) {
@@ -400,13 +400,13 @@ public class TabSheet extends AbstractComponentContainer {
             final String caption = tab.getCaption();
             if (caption != null && caption.length() > 0) {
                 target.addAttribute(
-                        VTabsheetBasePaintable.ATTRIBUTE_TAB_CAPTION, caption);
+                        TabsheetBaseConnector.ATTRIBUTE_TAB_CAPTION, caption);
             }
 
             final String description = tab.getDescription();
             if (description != null) {
                 target.addAttribute(
-                        VTabsheetBasePaintable.ATTRIBUTE_TAB_DESCRIPTION,
+                        TabsheetBaseConnector.ATTRIBUTE_TAB_DESCRIPTION,
                         description);
             }
 
diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 003ef6978c..1190bb3df3 100644
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -46,8 +46,8 @@ import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Resource;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.terminal.gwt.client.ui.TableConnector;
 import com.vaadin.terminal.gwt.client.ui.VScrollTable;
-import com.vaadin.terminal.gwt.client.ui.VScrollTablePaintable;
 import com.vaadin.terminal.gwt.client.ui.dd.VLazyInitItemIdentifiers;
 
 /**
@@ -74,7 +74,7 @@ import com.vaadin.terminal.gwt.client.ui.dd.VLazyInitItemIdentifiers;
  * @since 3.0
  */
 @SuppressWarnings({ "deprecation" })
-@ClientWidget(VScrollTablePaintable.class)
+@ClientWidget(TableConnector.class)
 public class Table extends AbstractSelect implements Action.Container,
         Container.Ordered, Container.Sortable, ItemClickSource,
         ItemClickNotifier, DragSource, DropTarget {
diff --git a/src/com/vaadin/ui/TextArea.java b/src/com/vaadin/ui/TextArea.java
index a5e6bb5630..dafeb8afa7 100644
--- a/src/com/vaadin/ui/TextArea.java
+++ b/src/com/vaadin/ui/TextArea.java
@@ -7,12 +7,12 @@ package com.vaadin.ui;
 import com.vaadin.data.Property;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.gwt.client.ui.VTextAreaPaintable;
+import com.vaadin.terminal.gwt.client.ui.TextAreaConnector;
 
 /**
  * A text field that supports multi line editing.
  */
-@ClientWidget(VTextAreaPaintable.class)
+@ClientWidget(TextAreaConnector.class)
 public class TextArea extends AbstractTextField {
 
     private static final int DEFAULT_ROWS = 5;
diff --git a/src/com/vaadin/ui/TextField.java b/src/com/vaadin/ui/TextField.java
index a3d873336c..9b6fd6ada1 100644
--- a/src/com/vaadin/ui/TextField.java
+++ b/src/com/vaadin/ui/TextField.java
@@ -5,7 +5,7 @@
 package com.vaadin.ui;
 
 import com.vaadin.data.Property;
-import com.vaadin.terminal.gwt.client.ui.VTextFieldPaintable;
+import com.vaadin.terminal.gwt.client.ui.TextFieldConnector;
 import com.vaadin.ui.ClientWidget.LoadStyle;
 
 /**
@@ -29,7 +29,7 @@ import com.vaadin.ui.ClientWidget.LoadStyle;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-@ClientWidget(value = VTextFieldPaintable.class, loadStyle = LoadStyle.EAGER)
+@ClientWidget(value = TextFieldConnector.class, loadStyle = LoadStyle.EAGER)
 public class TextField extends AbstractTextField {
 
     /**
diff --git a/src/com/vaadin/ui/Tree.java b/src/com/vaadin/ui/Tree.java
index 562e1ac533..619f722e23 100644
--- a/src/com/vaadin/ui/Tree.java
+++ b/src/com/vaadin/ui/Tree.java
@@ -44,8 +44,8 @@ import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Resource;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.terminal.gwt.client.ui.TreeConnector;
 import com.vaadin.terminal.gwt.client.ui.VTree;
-import com.vaadin.terminal.gwt.client.ui.VTreePaintable;
 import com.vaadin.terminal.gwt.client.ui.dd.VLazyInitItemIdentifiers;
 import com.vaadin.terminal.gwt.client.ui.dd.VTargetInSubtree;
 import com.vaadin.terminal.gwt.client.ui.dd.VerticalDropLocation;
@@ -61,7 +61,7 @@ import com.vaadin.tools.ReflectTools;
  * @since 3.0
  */
 @SuppressWarnings({ "serial", "deprecation" })
-@ClientWidget(VTreePaintable.class)
+@ClientWidget(TreeConnector.class)
 public class Tree extends AbstractSelect implements Container.Hierarchical,
         Action.Container, ItemClickSource, ItemClickNotifier, DragSource,
         DropTarget {
@@ -610,8 +610,8 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
                 if (itemStyleGenerator != null) {
                     String stylename = itemStyleGenerator.getStyle(itemId);
                     if (stylename != null) {
-                        target.addAttribute(
-                                VTreePaintable.ATTRIBUTE_NODE_STYLE, stylename);
+                        target.addAttribute(TreeConnector.ATTRIBUTE_NODE_STYLE,
+                                stylename);
                     }
                 }
 
@@ -624,11 +624,11 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
                 }
 
                 // Adds the attributes
-                target.addAttribute(VTreePaintable.ATTRIBUTE_NODE_CAPTION,
+                target.addAttribute(TreeConnector.ATTRIBUTE_NODE_CAPTION,
                         getItemCaption(itemId));
                 final Resource icon = getItemIcon(itemId);
                 if (icon != null) {
-                    target.addAttribute(VTreePaintable.ATTRIBUTE_NODE_ICON,
+                    target.addAttribute(TreeConnector.ATTRIBUTE_NODE_ICON,
                             getItemIcon(itemId));
                 }
                 final String key = itemIdMapper.key(itemId);
@@ -686,12 +686,11 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
                 final Action a = i.next();
                 target.startTag("action");
                 if (a.getCaption() != null) {
-                    target.addAttribute(
-                            VTreePaintable.ATTRIBUTE_ACTION_CAPTION,
+                    target.addAttribute(TreeConnector.ATTRIBUTE_ACTION_CAPTION,
                             a.getCaption());
                 }
                 if (a.getIcon() != null) {
-                    target.addAttribute(VTreePaintable.ATTRIBUTE_ACTION_ICON,
+                    target.addAttribute(TreeConnector.ATTRIBUTE_ACTION_ICON,
                             a.getIcon());
                 }
                 target.addAttribute("key", actionMapper.key(a));
diff --git a/src/com/vaadin/ui/TreeTable.java b/src/com/vaadin/ui/TreeTable.java
index 09417e1e16..3dce3d8645 100644
--- a/src/com/vaadin/ui/TreeTable.java
+++ b/src/com/vaadin/ui/TreeTable.java
@@ -22,7 +22,7 @@ import com.vaadin.data.util.HierarchicalContainer;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.gwt.client.ui.VTreeTablePaintable;
+import com.vaadin.terminal.gwt.client.ui.TreeTableConnector;
 import com.vaadin.ui.Tree.CollapseEvent;
 import com.vaadin.ui.Tree.CollapseListener;
 import com.vaadin.ui.Tree.ExpandEvent;
@@ -48,7 +48,7 @@ import com.vaadin.ui.treetable.HierarchicalContainerOrderedWrapper;
  * share UI state in the container.
  */
 @SuppressWarnings({ "serial" })
-@ClientWidget(VTreeTablePaintable.class)
+@ClientWidget(TreeTableConnector.class)
 public class TreeTable extends Table implements Hierarchical {
 
     private static final Logger logger = Logger.getLogger(TreeTable.class
@@ -454,7 +454,7 @@ public class TreeTable extends Table implements Hierarchical {
                 Object object = visibleColumns2[i];
                 if (hierarchyColumnId.equals(object)) {
                     target.addAttribute(
-                            VTreeTablePaintable.ATTRIBUTE_HIERARCHY_COLUMN_INDEX,
+                            TreeTableConnector.ATTRIBUTE_HIERARCHY_COLUMN_INDEX,
                             i);
                     break;
                 }
diff --git a/src/com/vaadin/ui/TwinColSelect.java b/src/com/vaadin/ui/TwinColSelect.java
index fbdd825a66..2e2fbb53fc 100644
--- a/src/com/vaadin/ui/TwinColSelect.java
+++ b/src/com/vaadin/ui/TwinColSelect.java
@@ -9,15 +9,15 @@ import java.util.Collection;
 import com.vaadin.data.Container;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.gwt.client.ui.TwinColSelectConnector;
 import com.vaadin.terminal.gwt.client.ui.VTwinColSelect;
-import com.vaadin.terminal.gwt.client.ui.VTwinColSelectPaintable;
 
 /**
  * Multiselect component with two lists: left side for available items and right
  * side for selected items.
  */
 @SuppressWarnings("serial")
-@ClientWidget(VTwinColSelectPaintable.class)
+@ClientWidget(TwinColSelectConnector.class)
 public class TwinColSelect extends AbstractSelect {
 
     private int columns = 0;
diff --git a/src/com/vaadin/ui/Upload.java b/src/com/vaadin/ui/Upload.java
index 08a8023ad5..3498eaa794 100644
--- a/src/com/vaadin/ui/Upload.java
+++ b/src/com/vaadin/ui/Upload.java
@@ -15,7 +15,7 @@ import java.util.Map;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.StreamVariable.StreamingProgressEvent;
-import com.vaadin.terminal.gwt.client.ui.VUploadPaintable;
+import com.vaadin.terminal.gwt.client.ui.UploadConnector;
 import com.vaadin.terminal.gwt.server.NoInputStreamException;
 import com.vaadin.terminal.gwt.server.NoOutputStreamException;
 import com.vaadin.ui.ClientWidget.LoadStyle;
@@ -61,7 +61,7 @@ import com.vaadin.ui.ClientWidget.LoadStyle;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-@ClientWidget(value = VUploadPaintable.class, loadStyle = LoadStyle.LAZY)
+@ClientWidget(value = UploadConnector.class, loadStyle = LoadStyle.LAZY)
 public class Upload extends AbstractComponent implements Component.Focusable {
 
     /**
diff --git a/src/com/vaadin/ui/VerticalLayout.java b/src/com/vaadin/ui/VerticalLayout.java
index 0c5de43bbd..b067490406 100644
--- a/src/com/vaadin/ui/VerticalLayout.java
+++ b/src/com/vaadin/ui/VerticalLayout.java
@@ -3,7 +3,7 @@
  */
 package com.vaadin.ui;
 
-import com.vaadin.terminal.gwt.client.ui.VVerticalLayoutPaintable;
+import com.vaadin.terminal.gwt.client.ui.VerticalLayoutConnector;
 import com.vaadin.ui.ClientWidget.LoadStyle;
 
 /**
@@ -19,7 +19,7 @@ import com.vaadin.ui.ClientWidget.LoadStyle;
  * @since 5.3
  */
 @SuppressWarnings("serial")
-@ClientWidget(value = VVerticalLayoutPaintable.class, loadStyle = LoadStyle.EAGER)
+@ClientWidget(value = VerticalLayoutConnector.class, loadStyle = LoadStyle.EAGER)
 public class VerticalLayout extends AbstractOrderedLayout {
 
     public VerticalLayout() {
diff --git a/src/com/vaadin/ui/VerticalSplitPanel.java b/src/com/vaadin/ui/VerticalSplitPanel.java
index 46e9d681e8..6cfde788b0 100644
--- a/src/com/vaadin/ui/VerticalSplitPanel.java
+++ b/src/com/vaadin/ui/VerticalSplitPanel.java
@@ -3,7 +3,7 @@
  */
 package com.vaadin.ui;
 
-import com.vaadin.terminal.gwt.client.ui.VVerticalSplitPanelPaintable;
+import com.vaadin.terminal.gwt.client.ui.VerticalSplitPanelConnector;
 import com.vaadin.ui.ClientWidget.LoadStyle;
 
 /**
@@ -23,7 +23,7 @@ import com.vaadin.ui.ClientWidget.LoadStyle;
  * </pre>
  * 
  */
-@ClientWidget(value = VVerticalSplitPanelPaintable.class, loadStyle = LoadStyle.EAGER)
+@ClientWidget(value = VerticalSplitPanelConnector.class, loadStyle = LoadStyle.EAGER)
 public class VerticalSplitPanel extends AbstractSplitPanel {
 
     public VerticalSplitPanel() {
diff --git a/src/com/vaadin/ui/Video.java b/src/com/vaadin/ui/Video.java
index a2e71b1120..2fc7cbc870 100644
--- a/src/com/vaadin/ui/Video.java
+++ b/src/com/vaadin/ui/Video.java
@@ -7,7 +7,7 @@ package com.vaadin.ui;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.gwt.client.ui.VVideoPaintable;
+import com.vaadin.terminal.gwt.client.ui.VideoConnector;
 
 /**
  * The Video component translates into an HTML5 &lt;video&gt; element and as
@@ -30,7 +30,7 @@ import com.vaadin.terminal.gwt.client.ui.VVideoPaintable;
  * @author Vaadin Ltd
  * @since 6.7.0
  */
-@ClientWidget(VVideoPaintable.class)
+@ClientWidget(VideoConnector.class)
 public class Video extends AbstractMedia {
 
     private Resource poster;
@@ -80,7 +80,7 @@ public class Video extends AbstractMedia {
     public void paintContent(PaintTarget target) throws PaintException {
         super.paintContent(target);
         if (getPoster() != null) {
-            target.addAttribute(VVideoPaintable.ATTR_POSTER, getPoster());
+            target.addAttribute(VideoConnector.ATTR_POSTER, getPoster());
         }
     }
 }
diff --git a/src/com/vaadin/ui/Window.java b/src/com/vaadin/ui/Window.java
index e6c8642b84..886a14d1c7 100644
--- a/src/com/vaadin/ui/Window.java
+++ b/src/com/vaadin/ui/Window.java
@@ -23,7 +23,7 @@ import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Sizeable;
 import com.vaadin.terminal.gwt.client.ui.VView;
-import com.vaadin.terminal.gwt.client.ui.VWindowPaintable;
+import com.vaadin.terminal.gwt.client.ui.WindowConnector;
 
 /**
  * A component that represents an application (browser native) window or a sub
@@ -71,7 +71,7 @@ import com.vaadin.terminal.gwt.client.ui.VWindowPaintable;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-@ClientWidget(VWindowPaintable.class)
+@ClientWidget(WindowConnector.class)
 public class Window extends Panel implements FocusNotifier, BlurNotifier {
 
     /**