Removed references to client widgetset from state #9724

33 files changed, 33 insertions, 69 deletions

diff --git a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java b/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java
index c242cdb11b..9a112dc763 100644
--- a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java
+++ b/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java
@@ -18,12 +18,11 @@ package com.vaadin.shared.ui.absolutelayout;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.vaadin.client.ui.absolutelayout.VAbsoluteLayout;
 import com.vaadin.shared.ui.AbstractLayoutState;
 
 public class AbsoluteLayoutState extends AbstractLayoutState {
     {
-        primaryStyleName = VAbsoluteLayout.CLASSNAME;
+        primaryStyleName = "v-absolutelayout";
     }
 
     // Maps each component to a position
diff --git a/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java b/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java
index 3325f06789..6f098e863e 100644
--- a/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java
+++ b/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.browserframe;
 
-import com.vaadin.client.ui.browserframe.VBrowserFrame;
 import com.vaadin.shared.ui.AbstractEmbeddedState;
 
 public class BrowserFrameState extends AbstractEmbeddedState {
     {
-        primaryStyleName = VBrowserFrame.CLASSNAME;
+        primaryStyleName = "v-browserframe";
     }
 }
diff --git a/shared/src/com/vaadin/shared/ui/button/ButtonState.java b/shared/src/com/vaadin/shared/ui/button/ButtonState.java
index 659ec747aa..e7272379bb 100644
--- a/shared/src/com/vaadin/shared/ui/button/ButtonState.java
+++ b/shared/src/com/vaadin/shared/ui/button/ButtonState.java
@@ -16,7 +16,6 @@
 
 package com.vaadin.shared.ui.button;
 
-import com.vaadin.client.ui.button.VButton;
 import com.vaadin.shared.ComponentState;
 import com.vaadin.shared.ui.TabIndexState;
 
@@ -30,7 +29,7 @@ import com.vaadin.shared.ui.TabIndexState;
  */
 public class ButtonState extends TabIndexState {
     {
-        primaryStyleName = VButton.CLASSNAME;
+        primaryStyleName = "v-button";
     }
     public boolean disableOnClick = false;
     public int clickShortcutKeyCode = 0;
diff --git a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java b/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java
index 1892310ae1..9f7388e21c 100644
--- a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java
+++ b/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java
@@ -15,12 +15,11 @@
  */
 package com.vaadin.shared.ui.checkbox;
 
-import com.vaadin.client.ui.checkbox.VCheckBox;
 import com.vaadin.shared.AbstractFieldState;
 
 public class CheckBoxState extends AbstractFieldState {
     {
-        primaryStyleName = VCheckBox.CLASSNAME;
+        primaryStyleName = "v-checkbox";
     }
 
     public boolean checked = false;
diff --git a/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java b/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java
index da8ec9ca33..a3c0c8e765 100644
--- a/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java
+++ b/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.combobox;
 
-import com.vaadin.client.ui.combobox.VFilterSelect;
 import com.vaadin.shared.AbstractFieldState;
 
 public class ComboBoxState extends AbstractFieldState {
     {
-        primaryStyleName = VFilterSelect.CLASSNAME;
+        primaryStyleName = "v-filterselect";
     }
 }
diff --git a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java b/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java
index a4b595335b..fa25f2840b 100644
--- a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java
+++ b/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java
@@ -18,13 +18,12 @@ package com.vaadin.shared.ui.csslayout;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.vaadin.client.ui.csslayout.VCssLayout;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.ui.AbstractLayoutState;
 
 public class CssLayoutState extends AbstractLayoutState {
     {
-        primaryStyleName = VCssLayout.CLASSNAME;
+        primaryStyleName = "v-csslayout";
     }
     public Map<Connector, String> childCss = new HashMap<Connector, String>();
 }
\ No newline at end of file
diff --git a/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java b/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java
index 4d95cd3c68..07f69b691e 100644
--- a/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java
+++ b/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java
@@ -18,13 +18,12 @@ package com.vaadin.shared.ui.customlayout;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.vaadin.client.ui.customlayout.VCustomLayout;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.ui.AbstractLayoutState;
 
 public class CustomLayoutState extends AbstractLayoutState {
     {
-        primaryStyleName = VCustomLayout.CLASSNAME;
+        primaryStyleName = "v-customlayout";
     }
     public Map<Connector, String> childLocations = new HashMap<Connector, String>();
     public String templateContents;
diff --git a/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java b/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java
index 2575e81ab2..879670effa 100644
--- a/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java
+++ b/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.datefield;
 
-import com.vaadin.client.ui.datefield.VDateFieldCalendar;
 import com.vaadin.shared.AbstractFieldState;
 
 public class InlineDateFieldState extends AbstractFieldState {
     {
-        primaryStyleName = VDateFieldCalendar.CLASSNAME;
+        primaryStyleName = "v-datefield";
     }
 }
diff --git a/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java b/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java
index 5071b8cfb4..c0d3b20c28 100644
--- a/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java
+++ b/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java
@@ -1,9 +1,7 @@
 package com.vaadin.shared.ui.datefield;
 
-import com.vaadin.client.ui.datefield.VPopupCalendar;
-
 public class PopupDateFieldState extends TextualDateFieldState {
     {
-        primaryStyleName = VPopupCalendar.CLASSNAME;
+        primaryStyleName = "v-datefield";
     }
 }
diff --git a/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java b/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java
index e7a8251bcb..d7c98fa457 100644
--- a/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java
+++ b/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.datefield;
 
-import com.vaadin.client.ui.datefield.VTextualDate;
 import com.vaadin.shared.AbstractFieldState;
 
 public class TextualDateFieldState extends AbstractFieldState {
     {
-        primaryStyleName = VTextualDate.CLASSNAME;
+        primaryStyleName = "v-datefield";
     }
 }
diff --git a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java b/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java
index cdf0621f5f..2a85197d0a 100644
--- a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java
+++ b/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.embedded;
 
-import com.vaadin.client.ui.embedded.VEmbedded;
 import com.vaadin.shared.ui.AbstractEmbeddedState;
 
 public class EmbeddedState extends AbstractEmbeddedState {
     {
-        primaryStyleName = VEmbedded.CLASSNAME;
+        primaryStyleName = "v-embedded";
     }
 }
diff --git a/shared/src/com/vaadin/shared/ui/flash/FlashState.java b/shared/src/com/vaadin/shared/ui/flash/FlashState.java
index f9886cf737..0c94850da7 100644
--- a/shared/src/com/vaadin/shared/ui/flash/FlashState.java
+++ b/shared/src/com/vaadin/shared/ui/flash/FlashState.java
@@ -2,12 +2,11 @@ package com.vaadin.shared.ui.flash;
 
 import java.util.Map;
 
-import com.vaadin.client.ui.flash.VFlash;
 import com.vaadin.shared.ui.AbstractEmbeddedState;
 
 public class FlashState extends AbstractEmbeddedState {
     {
-        primaryStyleName = VFlash.CLASSNAME;
+        primaryStyleName = "v-flash";
     }
 
     public String classId;
diff --git a/shared/src/com/vaadin/shared/ui/form/FormState.java b/shared/src/com/vaadin/shared/ui/form/FormState.java
index bae8899c13..c48b68dd4a 100644
--- a/shared/src/com/vaadin/shared/ui/form/FormState.java
+++ b/shared/src/com/vaadin/shared/ui/form/FormState.java
@@ -15,13 +15,12 @@
  */
 package com.vaadin.shared.ui.form;
 
-import com.vaadin.client.ui.form.VForm;
 import com.vaadin.shared.AbstractFieldState;
 import com.vaadin.shared.Connector;
 
 public class FormState extends AbstractFieldState {
     {
-        primaryStyleName = VForm.CLASSNAME;
+        primaryStyleName = "v-form";
     }
     public Connector layout;
     public Connector footer;
diff --git a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java b/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java
index 9d7cd8a615..e8a90adcd5 100644
--- a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java
+++ b/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java
@@ -15,12 +15,11 @@
  */
 package com.vaadin.shared.ui.gridlayout;
 
-import com.vaadin.client.ui.gridlayout.VGridLayout;
 import com.vaadin.shared.ui.AbstractLayoutState;
 
 public class GridLayoutState extends AbstractLayoutState {
     {
-        primaryStyleName = VGridLayout.CLASSNAME;
+        primaryStyleName = "v-gridlayout";
     }
     public boolean spacing = false;
     public int rows = 0;
diff --git a/shared/src/com/vaadin/shared/ui/image/ImageState.java b/shared/src/com/vaadin/shared/ui/image/ImageState.java
index 1ecf9b25d8..4e9fcf1d5e 100644
--- a/shared/src/com/vaadin/shared/ui/image/ImageState.java
+++ b/shared/src/com/vaadin/shared/ui/image/ImageState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.image;
 
-import com.vaadin.client.ui.image.VImage;
 import com.vaadin.shared.ui.AbstractEmbeddedState;
 
 public class ImageState extends AbstractEmbeddedState {
     {
-        primaryStyleName = VImage.CLASSNAME;
+        primaryStyleName = "v-image";
     }
 }
diff --git a/shared/src/com/vaadin/shared/ui/label/LabelState.java b/shared/src/com/vaadin/shared/ui/label/LabelState.java
index 09d4837fbe..2cccc310aa 100644
--- a/shared/src/com/vaadin/shared/ui/label/LabelState.java
+++ b/shared/src/com/vaadin/shared/ui/label/LabelState.java
@@ -15,12 +15,11 @@
  */
 package com.vaadin.shared.ui.label;
 
-import com.vaadin.client.ui.label.VLabel;
 import com.vaadin.shared.ComponentState;
 
 public class LabelState extends ComponentState {
     {
-        primaryStyleName = VLabel.CLASSNAME;
+        primaryStyleName = "v-label";
     }
     public ContentMode contentMode = ContentMode.TEXT;
     public String text = "";
diff --git a/shared/src/com/vaadin/shared/ui/link/LinkState.java b/shared/src/com/vaadin/shared/ui/link/LinkState.java
index 7ce626f380..96b4600000 100644
--- a/shared/src/com/vaadin/shared/ui/link/LinkState.java
+++ b/shared/src/com/vaadin/shared/ui/link/LinkState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.link;
 
-import com.vaadin.client.ui.link.VLink;
 import com.vaadin.shared.ComponentState;
 
 public class LinkState extends ComponentState {
     {
-        primaryStyleName = VLink.CLASSNAME;
+        primaryStyleName = "v-link";
     }
 }
diff --git a/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java b/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java
index 418be8dba3..cf1ef99c06 100644
--- a/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java
+++ b/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.menubar;
 
-import com.vaadin.client.ui.menubar.VMenuBar;
 import com.vaadin.shared.ComponentState;
 
 public class MenuBarState extends ComponentState {
     {
-        primaryStyleName = VMenuBar.CLASSNAME;
+        primaryStyleName = "v-menubar";
     }
 }
diff --git a/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java b/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java
index b6a37d0bf6..855a0a3c08 100644
--- a/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java
+++ b/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.optiongroup;
 
-import com.vaadin.client.ui.optiongroup.VOptionGroup;
 import com.vaadin.shared.AbstractFieldState;
 
 public class OptionGroupState extends AbstractFieldState {
     {
-        primaryStyleName = VOptionGroup.CLASSNAME;
+        primaryStyleName = "v-select-optiongroup";
     }
 }
diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java b/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java
index caad987697..6af6f1c040 100644
--- a/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java
+++ b/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java
@@ -1,9 +1,8 @@
 package com.vaadin.shared.ui.orderedlayout;
 
-import com.vaadin.client.ui.orderedlayout.VHorizontalLayout;
 
 public class HorizontalLayoutState extends AbstractOrderedLayoutState {
     {
-        primaryStyleName = VHorizontalLayout.CLASSNAME;
+        primaryStyleName = "v-horizontallayout";
     }
 }
diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java b/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java
index e8ad3c9a29..a7054f683f 100644
--- a/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java
+++ b/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java
@@ -1,9 +1,7 @@
 package com.vaadin.shared.ui.orderedlayout;
 
-import com.vaadin.client.ui.orderedlayout.VVerticalLayout;
-
 public class VerticalLayoutState extends AbstractOrderedLayoutState {
     {
-        primaryStyleName = VVerticalLayout.CLASSNAME;
+        primaryStyleName = "v-verticallayout";
     }
 }
diff --git a/shared/src/com/vaadin/shared/ui/panel/PanelState.java b/shared/src/com/vaadin/shared/ui/panel/PanelState.java
index 3061d54438..9d502df8fe 100644
--- a/shared/src/com/vaadin/shared/ui/panel/PanelState.java
+++ b/shared/src/com/vaadin/shared/ui/panel/PanelState.java
@@ -15,12 +15,11 @@
  */
 package com.vaadin.shared.ui.panel;
 
-import com.vaadin.client.ui.panel.VPanel;
 import com.vaadin.shared.ComponentState;
 
 public class PanelState extends ComponentState {
     {
-        primaryStyleName = VPanel.CLASSNAME;
+        primaryStyleName = "v-panel";
     }
     public int tabIndex;
     public int scrollLeft, scrollTop;
diff --git a/shared/src/com/vaadin/shared/ui/slider/SliderState.java b/shared/src/com/vaadin/shared/ui/slider/SliderState.java
index 3393dbbfb5..481ee58855 100644
--- a/shared/src/com/vaadin/shared/ui/slider/SliderState.java
+++ b/shared/src/com/vaadin/shared/ui/slider/SliderState.java
@@ -1,11 +1,10 @@
 package com.vaadin.shared.ui.slider;
 
-import com.vaadin.client.ui.slider.VSlider;
 import com.vaadin.shared.AbstractFieldState;
 
 public class SliderState extends AbstractFieldState {
     {
-        primaryStyleName = VSlider.CLASSNAME;
+        primaryStyleName = "v-slider";
     }
 
     public double value;
diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java b/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java
index 5472c17fdd..4824f63838 100644
--- a/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java
+++ b/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java
@@ -1,9 +1,8 @@
 package com.vaadin.shared.ui.splitpanel;
 
-import com.vaadin.client.ui.splitpanel.VSplitPanelHorizontal;
 
 public class HorizontalSplitPanelState extends AbstractSplitPanelState {
     {
-        primaryStyleName = VSplitPanelHorizontal.CLASSNAME;
+        primaryStyleName = "v-splitpanel-horizontal";
     }
 }
diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java b/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java
index 0e97557769..901914cdea 100644
--- a/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java
+++ b/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java
@@ -1,9 +1,7 @@
 package com.vaadin.shared.ui.splitpanel;
 
-import com.vaadin.client.ui.splitpanel.VSplitPanelVertical;
-
 public class VerticalSplitPanelState extends AbstractSplitPanelState {
     {
-        primaryStyleName = VSplitPanelVertical.CLASSNAME;
+        primaryStyleName = "v-splitpanel-vertical";
     }
 }
diff --git a/shared/src/com/vaadin/shared/ui/table/TableState.java b/shared/src/com/vaadin/shared/ui/table/TableState.java
index 58e6850f31..8e772b7c92 100644
--- a/shared/src/com/vaadin/shared/ui/table/TableState.java
+++ b/shared/src/com/vaadin/shared/ui/table/TableState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.table;
 
-import com.vaadin.client.ui.table.VScrollTable;
 import com.vaadin.shared.AbstractFieldState;
 
 public class TableState extends AbstractFieldState {
     {
-        primaryStyleName = VScrollTable.STYLENAME;
+        primaryStyleName = "v-table";
     }
 }
diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java
index f03f9b9e5d..a36acca9dc 100644
--- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java
+++ b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.tabsheet;
 
-import com.vaadin.client.ui.tabsheet.VTabsheet;
 import com.vaadin.shared.ComponentState;
 
 public class TabsheetState extends ComponentState {
     {
-        primaryStyleName = VTabsheet.CLASSNAME;
+        primaryStyleName = "v-tabsheet";
     }
 }
diff --git a/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java b/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java
index ca9481f5e3..0b87f5293c 100644
--- a/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java
+++ b/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java
@@ -15,13 +15,12 @@
  */
 package com.vaadin.shared.ui.textarea;
 
-import com.vaadin.client.ui.textarea.VTextArea;
 import com.vaadin.shared.annotations.DelegateToWidget;
 import com.vaadin.shared.ui.textfield.AbstractTextFieldState;
 
 public class TextAreaState extends AbstractTextFieldState {
     {
-        primaryStyleName = VTextArea.CLASSNAME;
+        primaryStyleName = "v-textarea";
     }
 
     /**
diff --git a/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java b/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java
index ebe99f729f..9ea8ded0a7 100644
--- a/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java
+++ b/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java
@@ -15,12 +15,11 @@
  */
 package com.vaadin.shared.ui.textfield;
 
-import com.vaadin.client.ui.textfield.VTextField;
 import com.vaadin.shared.AbstractFieldState;
 
 public class AbstractTextFieldState extends AbstractFieldState {
     {
-        primaryStyleName = VTextField.CLASSNAME;
+        primaryStyleName = "v-textfield";
     }
 
     /**
diff --git a/shared/src/com/vaadin/shared/ui/tree/TreeState.java b/shared/src/com/vaadin/shared/ui/tree/TreeState.java
index 3785051276..d2d09d41a3 100644
--- a/shared/src/com/vaadin/shared/ui/tree/TreeState.java
+++ b/shared/src/com/vaadin/shared/ui/tree/TreeState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.tree;
 
-import com.vaadin.client.ui.tree.VTree;
 import com.vaadin.shared.AbstractFieldState;
 
 public class TreeState extends AbstractFieldState {
     {
-        primaryStyleName = VTree.CLASSNAME;
+        primaryStyleName = "v-tree";
     }
 }
diff --git a/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java b/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java
index 9199c1c267..c8ab3371d3 100644
--- a/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java
+++ b/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.treetable;
 
-import com.vaadin.client.ui.treetable.VTreeTable;
 import com.vaadin.shared.ui.table.TableState;
 
 public class TreeTableState extends TableState {
     {
-        primaryStyleName = VTreeTable.STYLENAME;
+        primaryStyleName = "v-table";
     }
 }
diff --git a/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java b/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java
index a0e554a084..933c1812a0 100644
--- a/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java
+++ b/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.twincolselect;
 
-import com.vaadin.client.ui.twincolselect.VTwinColSelect;
 import com.vaadin.shared.AbstractFieldState;
 
 public class TwinColSelectState extends AbstractFieldState {
     {
-        primaryStyleName = VTwinColSelect.CLASSNAME;
+        primaryStyleName = "v-select-twincol";
     }
 }
diff --git a/shared/src/com/vaadin/shared/ui/video/VideoState.java b/shared/src/com/vaadin/shared/ui/video/VideoState.java
index 4232888328..8d0bc7d8dd 100644
--- a/shared/src/com/vaadin/shared/ui/video/VideoState.java
+++ b/shared/src/com/vaadin/shared/ui/video/VideoState.java
@@ -15,11 +15,10 @@
  */
 package com.vaadin.shared.ui.video;
 
-import com.vaadin.client.ui.video.VVideo;
 import com.vaadin.shared.ui.AbstractMediaState;
 
 public class VideoState extends AbstractMediaState {
     {
-        primaryStyleName = VVideo.CLASSNAME;
+        primaryStyleName = "v-video";
     }
 }