Move and rename server classes which go into the compatibility package

* Use com.vaadin.v7
* Use the same class name as in Vaadin 7
* Use a "vaadin7-" declarative prefix for Vaadin 7 components

Change-Id: I19a27f3835b18980b91a4f8f9464b2adde1a5fd5

316 files changed, 2133 insertions, 2137 deletions

diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/BeanFieldGroup.java
index 96e4621761..bee3f7c80b 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/BeanFieldGroup.java
@@ -13,29 +13,29 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.fieldgroup;
+package com.vaadin.v7.data.fieldgroup;
 
 import java.beans.IntrospectionException;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.vaadin.data.Item;
-import com.vaadin.data.util.BeanItem;
 import com.vaadin.data.util.BeanUtil;
-import com.vaadin.v7.data.validator.LegacyBeanValidator;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.data.validator.BeanValidator;
+import com.vaadin.v7.ui.Field;
 
 public class BeanFieldGroup<T> extends FieldGroup {
 
     private final Class<T> beanType;
 
     private static Boolean beanValidationImplementationAvailable = null;
-    private final Map<LegacyField<?>, LegacyBeanValidator> defaultValidators;
+    private final Map<Field<?>, BeanValidator> defaultValidators;
 
     public BeanFieldGroup(Class<T> beanType) {
         this.beanType = beanType;
-        this.defaultValidators = new HashMap<LegacyField<?>, LegacyBeanValidator>();
+        this.defaultValidators = new HashMap<Field<?>, BeanValidator>();
     }
 
     @Override
@@ -150,35 +150,35 @@ public class BeanFieldGroup<T> extends FieldGroup {
     }
 
     @Override
-    public void bind(LegacyField field, Object propertyId) {
+    public void bind(Field field, Object propertyId) {
         ensureNestedPropertyAdded(propertyId);
         super.bind(field, propertyId);
     }
 
     @Override
-    public <T extends LegacyField> T buildAndBind(String caption,
+    public <T extends Field> T buildAndBind(String caption,
             Object propertyId, Class<T> fieldType) throws BindException {
         ensureNestedPropertyAdded(propertyId);
         return super.buildAndBind(caption, propertyId, fieldType);
     }
 
     @Override
-    public void unbind(LegacyField<?> field) throws BindException {
+    public void unbind(Field<?> field) throws BindException {
         super.unbind(field);
 
-        LegacyBeanValidator removed = defaultValidators.remove(field);
+        BeanValidator removed = defaultValidators.remove(field);
         if (removed != null) {
             field.removeValidator(removed);
         }
     }
 
     @Override
-    protected void configureField(LegacyField<?> field) {
+    protected void configureField(Field<?> field) {
         super.configureField(field);
         // Add Bean validators if there are annotations
         if (isBeanValidationImplementationAvailable()
                 && !defaultValidators.containsKey(field)) {
-            LegacyBeanValidator validator = new LegacyBeanValidator(beanType,
+            BeanValidator validator = new BeanValidator(beanType,
                     getPropertyId(field).toString());
             field.addValidator(validator);
             if (field.getLocale() != null) {
@@ -227,7 +227,7 @@ public class BeanFieldGroup<T> extends FieldGroup {
      * @param bean
      *            the bean to be bound
      * @param objectWithMemberFields
-     *            the class that contains {@link LegacyField}s for bean
+     *            the class that contains {@link Field}s for bean
      *            properties
      * @return the bean field group used to make binding
      */
@@ -249,7 +249,7 @@ public class BeanFieldGroup<T> extends FieldGroup {
      * @param bean
      *            the bean to be bound
      * @param objectWithMemberFields
-     *            the class that contains {@link LegacyField}s for bean
+     *            the class that contains {@link Field}s for bean
      *            properties
      * @return the bean field group used to make binding
      */
diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/Caption.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/Caption.java
index d752aa78d2..0042cd8113 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/Caption.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/Caption.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.fieldgroup;
+package com.vaadin.v7.data.fieldgroup;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactory.java
index 24c97eedc5..8b0b6cfcaa 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactory.java
@@ -13,28 +13,28 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.fieldgroup;
+package com.vaadin.v7.data.fieldgroup;
 
 import java.util.Date;
 import java.util.EnumSet;
 
-import com.vaadin.data.Item;
-import com.vaadin.data.fieldgroup.FieldGroup.BindException;
-import com.vaadin.ui.AbstractSelect;
-import com.vaadin.ui.ComboBox;
-import com.vaadin.ui.ListSelect;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.OptionGroup;
-import com.vaadin.ui.RichTextArea;
-import com.vaadin.ui.Table;
-import com.vaadin.v7.ui.LegacyAbstractField;
-import com.vaadin.v7.ui.LegacyAbstractTextField;
-import com.vaadin.v7.ui.LegacyCheckBox;
-import com.vaadin.v7.ui.LegacyDateField;
-import com.vaadin.v7.ui.LegacyField;
-import com.vaadin.v7.ui.LegacyInlineDateField;
-import com.vaadin.v7.ui.LegacyPopupDateField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.fieldgroup.FieldGroup.BindException;
+import com.vaadin.v7.ui.AbstractField;
+import com.vaadin.v7.ui.AbstractSelect;
+import com.vaadin.v7.ui.AbstractTextField;
+import com.vaadin.v7.ui.CheckBox;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.DateField;
+import com.vaadin.v7.ui.InlineDateField;
+import com.vaadin.v7.ui.PopupDateField;
+import com.vaadin.v7.ui.ListSelect;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.RichTextArea;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
 
 /**
  * This class contains a basic implementation for {@link FieldGroupFieldFactory}
@@ -64,8 +64,7 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
     }
 
     @Override
-    public <T extends LegacyField> T createField(Class<?> type,
-            Class<T> fieldType) {
+    public <T extends Field> T createField(Class<?> type, Class<T> fieldType) {
         if (Enum.class.isAssignableFrom(type)) {
             return createEnumField(type, fieldType);
         } else if (Date.class.isAssignableFrom(type)) {
@@ -74,9 +73,9 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
                 || boolean.class.isAssignableFrom(type)) {
             return createBooleanField(fieldType);
         }
-        if (LegacyAbstractTextField.class.isAssignableFrom(fieldType)) {
+        if (AbstractTextField.class.isAssignableFrom(fieldType)) {
             return fieldType.cast(createAbstractTextField(
-                    fieldType.asSubclass(LegacyAbstractTextField.class)));
+                    fieldType.asSubclass(AbstractTextField.class)));
         } else if (fieldType == RichTextArea.class) {
             return fieldType.cast(createRichTextArea());
         }
@@ -90,7 +89,7 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
         return rta;
     }
 
-    private <T extends LegacyField> T createEnumField(Class<?> type,
+    private <T extends Field> T createEnumField(Class<?> type,
             Class<T> fieldType) {
         // Determine first if we should (or can) create a select for the enum
         Class<AbstractSelect> selectClass = null;
@@ -104,26 +103,26 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
             AbstractSelect s = createCompatibleSelect(selectClass);
             populateWithEnumData(s, (Class<? extends Enum>) type);
             return (T) s;
-        } else if (LegacyAbstractTextField.class.isAssignableFrom(fieldType)) {
+        } else if (AbstractTextField.class.isAssignableFrom(fieldType)) {
             return (T) createAbstractTextField(
-                    (Class<? extends LegacyAbstractTextField>) fieldType);
+                    (Class<? extends AbstractTextField>) fieldType);
         }
 
         return null;
     }
 
-    private <T extends LegacyField> T createDateField(Class<?> type,
+    private <T extends Field> T createDateField(Class<?> type,
             Class<T> fieldType) {
-        LegacyAbstractField field;
+        AbstractField field;
 
-        if (LegacyInlineDateField.class.isAssignableFrom(fieldType)) {
-            field = new LegacyInlineDateField();
+        if (InlineDateField.class.isAssignableFrom(fieldType)) {
+            field = new InlineDateField();
         } else if (anyField(fieldType)
-                || LegacyDateField.class.isAssignableFrom(fieldType)) {
-            field = new LegacyPopupDateField();
-        } else if (LegacyAbstractTextField.class.isAssignableFrom(fieldType)) {
+                || DateField.class.isAssignableFrom(fieldType)) {
+            field = new PopupDateField();
+        } else if (AbstractTextField.class.isAssignableFrom(fieldType)) {
             field = createAbstractTextField(
-                    (Class<? extends LegacyAbstractTextField>) fieldType);
+                    (Class<? extends AbstractTextField>) fieldType);
         } else {
             return null;
         }
@@ -163,8 +162,7 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
      * @return true if any LegacyAbstractField can be assigned to the field
      */
     protected boolean anyField(Class<?> fieldType) {
-        return fieldType == LegacyField.class
-                || fieldType == LegacyAbstractField.class;
+        return fieldType == Field.class || fieldType == AbstractField.class;
     }
 
     /**
@@ -173,27 +171,27 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
      *            the type of the field
      * @return true if any AbstractSelect can be assigned to the field
      */
-    protected boolean anySelect(Class<? extends LegacyField> fieldType) {
+    protected boolean anySelect(Class<? extends Field> fieldType) {
         return anyField(fieldType) || fieldType == AbstractSelect.class;
     }
 
-    protected <T extends LegacyField> T createBooleanField(Class<T> fieldType) {
-        if (fieldType.isAssignableFrom(LegacyCheckBox.class)) {
-            LegacyCheckBox cb = new LegacyCheckBox(null);
+    protected <T extends Field> T createBooleanField(Class<T> fieldType) {
+        if (fieldType.isAssignableFrom(CheckBox.class)) {
+            CheckBox cb = new CheckBox(null);
             cb.setImmediate(true);
             return (T) cb;
-        } else if (LegacyAbstractTextField.class.isAssignableFrom(fieldType)) {
+        } else if (AbstractTextField.class.isAssignableFrom(fieldType)) {
             return (T) createAbstractTextField(
-                    (Class<? extends LegacyAbstractTextField>) fieldType);
+                    (Class<? extends AbstractTextField>) fieldType);
         }
 
         return null;
     }
 
-    protected <T extends LegacyAbstractTextField> T createAbstractTextField(
+    protected <T extends AbstractTextField> T createAbstractTextField(
             Class<T> fieldType) {
-        if (fieldType == LegacyAbstractTextField.class) {
-            fieldType = (Class<T>) LegacyTextField.class;
+        if (fieldType == AbstractTextField.class) {
+            fieldType = (Class<T>) TextField.class;
         }
         try {
             T field = fieldType.newInstance();
@@ -218,11 +216,10 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
      * @return A field capable of editing the data or null if no field could be
      *         created
      */
-    protected <T extends LegacyField> T createDefaultField(Class<?> type,
+    protected <T extends Field> T createDefaultField(Class<?> type,
             Class<T> fieldType) {
-        if (fieldType.isAssignableFrom(LegacyTextField.class)) {
-            return fieldType
-                    .cast(createAbstractTextField(LegacyTextField.class));
+        if (fieldType.isAssignableFrom(TextField.class)) {
+            return fieldType.cast(createAbstractTextField(TextField.class));
         }
         return null;
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroup.java
index 1254009cfc..07eb9f27c8 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroup.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.fieldgroup;
+package com.vaadin.v7.data.fieldgroup;
 
 import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
@@ -25,14 +25,14 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.TransactionalPropertyWrapper;
-import com.vaadin.ui.DefaultFieldFactory;
 import com.vaadin.util.ReflectTools;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.Validator.InvalidValueException;
-import com.vaadin.v7.ui.LegacyAbstractField;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.data.util.TransactionalPropertyWrapper;
+import com.vaadin.v7.ui.AbstractField;
+import com.vaadin.v7.ui.DefaultFieldFactory;
+import com.vaadin.v7.ui.Field;
 
 /**
  * FieldGroup provides an easy way of binding fields to data and handling
@@ -59,8 +59,8 @@ public class FieldGroup implements Serializable {
     private boolean enabled = true;
     private boolean readOnly = false;
 
-    private HashMap<Object, LegacyField<?>> propertyIdToField = new HashMap<Object, LegacyField<?>>();
-    private LinkedHashMap<LegacyField<?>, Object> fieldToPropertyId = new LinkedHashMap<LegacyField<?>, Object>();
+    private HashMap<Object, Field<?>> propertyIdToField = new HashMap<Object, Field<?>>();
+    private LinkedHashMap<Field<?>, Object> fieldToPropertyId = new LinkedHashMap<Field<?>, Object>();
     private List<CommitHandler> commitHandlers = new ArrayList<CommitHandler>();
 
     /**
@@ -97,7 +97,7 @@ public class FieldGroup implements Serializable {
     public void setItemDataSource(Item itemDataSource) {
         this.itemDataSource = itemDataSource;
 
-        for (LegacyField<?> f : fieldToPropertyId.keySet()) {
+        for (Field<?> f : fieldToPropertyId.keySet()) {
             bind(f, fieldToPropertyId.get(f));
         }
     }
@@ -122,7 +122,7 @@ public class FieldGroup implements Serializable {
      *
      * @see #setBuffered(boolean) for more details on buffered mode
      *
-     * @see LegacyField#isBuffered()
+     * @see Field#isBuffered()
      * @return true if buffered mode is on, false otherwise
      *
      */
@@ -141,7 +141,7 @@ public class FieldGroup implements Serializable {
      * The default is to use buffered mode.
      * </p>
      *
-     * @see LegacyField#setBuffered(boolean)
+     * @see Field#setBuffered(boolean)
      * @param buffered
      *            true to turn on buffered mode, false otherwise
      */
@@ -151,7 +151,7 @@ public class FieldGroup implements Serializable {
         }
 
         this.buffered = buffered;
-        for (LegacyField<?> field : getFields()) {
+        for (Field<?> field : getFields()) {
             field.setBuffered(buffered);
         }
     }
@@ -177,7 +177,7 @@ public class FieldGroup implements Serializable {
      */
     public void setEnabled(boolean fieldsEnabled) {
         enabled = fieldsEnabled;
-        for (LegacyField<?> field : getFields()) {
+        for (Field<?> field : getFields()) {
             field.setEnabled(fieldsEnabled);
         }
     }
@@ -207,7 +207,7 @@ public class FieldGroup implements Serializable {
      */
     public void setReadOnly(boolean fieldsReadOnly) {
         readOnly = fieldsReadOnly;
-        for (LegacyField<?> field : getFields()) {
+        for (Field<?> field : getFields()) {
             if (field.getPropertyDataSource() == null
                     || !field.getPropertyDataSource().isReadOnly()) {
                 field.setReadOnly(fieldsReadOnly);
@@ -225,7 +225,7 @@ public class FieldGroup implements Serializable {
      *
      * @return A collection with all bound Fields
      */
-    public Collection<LegacyField<?>> getFields() {
+    public Collection<Field<?>> getFields() {
         return fieldToPropertyId.keySet();
     }
 
@@ -245,7 +245,7 @@ public class FieldGroup implements Serializable {
      *             If the field is null or the property id is already bound to
      *             another field by this field binder
      */
-    public void bind(LegacyField<?> field, Object propertyId)
+    public void bind(Field<?> field, Object propertyId)
             throws BindException {
         throwIfFieldIsNull(field, propertyId);
         throwIfPropertyIdAlreadyBound(field, propertyId);
@@ -285,7 +285,7 @@ public class FieldGroup implements Serializable {
         return new TransactionalPropertyWrapper<T>(itemProperty);
     }
 
-    private void throwIfFieldIsNull(LegacyField<?> field, Object propertyId) {
+    private void throwIfFieldIsNull(Field<?> field, Object propertyId) {
         if (field == null) {
             throw new BindException(String.format(
                     "Cannot bind property id '%s' to a null field.",
@@ -293,7 +293,7 @@ public class FieldGroup implements Serializable {
         }
     }
 
-    private void throwIfPropertyIdAlreadyBound(LegacyField<?> field,
+    private void throwIfPropertyIdAlreadyBound(Field<?> field,
             Object propertyId) {
         if (propertyIdToField.containsKey(propertyId)
                 && propertyIdToField.get(propertyId) != field) {
@@ -340,7 +340,7 @@ public class FieldGroup implements Serializable {
      *             If the field is not bound by this field binder or not bound
      *             to the correct property id
      */
-    public void unbind(LegacyField<?> field) throws BindException {
+    public void unbind(Field<?> field) throws BindException {
         Object propertyId = fieldToPropertyId.get(field);
         if (propertyId == null) {
             throw new BindException(
@@ -376,7 +376,7 @@ public class FieldGroup implements Serializable {
      * @param field
      *            The field to update
      */
-    protected void configureField(LegacyField<?> field) {
+    protected void configureField(Field<?> field) {
         field.setBuffered(isBuffered());
 
         field.setEnabled(isEnabled());
@@ -472,7 +472,7 @@ public class FieldGroup implements Serializable {
         try {
             firePreCommitEvent();
 
-            Map<LegacyField<?>, InvalidValueException> invalidValueExceptions = commitFields();
+            Map<Field<?>, InvalidValueException> invalidValueExceptions = commitFields();
 
             if (invalidValueExceptions.isEmpty()) {
                 firePostCommitEvent();
@@ -495,10 +495,10 @@ public class FieldGroup implements Serializable {
      * @return a propertyId to validation exception map which is empty if all
      *         commits succeeded
      */
-    private Map<LegacyField<?>, InvalidValueException> commitFields() {
-        Map<LegacyField<?>, InvalidValueException> invalidValueExceptions = new HashMap<LegacyField<?>, InvalidValueException>();
+    private Map<Field<?>, InvalidValueException> commitFields() {
+        Map<Field<?>, InvalidValueException> invalidValueExceptions = new HashMap<Field<?>, InvalidValueException>();
 
-        for (LegacyField<?> f : fieldToPropertyId.keySet()) {
+        for (Field<?> f : fieldToPropertyId.keySet()) {
             try {
                 f.commit();
             } catch (InvalidValueException e) {
@@ -517,7 +517,7 @@ public class FieldGroup implements Serializable {
      */
     public static class FieldGroupInvalidValueException
             extends InvalidValueException {
-        private Map<LegacyField<?>, InvalidValueException> invalidValueExceptions;
+        private Map<Field<?>, InvalidValueException> invalidValueExceptions;
 
         /**
          * Constructs a new exception with the specified validation exceptions.
@@ -526,7 +526,7 @@ public class FieldGroup implements Serializable {
          *            a property id to exception map
          */
         public FieldGroupInvalidValueException(
-                Map<LegacyField<?>, InvalidValueException> invalidValueExceptions) {
+                Map<Field<?>, InvalidValueException> invalidValueExceptions) {
             super(null, invalidValueExceptions.values().toArray(
                     new InvalidValueException[invalidValueExceptions.size()]));
             this.invalidValueExceptions = invalidValueExceptions;
@@ -538,13 +538,13 @@ public class FieldGroup implements Serializable {
          *
          * @return a map with all the invalid value exceptions
          */
-        public Map<LegacyField<?>, InvalidValueException> getInvalidFields() {
+        public Map<Field<?>, InvalidValueException> getInvalidFields() {
             return invalidValueExceptions;
         }
     }
 
     private void startTransactions() throws CommitException {
-        for (LegacyField<?> f : fieldToPropertyId.keySet()) {
+        for (Field<?> f : fieldToPropertyId.keySet()) {
             Property.Transactional<?> property = (Property.Transactional<?>) f
                     .getPropertyDataSource();
             if (property == null) {
@@ -557,13 +557,13 @@ public class FieldGroup implements Serializable {
     }
 
     private void commitTransactions() {
-        for (LegacyField<?> f : fieldToPropertyId.keySet()) {
+        for (Field<?> f : fieldToPropertyId.keySet()) {
             ((Property.Transactional<?>) f.getPropertyDataSource()).commit();
         }
     }
 
     private void rollbackTransactions() {
-        for (LegacyField<?> f : fieldToPropertyId.keySet()) {
+        for (Field<?> f : fieldToPropertyId.keySet()) {
             try {
                 ((Property.Transactional<?>) f.getPropertyDataSource())
                         .rollback();
@@ -610,7 +610,7 @@ public class FieldGroup implements Serializable {
      *
      */
     public void discard() {
-        for (LegacyField<?> f : fieldToPropertyId.keySet()) {
+        for (Field<?> f : fieldToPropertyId.keySet()) {
             try {
                 f.discard();
             } catch (Exception e) {
@@ -629,7 +629,7 @@ public class FieldGroup implements Serializable {
      * @return The field that is bound to the property id or null if no field is
      *         bound to that property id
      */
-    public LegacyField<?> getField(Object propertyId) {
+    public Field<?> getField(Object propertyId) {
         return propertyIdToField.get(propertyId);
     }
 
@@ -641,7 +641,7 @@ public class FieldGroup implements Serializable {
      * @return The property id that is bound to the field or null if the field
      *         is not bound to any property id by this FieldBinder
      */
-    public Object getPropertyId(LegacyField<?> field) {
+    public Object getPropertyId(Field<?> field) {
         return fieldToPropertyId.get(field);
     }
 
@@ -745,14 +745,14 @@ public class FieldGroup implements Serializable {
     /**
      * Checks the validity of the bound fields.
      * <p>
-     * Call the {@link LegacyField#validate()} for the fields to get the
+     * Call the {@link Field#validate()} for the fields to get the
      * individual error messages.
      *
      * @return true if all bound fields are valid, false otherwise.
      */
     public boolean isValid() {
         try {
-            for (LegacyField<?> field : getFields()) {
+            for (Field<?> field : getFields()) {
                 field.validate();
             }
             return true;
@@ -767,7 +767,7 @@ public class FieldGroup implements Serializable {
      * @return true if at least one field has been modified, false otherwise
      */
     public boolean isModified() {
-        for (LegacyField<?> field : getFields()) {
+        for (Field<?> field : getFields()) {
             if (field.isModified()) {
                 return true;
             }
@@ -801,7 +801,7 @@ public class FieldGroup implements Serializable {
      * Binds member fields found in the given object.
      * <p>
      * This method processes all (Java) member fields whose type extends
-     * {@link LegacyField} and that can be mapped to a property id. Property id
+     * {@link Field} and that can be mapped to a property id. Property id
      * mapping is done based on the field name or on a @{@link PropertyId}
      * annotation on the field. All non-null fields for which a property id can
      * be determined are bound to the property id.
@@ -841,7 +841,7 @@ public class FieldGroup implements Serializable {
      * that have not been initialized.
      * <p>
      * This method processes all (Java) member fields whose type extends
-     * {@link LegacyField} and that can be mapped to a property id. Property ids
+     * {@link Field} and that can be mapped to a property id. Property ids
      * are searched in the following order: @{@link PropertyId} annotations,
      * exact field name matches and the case-insensitive matching that ignores
      * underscores. Fields that are not initialized (null) are built using the
@@ -886,7 +886,7 @@ public class FieldGroup implements Serializable {
      * member fields that have not been initialized.
      * <p>
      * This method processes all (Java) member fields whose type extends
-     * {@link LegacyField} and that can be mapped to a property id. Property ids
+     * {@link Field} and that can be mapped to a property id. Property ids
      * are searched in the following order: @{@link PropertyId} annotations,
      * exact field name matches and the case-insensitive matching that ignores
      * underscores. Fields that are not initialized (null) are built using the
@@ -907,7 +907,7 @@ public class FieldGroup implements Serializable {
         for (java.lang.reflect.Field memberField : getFieldsInDeclareOrder(
                 objectClass)) {
 
-            if (!LegacyField.class.isAssignableFrom(memberField.getType())) {
+            if (!Field.class.isAssignableFrom(memberField.getType())) {
                 // Process next field
                 continue;
             }
@@ -915,7 +915,7 @@ public class FieldGroup implements Serializable {
             PropertyId propertyIdAnnotation = memberField
                     .getAnnotation(PropertyId.class);
 
-            Class<? extends LegacyField> fieldType = (Class<? extends LegacyField>) memberField
+            Class<? extends Field> fieldType = (Class<? extends Field>) memberField
                     .getType();
 
             Object propertyId = null;
@@ -945,11 +945,11 @@ public class FieldGroup implements Serializable {
                 continue;
             }
 
-            LegacyField<?> field;
+            Field<?> field;
             try {
                 // Get the field from the object
-                field = (LegacyField<?>) ReflectTools.getJavaFieldValue(
-                        objectWithMemberFields, memberField, LegacyField.class);
+                field = (Field<?>) ReflectTools.getJavaFieldValue(
+                        objectWithMemberFields, memberField, Field.class);
             } catch (Exception e) {
                 // If we cannot determine the value, just skip the field and try
                 // the next one
@@ -1082,12 +1082,12 @@ public class FieldGroup implements Serializable {
          * @return a map with all the invalid value exceptions. Can be empty but
          *         not null
          */
-        public Map<LegacyField<?>, InvalidValueException> getInvalidFields() {
+        public Map<Field<?>, InvalidValueException> getInvalidFields() {
             if (getCause() instanceof FieldGroupInvalidValueException) {
                 return ((FieldGroupInvalidValueException) getCause())
                         .getInvalidFields();
             }
-            return new HashMap<LegacyField<?>, InvalidValueException>();
+            return new HashMap<Field<?>, InvalidValueException>();
         }
 
         /**
@@ -1137,7 +1137,7 @@ public class FieldGroup implements Serializable {
      *             If there is a problem while building or binding
      * @return The created and bound field
      */
-    public LegacyField<?> buildAndBind(Object propertyId) throws BindException {
+    public Field<?> buildAndBind(Object propertyId) throws BindException {
         String caption = DefaultFieldFactory
                 .createCaptionByPropertyId(propertyId);
         return buildAndBind(caption, propertyId);
@@ -1155,11 +1155,11 @@ public class FieldGroup implements Serializable {
      * @throws BindException
      *             If there is a problem while building or binding
      * @return The created and bound field. Can be any type of
-     *         {@link LegacyField}.
+     *         {@link Field}.
      */
-    public LegacyField<?> buildAndBind(String caption, Object propertyId)
+    public Field<?> buildAndBind(String caption, Object propertyId)
             throws BindException {
-        return buildAndBind(caption, propertyId, LegacyField.class);
+        return buildAndBind(caption, propertyId, Field.class);
     }
 
     /**
@@ -1174,10 +1174,10 @@ public class FieldGroup implements Serializable {
      * @throws BindException
      *             If the field could not be created
      * @return The created and bound field. Can be any type of
-     *         {@link LegacyField}.
+     *         {@link Field}.
      */
 
-    public <T extends LegacyField> T buildAndBind(String caption,
+    public <T extends Field> T buildAndBind(String caption,
             Object propertyId, Class<T> fieldType) throws BindException {
         Class<?> type = getPropertyType(propertyId);
 
@@ -1191,7 +1191,7 @@ public class FieldGroup implements Serializable {
      * Creates a field based on the given data type.
      * <p>
      * The data type is the type that we want to edit using the field. The field
-     * type is the type of field we want to create, can be {@link LegacyField}
+     * type is the type of field we want to create, can be {@link Field}
      * if any LegacyField is good.
      * </p>
      *
@@ -1205,7 +1205,7 @@ public class FieldGroup implements Serializable {
      * @throws BindException
      *             If the field could not be created
      */
-    protected <T extends LegacyField> T build(String caption, Class<?> dataType,
+    protected <T extends Field> T build(String caption, Class<?> dataType,
             Class<T> fieldType) throws BindException {
         T field = getFieldFactory().createField(dataType, fieldType);
         if (field == null) {
@@ -1247,9 +1247,9 @@ public class FieldGroup implements Serializable {
      * @since 7.4
      */
     public void clear() {
-        for (LegacyField<?> f : getFields()) {
-            if (f instanceof LegacyAbstractField) {
-                ((LegacyAbstractField) f).clear();
+        for (Field<?> f : getFields()) {
+            if (f instanceof AbstractField) {
+                ((AbstractField) f).clear();
             }
         }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroupFieldFactory.java
index a80d51c6df..275f96761a 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroupFieldFactory.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.fieldgroup;
+package com.vaadin.v7.data.fieldgroup;
 
 import java.io.Serializable;
 
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.ui.Field;
 
 /**
  * Factory interface for creating new LegacyField-instances based on the data
@@ -34,10 +34,10 @@ public interface FieldGroupFieldFactory extends Serializable {
      *            The type that we want to edit using the field
      * @param fieldType
      *            The type of field we want to create. If set to
-     *            {@link LegacyField} then any type of field is accepted
+     *            {@link Field} then any type of field is accepted
      * @return A field that can be assigned to the given fieldType and that is
      *         capable of editing the given type of data
      */
-    <T extends LegacyField> T createField(Class<?> dataType,
+    <T extends Field> T createField(Class<?> dataType,
             Class<T> fieldType);
 }
diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/PropertyId.java
index 6476635829..09426bc811 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/PropertyId.java
@@ -13,24 +13,24 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.fieldgroup;
+package com.vaadin.v7.data.fieldgroup;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.ui.Field;
 
 /**
- * Defines the custom property name to be bound to a {@link LegacyField} using
+ * Defines the custom property name to be bound to a {@link Field} using
  * {@link FieldGroup} or {@link BeanFieldGroup}.
  * <p>
  * The automatic data binding in FieldGroup and BeanFieldGroup relies on a
  * naming convention by default: properties of an item are bound to similarly
  * named field components in given a editor object. If you want to map a
  * property with a different name (ID) to a
- * {@link com.vaadin.client.ui.LegacyField}, you can use this annotation for the
+ * {@link com.vaadin.client.ui.Field}, you can use this annotation for the
  * member fields, with the name (ID) of the desired property as the parameter.
  * <p>
  * In following usage example, the text field would be bound to property "foo"
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractBeanContainer.java
index 995e2f8675..4b004d95fa 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractBeanContainer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -23,19 +23,19 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.Filterable;
-import com.vaadin.data.Container.PropertySetChangeNotifier;
-import com.vaadin.data.Container.SimpleFilterable;
-import com.vaadin.data.Container.Sortable;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.Property.ValueChangeNotifier;
-import com.vaadin.data.util.MethodProperty.MethodException;
-import com.vaadin.data.util.filter.SimpleStringFilter;
-import com.vaadin.data.util.filter.UnsupportedFilterException;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Filterable;
+import com.vaadin.v7.data.Container.PropertySetChangeNotifier;
+import com.vaadin.v7.data.Container.SimpleFilterable;
+import com.vaadin.v7.data.Container.Sortable;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.Property.ValueChangeNotifier;
+import com.vaadin.v7.data.util.MethodProperty.MethodException;
+import com.vaadin.v7.data.util.filter.SimpleStringFilter;
+import com.vaadin.v7.data.util.filter.UnsupportedFilterException;
 
 /**
  * An abstract base class for in-memory containers for JavaBeans.
@@ -524,7 +524,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
      * added at the very end of the unfiltered container and not after the last
      * visible item if filtering is used.
      *
-     * @see com.vaadin.data.Container#addItem(Object)
+     * @see com.com.vaadin.v7.data.Container#addItem(Object)
      */
     protected BeanItem<BEANTYPE> addItem(IDTYPE itemId, BEANTYPE bean) {
         if (!validateBean(bean)) {
@@ -536,7 +536,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
     /**
      * Adds the bean after the given bean.
      *
-     * @see com.vaadin.data.Container.Ordered#addItemAfter(Object, Object)
+     * @see com.com.vaadin.v7.data.Container.Ordered#addItemAfter(Object, Object)
      */
     protected BeanItem<BEANTYPE> addItemAfter(IDTYPE previousItemId,
             IDTYPE newItemId, BEANTYPE bean) {
@@ -795,7 +795,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     *             {@link #removePropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)}
      **/
     @Deprecated
     @Override
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/AbstractContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractContainer.java
index 1995102345..f57da653a5 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/AbstractContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractContainer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -21,7 +21,7 @@ import java.util.Collections;
 import java.util.EventObject;
 import java.util.LinkedList;
 
-import com.vaadin.data.Container;
+import com.vaadin.v7.data.Container;
 
 /**
  * Abstract container class that manages event listeners and sending events to
@@ -98,7 +98,7 @@ public abstract class AbstractContainer implements Container {
      * {@link PropertySetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
      *
-     * @see PropertySetChangeNotifier#addListener(com.vaadin.data.Container.PropertySetChangeListener)
+     * @see PropertySetChangeNotifier#addListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)
      */
     protected void addPropertySetChangeListener(
             Container.PropertySetChangeListener listener) {
@@ -111,7 +111,7 @@ public abstract class AbstractContainer implements Container {
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     *             {@link #addPropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)}
      **/
     @Deprecated
     protected void addListener(Container.PropertySetChangeListener listener) {
@@ -123,7 +123,7 @@ public abstract class AbstractContainer implements Container {
      * {@link PropertySetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
      *
-     * @see PropertySetChangeNotifier#removeListener(com.vaadin.data.Container.
+     * @see PropertySetChangeNotifier#removeListener(com.com.vaadin.v7.data.Container.
      *      PropertySetChangeListener)
      */
     protected void removePropertySetChangeListener(
@@ -135,7 +135,7 @@ public abstract class AbstractContainer implements Container {
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     *             {@link #removePropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)}
      **/
     @Deprecated
     protected void removeListener(
@@ -150,7 +150,7 @@ public abstract class AbstractContainer implements Container {
      * {@link ItemSetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
      *
-     * @see ItemSetChangeNotifier#addListener(com.vaadin.data.Container.ItemSetChangeListener)
+     * @see ItemSetChangeNotifier#addListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)
      */
     protected void addItemSetChangeListener(
             Container.ItemSetChangeListener listener) {
@@ -163,7 +163,7 @@ public abstract class AbstractContainer implements Container {
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #addItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Deprecated
     protected void addListener(Container.ItemSetChangeListener listener) {
@@ -175,7 +175,7 @@ public abstract class AbstractContainer implements Container {
      * {@link ItemSetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
      *
-     * @see ItemSetChangeNotifier#removeListener(com.vaadin.data.Container.ItemSetChangeListener)
+     * @see ItemSetChangeNotifier#removeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)
      */
     protected void removeItemSetChangeListener(
             Container.ItemSetChangeListener listener) {
@@ -186,7 +186,7 @@ public abstract class AbstractContainer implements Container {
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #addItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Deprecated
     protected void removeListener(Container.ItemSetChangeListener listener) {
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractInMemoryContainer.java
index 43b65ab75e..78c908f78a 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractInMemoryContainer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -25,11 +25,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.ItemSetChangeNotifier;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.filter.SimpleStringFilter;
-import com.vaadin.data.util.filter.UnsupportedFilterException;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.ItemSetChangeNotifier;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.filter.SimpleStringFilter;
+import com.vaadin.v7.data.util.filter.UnsupportedFilterException;
 
 /**
  * Abstract {@link Container} class that handles common functionality for
@@ -67,18 +67,18 @@ import com.vaadin.data.util.filter.UnsupportedFilterException;
  * <code>sort(Object[], boolean[])</code>.
  *
  * To implement {@link Filterable}, subclasses need to implement the methods
- * {@link Filterable#addContainerFilter(com.vaadin.data.Container.Filter)}
+ * {@link Filterable#addContainerFilter(com.com.vaadin.v7.data.Container.Filter)}
  * (calling {@link #addFilter(Filter)}),
  * {@link Filterable#removeAllContainerFilters()} (calling
  * {@link #removeAllFilters()}) and
- * {@link Filterable#removeContainerFilter(com.vaadin.data.Container.Filter)}
- * (calling {@link #removeFilter(com.vaadin.data.Container.Filter)}).
+ * {@link Filterable#removeContainerFilter(com.com.vaadin.v7.data.Container.Filter)}
+ * (calling {@link #removeFilter(com.com.vaadin.v7.data.Container.Filter)}).
  *
  * To implement {@link SimpleFilterable}, subclasses also need to implement the
  * methods
  * {@link SimpleFilterable#addContainerFilter(Object, String, boolean, boolean)}
  * and {@link SimpleFilterable#removeContainerFilters(Object)} calling
- * {@link #addFilter(com.vaadin.data.Container.Filter)} and
+ * {@link #addFilter(com.com.vaadin.v7.data.Container.Filter)} and
  * {@link #removeFilters(Object)} respectively.
  *
  * @param <ITEMIDTYPE>
@@ -444,7 +444,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     // ItemSetChangeNotifier
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #addItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Deprecated
     @Override
@@ -466,7 +466,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #removeItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Deprecated
     @Override
@@ -566,7 +566,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * be in-memory filterable.
      *
      * This can be used to implement
-     * {@link Filterable#addContainerFilter(com.vaadin.data.Container.Filter)}
+     * {@link Filterable#addContainerFilter(com.com.vaadin.v7.data.Container.Filter)}
      * and optionally also
      * {@link SimpleFilterable#addContainerFilter(Object, String, boolean, boolean)}
      * (with {@link SimpleStringFilter}).
@@ -606,7 +606,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * Remove a specific container filter and re-filter the view (if necessary).
      *
      * This can be used to implement
-     * {@link Filterable#removeContainerFilter(com.vaadin.data.Container.Filter)}
+     * {@link Filterable#removeContainerFilter(com.com.vaadin.v7.data.Container.Filter)}
      * .
      */
     protected void removeFilter(Filter filter) {
@@ -718,7 +718,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * Subclasses should call this from a public
      * {@link #sort(Object[], boolean[])} method when implementing Sortable.
      *
-     * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[],
+     * @see com.com.vaadin.v7.data.Container.Sortable#sort(java.lang.Object[],
      *      boolean[])
      */
     protected void sortContainer(Object[] propertyId, boolean[] ascending) {
@@ -1142,7 +1142,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * Set the internal collection of filters without performing filtering.
      *
      * This method is mostly for internal use, use
-     * {@link #addFilter(com.vaadin.data.Container.Filter)} and
+     * {@link #addFilter(com.com.vaadin.v7.data.Container.Filter)} and
      * <code>remove*Filter*</code> (which also re-filter the container) instead
      * when possible.
      *
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/BeanContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java
index 01a5256199..0127adbfee 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/BeanContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.util.Collection;
 
@@ -40,7 +40,7 @@ import java.util.Collection;
  *
  * <p>
  * If a bean id resolver is set using
- * {@link #setBeanIdResolver(com.vaadin.data.util.AbstractBeanContainer.BeanIdResolver)}
+ * {@link #setBeanIdResolver(com.vaadin.v7.data.util.AbstractBeanContainer.BeanIdResolver)}
  * or {@link #setBeanIdProperty(Object)}, the methods {@link #addBean(Object)},
  * {@link #addBeanAfter(Object, Object)}, {@link #addBeanAt(int, Object)} and
  * {@link #addAll(java.util.Collection)} can be used to add items to the
@@ -78,7 +78,7 @@ public class BeanContainer<IDTYPE, BEANTYPE>
     /**
      * Adds the bean to the Container.
      *
-     * @see com.vaadin.data.Container#addItem(Object)
+     * @see com.com.vaadin.v7.data.Container#addItem(Object)
      */
     @Override
     public BeanItem<BEANTYPE> addItem(IDTYPE itemId, BEANTYPE bean) {
@@ -92,7 +92,7 @@ public class BeanContainer<IDTYPE, BEANTYPE>
     /**
      * Adds the bean after the given item id.
      *
-     * @see com.vaadin.data.Container.Ordered#addItemAfter(Object, Object)
+     * @see com.com.vaadin.v7.data.Container.Ordered#addItemAfter(Object, Object)
      */
     @Override
     public BeanItem<BEANTYPE> addItemAfter(IDTYPE previousItemId,
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/BeanItem.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java
index 2725606a4d..78ec807fd1 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/BeanItem.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;
@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.vaadin.data.util.BeanUtil;
+
 /**
  * A wrapper class for adding the Item interface to any Java Bean.
  *
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/BeanItemContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItemContainer.java
index 66e553164d..1e75901b04 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/BeanItemContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItemContainer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.util.Collection;
 
@@ -186,7 +186,7 @@ public class BeanItemContainer<BEANTYPE>
      * @param newItemId
      *            the bean (of type BT) to add (not null)
      *
-     * @see com.vaadin.data.Container.Ordered#addItemAfter(Object, Object)
+     * @see com.com.vaadin.v7.data.Container.Ordered#addItemAfter(Object, Object)
      */
     @Override
     @SuppressWarnings("unchecked")
@@ -219,7 +219,7 @@ public class BeanItemContainer<BEANTYPE>
      *
      * The bean is used both as the item contents and as the item identifier.
      *
-     * @see com.vaadin.data.Container#addItem(Object)
+     * @see com.com.vaadin.v7.data.Container#addItem(Object)
      */
     @Override
     @SuppressWarnings("unchecked")
@@ -232,7 +232,7 @@ public class BeanItemContainer<BEANTYPE>
      *
      * The bean is used both as the item contents and as the item identifier.
      *
-     * @see com.vaadin.data.Container#addItem(Object)
+     * @see com.com.vaadin.v7.data.Container#addItem(Object)
      */
     @Override
     public BeanItem<BEANTYPE> addBean(BEANTYPE bean) {
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapper.java
index 9e108cd615..308a1e9fd2 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapper.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.io.Serializable;
 import java.util.Arrays;
@@ -27,14 +27,14 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
 
 /**
  * <p>
  * A wrapper class for adding external hierarchy to containers not implementing
- * the {@link com.vaadin.data.Container.Hierarchical} interface.
+ * the {@link com.vaadin.v7.data.Container.Hierarchical} interface.
  * </p>
  *
  * <p>
@@ -356,7 +356,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      * this method fails and <code>false</code> is returned; the children must
      * be first explicitly removed with
      * {@link #setParent(Object itemId, Object newParentId)} or
-     * {@link com.vaadin.data.Container#removeItem(Object itemId)}.
+     * {@link com.vaadin.v7.data.Container#removeItem(Object itemId)}.
      * </p>
      *
      * @param itemId
@@ -736,7 +736,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #addItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Override
     @Deprecated
@@ -761,7 +761,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #removeItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Override
     @Deprecated
@@ -786,7 +786,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     *             {@link #addPropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)}
      **/
     @Override
     @Deprecated
@@ -811,7 +811,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     *             {@link #removePropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)}
      **/
     @Override
     @Deprecated
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/FilesystemContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java
index 46b4f4bcd4..7800a6ff50 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/FilesystemContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -30,11 +30,11 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
 import com.vaadin.server.Resource;
 import com.vaadin.util.FileTypeResolver;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
 
 /**
  * A hierarchical container wrapper for a filesystem.
@@ -739,7 +739,7 @@ public class FilesystemContainer implements Container.Hierarchical {
         /**
          * Filesystem container does not support adding new properties.
          *
-         * @see com.vaadin.data.Item#addItemProperty(Object, Property)
+         * @see com.vaadin.v7.data.Item#addItemProperty(Object, Property)
          */
         @Override
         public boolean addItemProperty(Object id, Property property)
@@ -751,7 +751,7 @@ public class FilesystemContainer implements Container.Hierarchical {
         /**
          * Filesystem container does not support removing properties.
          *
-         * @see com.vaadin.data.Item#removeItemProperty(Object)
+         * @see com.vaadin.v7.data.Item#removeItemProperty(Object)
          */
         @Override
         public boolean removeItemProperty(Object id)
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/GeneratedPropertyContainer.java
index 8d7a1512f9..cfa061db02 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/GeneratedPropertyContainer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -27,12 +27,12 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
 import com.vaadin.data.sort.SortOrder;
-import com.vaadin.data.util.filter.UnsupportedFilterException;
 import com.vaadin.shared.data.sort.SortDirection;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.filter.UnsupportedFilterException;
 
 /**
  * Container wrapper that adds support for generated properties. This container
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java
index 115fd91791..04940918de 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -26,8 +26,8 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
 
 /**
  * A specialized Container whose contents can be accessed like it was a
@@ -194,7 +194,7 @@ public class HierarchicalContainer extends IndexedContainer
      * this method fails and <code>false</code> is returned; the children must
      * be first explicitly removed with
      * {@link #setParent(Object itemId, Object newParentId)} or
-     * {@link com.vaadin.data.Container#removeItem(Object itemId)}.
+     * {@link com.vaadin.v7.data.Container#removeItem(Object itemId)}.
      * </p>
      *
      * @param itemId
@@ -431,7 +431,7 @@ public class HierarchicalContainer extends IndexedContainer
 
     @Override
     protected void fireItemSetChange(
-            com.vaadin.data.Container.ItemSetChangeEvent event) {
+            com.vaadin.v7.data.Container.ItemSetChangeEvent event) {
         if (contentsChangeEventsOn()) {
             super.fireItemSetChange(event);
         } else {
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/IndexedContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java
index 4ff253394a..cbec3a2327 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/IndexedContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -29,11 +29,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.filter.SimpleStringFilter;
-import com.vaadin.data.util.filter.UnsupportedFilterException;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.filter.SimpleStringFilter;
+import com.vaadin.v7.data.util.filter.UnsupportedFilterException;
 
 /**
  * An implementation of the <code>{@link Container.Indexed}</code> interface
@@ -50,7 +50,7 @@ import com.vaadin.data.util.filter.UnsupportedFilterException;
  * <li>Sends all needed events on content changes.
  * </ul>
  *
- * @see com.vaadin.data.Container
+ * @see com.vaadin.v7.data.Container
  *
  * @author Vaadin Ltd.
  * @since 3.0
@@ -503,7 +503,7 @@ public class IndexedContainer
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     *             {@link #addPropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)}
      **/
     @Deprecated
     @Override
@@ -519,7 +519,7 @@ public class IndexedContainer
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     *             {@link #removePropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)}
      **/
     @Deprecated
     @Override
@@ -543,7 +543,7 @@ public class IndexedContainer
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+     *             {@link #addValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)}
      **/
     @Override
     @Deprecated
@@ -567,7 +567,7 @@ public class IndexedContainer
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+     *             {@link #removeValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)}
      **/
     @Override
     @Deprecated
@@ -818,7 +818,7 @@ public class IndexedContainer
          * properties at container level. See
          * {@link IndexedContainer#addContainerProperty(Object, Class, Object)}
          *
-         * @see com.vaadin.data.Item#addProperty(Object, Property)
+         * @see com.vaadin.v7.data.Item#addProperty(Object, Property)
          */
         @Override
         public boolean addItemProperty(Object id, Property property)
@@ -832,7 +832,7 @@ public class IndexedContainer
          * properties at container level. See
          * {@link IndexedContainer#removeContainerProperty(Object)}
          *
-         * @see com.vaadin.data.Item#removeProperty(Object)
+         * @see com.vaadin.v7.data.Item#removeProperty(Object)
          */
         @Override
         public boolean removeItemProperty(Object id)
@@ -1009,7 +1009,7 @@ public class IndexedContainer
 
         /**
          * @deprecated As of 7.0, replaced by
-         *             {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+         *             {@link #addValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)}
          **/
         @Override
         @Deprecated
@@ -1031,7 +1031,7 @@ public class IndexedContainer
 
         /**
          * @deprecated As of 7.0, replaced by
-         *             {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+         *             {@link #removeValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)}
          **/
         @Override
         @Deprecated
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/CacheFlushNotifier.java
index d3559b5652..fe9af78922 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/CacheFlushNotifier.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.io.Serializable;
 import java.lang.ref.ReferenceQueue;
@@ -21,9 +21,9 @@ import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.vaadin.data.util.sqlcontainer.query.FreeformQuery;
-import com.vaadin.data.util.sqlcontainer.query.QueryDelegate;
-import com.vaadin.data.util.sqlcontainer.query.TableQuery;
+import com.vaadin.v7.data.util.sqlcontainer.query.FreeformQuery;
+import com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate;
+import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery;
 
 /**
  * CacheFlushNotifier is a simple static notification mechanism to inform other
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheMap.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/CacheMap.java
index 77919f72b2..f986e7db51 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheMap.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/CacheMap.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/ColumnProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ColumnProperty.java
index e7d83e118d..d437cc9b33 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ColumnProperty.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.sql.Date;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.logging.Logger;
 
-import com.vaadin.data.Property;
-import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.converter.Converter.ConversionException;
 
 /**
  * ColumnProperty represents the value of one column in a RowItem. In addition
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/OptimisticLockException.java
index 1a29d531bc..887aa9c458 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/OptimisticLockException.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
-import com.vaadin.data.util.sqlcontainer.query.TableQuery;
+import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery;
 
 /**
  * An OptimisticLockException is thrown when trying to update or delete a row
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ReadOnlyRowId.java
index 367135782f..2a6cca6fc6 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ReadOnlyRowId.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 public class ReadOnlyRowId extends RowId {
     private static final long serialVersionUID = -2626764781642012467L;
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/Reference.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/Reference.java
index ce6680089d..a80b07aca2 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/Reference.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/Reference.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.io.Serializable;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowId.java
index 5f78df79e1..0181dac2b3 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowId.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/RowItem.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowItem.java
index ffc8bfc6f7..b8039e1e68 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/RowItem.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowItem.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
 
 /**
  * RowItem represents one row of a result set obtained from a QueryDelegate.
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java
index dde57d3610..b2d5b91746 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.io.IOException;
 import java.sql.ResultSet;
@@ -32,19 +32,19 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.ContainerHelpers;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.filter.Compare.Equal;
-import com.vaadin.data.util.filter.Like;
-import com.vaadin.data.util.filter.UnsupportedFilterException;
-import com.vaadin.data.util.sqlcontainer.query.OrderBy;
-import com.vaadin.data.util.sqlcontainer.query.QueryDelegate;
-import com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener;
-import com.vaadin.data.util.sqlcontainer.query.TableQuery;
-import com.vaadin.data.util.sqlcontainer.query.generator.MSSQLGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.OracleGenerator;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.ContainerHelpers;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.filter.Compare.Equal;
+import com.vaadin.v7.data.util.filter.Like;
+import com.vaadin.v7.data.util.filter.UnsupportedFilterException;
+import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy;
+import com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate;
+import com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener;
+import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.MSSQLGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.OracleGenerator;
 
 public class SQLContainer implements Container, Container.Filterable,
         Container.Indexed, Container.Sortable, Container.ItemSetChangeNotifier {
@@ -1592,7 +1592,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #addItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Override
     @Deprecated
@@ -1618,7 +1618,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #removeItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Override
     @Deprecated
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLUtil.java
index 2abe45d5fc..3939f7ab08 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLUtil.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.io.Serializable;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/TemporaryRowId.java
index 5cd3e6fac8..78c3339f05 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/TemporaryRowId.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 public class TemporaryRowId extends RowId {
     private static final long serialVersionUID = -641983830469018329L;
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/J2EEConnectionPool.java
index cf50a641de..55ab7f041a 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/J2EEConnectionPool.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.connection;
+package com.vaadin.v7.data.util.sqlcontainer.connection;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/JDBCConnectionPool.java
index 842a264caa..fce1d8aa25 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/JDBCConnectionPool.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.connection;
+package com.vaadin.v7.data.util.sqlcontainer.connection;
 
 import java.io.Serializable;
 import java.sql.Connection;
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java
index 9cf02a9e68..fb4444a436 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.connection;
+package com.vaadin.v7.data.util.sqlcontainer.connection;
 
 import java.io.IOException;
 import java.sql.Connection;
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/AbstractTransactionalQuery.java
index 586fe28171..dc582dd120 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/AbstractTransactionalQuery.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query;
+package com.vaadin.v7.data.util.sqlcontainer.query;
 
 import java.io.Serializable;
 import java.sql.Connection;
@@ -22,7 +22,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
 
 /**
  * Common base class for database query classes that handle connections and
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQuery.java
index 8066d563a4..53006ce849 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQuery.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query;
+package com.vaadin.v7.data.util.sqlcontainer.query;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -26,12 +26,12 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.sqlcontainer.RowItem;
-import com.vaadin.data.util.sqlcontainer.SQLContainer;
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
-import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.sqlcontainer.RowItem;
+import com.vaadin.v7.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
 
 @SuppressWarnings("serial")
 public class FreeformQuery extends AbstractTransactionalQuery
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQueryDelegate.java
index fac0b1ab45..7af783256f 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQueryDelegate.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query;
+package com.vaadin.v7.data.util.sqlcontainer.query;
 
 import java.io.Serializable;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.sqlcontainer.RowItem;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.sqlcontainer.RowItem;
 
 public interface FreeformQueryDelegate extends Serializable {
     /**
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformStatementDelegate.java
index 884a303684..d658ea7188 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformStatementDelegate.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query;
+package com.vaadin.v7.data.util.sqlcontainer.query;
 
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 /**
  * FreeformStatementDelegate is an extension to FreeformQueryDelegate that
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/OrderBy.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/OrderBy.java
index ed57967772..c6315f12dc 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/OrderBy.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/OrderBy.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query;
+package com.vaadin.v7.data.util.sqlcontainer.query;
 
 import java.io.Serializable;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/QueryDelegate.java
index 16e04a7da0..cc4c9f5668 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/QueryDelegate.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query;
+package com.vaadin.v7.data.util.sqlcontainer.query;
 
 import java.io.Serializable;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.sqlcontainer.RowId;
-import com.vaadin.data.util.sqlcontainer.RowItem;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.sqlcontainer.RowId;
+import com.vaadin.v7.data.util.sqlcontainer.RowItem;
 
 public interface QueryDelegate extends Serializable {
     /**
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/TableQuery.java
index 959c494634..a8a84ea086 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/TableQuery.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query;
+package com.vaadin.v7.data.util.sqlcontainer.query;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -32,19 +32,19 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.Compare.Equal;
-import com.vaadin.data.util.sqlcontainer.ColumnProperty;
-import com.vaadin.data.util.sqlcontainer.OptimisticLockException;
-import com.vaadin.data.util.sqlcontainer.RowId;
-import com.vaadin.data.util.sqlcontainer.RowItem;
-import com.vaadin.data.util.sqlcontainer.SQLUtil;
-import com.vaadin.data.util.sqlcontainer.TemporaryRowId;
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.MSSQLGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.SQLGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.Compare.Equal;
+import com.vaadin.v7.data.util.sqlcontainer.ColumnProperty;
+import com.vaadin.v7.data.util.sqlcontainer.OptimisticLockException;
+import com.vaadin.v7.data.util.sqlcontainer.RowId;
+import com.vaadin.v7.data.util.sqlcontainer.RowItem;
+import com.vaadin.v7.data.util.sqlcontainer.SQLUtil;
+import com.vaadin.v7.data.util.sqlcontainer.TemporaryRowId;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.MSSQLGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.SQLGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 @SuppressWarnings("serial")
 public class TableQuery extends AbstractTransactionalQuery
@@ -835,7 +835,7 @@ public class TableQuery extends AbstractTransactionalQuery
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addRowIdChangeListener(com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)}
+     *             {@link #addRowIdChangeListener(com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)}
      **/
     @Override
     @Deprecated
@@ -855,7 +855,7 @@ public class TableQuery extends AbstractTransactionalQuery
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removeRowIdChangeListener(com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)}
+     *             {@link #removeRowIdChangeListener(com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)}
      **/
     @Override
     @Deprecated
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
index 9c05545e41..5439258f32 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.sqlcontainer.ColumnProperty;
-import com.vaadin.data.util.sqlcontainer.RowItem;
-import com.vaadin.data.util.sqlcontainer.SQLUtil;
-import com.vaadin.data.util.sqlcontainer.TemporaryRowId;
-import com.vaadin.data.util.sqlcontainer.query.OrderBy;
-import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
-import com.vaadin.data.util.sqlcontainer.query.generator.filter.StringDecorator;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.sqlcontainer.ColumnProperty;
+import com.vaadin.v7.data.util.sqlcontainer.RowItem;
+import com.vaadin.v7.data.util.sqlcontainer.SQLUtil;
+import com.vaadin.v7.data.util.sqlcontainer.TemporaryRowId;
+import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.StringDecorator;
 
 /**
  * Generates generic SQL that is supported by HSQLDB, MySQL and PostgreSQL.
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/MSSQLGenerator.java
index baddc60e3f..fd4f0bcfbe 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/MSSQLGenerator.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator;
 
 import java.util.List;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.sqlcontainer.query.OrderBy;
-import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
 
 @SuppressWarnings("serial")
 public class MSSQLGenerator extends DefaultSQLGenerator {
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/OracleGenerator.java
index 0097b5017c..64a0c22d97 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/OracleGenerator.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator;
 
 import java.util.List;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.sqlcontainer.query.OrderBy;
-import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
 
 @SuppressWarnings("serial")
 public class OracleGenerator extends DefaultSQLGenerator {
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/SQLGenerator.java
index 6011346b78..1841c0a23b 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/SQLGenerator.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator;
 
 import java.io.Serializable;
 import java.util.List;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.sqlcontainer.RowItem;
-import com.vaadin.data.util.sqlcontainer.query.OrderBy;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.sqlcontainer.RowItem;
+import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy;
 
 /**
  * The SQLGenerator interface is meant to be implemented for each different SQL
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/StatementHelper.java
index 43cfb597bb..fe8240cd42 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/StatementHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/AndTranslator.java
index 6eab9f5596..ef958459fb 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/AndTranslator.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.And;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.And;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class AndTranslator implements FilterTranslator {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java
index 2cdecd1e6d..7e491925a3 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.Between;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.Between;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class BetweenTranslator implements FilterTranslator {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java
index bcb348dc8a..44e5a7ee14 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.Compare;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.Compare;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class CompareTranslator implements FilterTranslator {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java
index e593146550..4bd1807600 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
 import java.io.Serializable;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public interface FilterTranslator extends Serializable {
     public boolean translatesFilter(Filter filter);
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java
index dd7a90828a..d2dda82232 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.IsNull;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.IsNull;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class IsNullTranslator implements FilterTranslator {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java
index 3c27240e9e..bd41aa1abf 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.Like;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.Like;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class LikeTranslator implements FilterTranslator {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/NotTranslator.java
index fe98ca24b6..83110e2f41 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/NotTranslator.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.IsNull;
-import com.vaadin.data.util.filter.Not;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.IsNull;
+import com.vaadin.v7.data.util.filter.Not;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class NotTranslator implements FilterTranslator {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/OrTranslator.java
index 2f30acc89f..61fad7b559 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/OrTranslator.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.Or;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.Or;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class OrTranslator implements FilterTranslator {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java
index b8fb306076..c7ed3f91ae 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class QueryBuilder implements Serializable {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java
index 312adc5ed7..bb47fbd826 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.Like;
-import com.vaadin.data.util.filter.SimpleStringFilter;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.Like;
+import com.vaadin.v7.data.util.filter.SimpleStringFilter;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class SimpleStringTranslator implements FilterTranslator {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/StringDecorator.java
index f8005f4290..72c841fe0a 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/StringDecorator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
 import java.io.Serializable;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyAbstractStringValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractStringValidator.java
index c0eb3b5fa3..340b34237d 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyAbstractStringValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractStringValidator.java
@@ -28,8 +28,8 @@ package com.vaadin.v7.data.validator;
  * @since 5.4
  */
 @SuppressWarnings("serial")
-public abstract class LegacyAbstractStringValidator
-        extends LegacyAbstractValidator<String> {
+public abstract class AbstractStringValidator
+        extends AbstractValidator<String> {
 
     /**
      * Constructs a validator for strings.
@@ -43,7 +43,7 @@ public abstract class LegacyAbstractStringValidator
      *            the message to be included in an {@link InvalidValueException}
      *            (with "{0}" replaced by the value that failed validation).
      */
-    public LegacyAbstractStringValidator(String errorMessage) {
+    public AbstractStringValidator(String errorMessage) {
         super(errorMessage);
     }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyAbstractValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractValidator.java
index 8c1cc56010..8f900961df 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyAbstractValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractValidator.java
@@ -44,7 +44,7 @@ import com.vaadin.v7.data.Validator;
  * @author Vaadin Ltd.
  * @since 5.4
  */
-public abstract class LegacyAbstractValidator<T> implements Validator {
+public abstract class AbstractValidator<T> implements Validator {
 
     /**
      * Error message that is included in an {@link InvalidValueException} if
@@ -59,7 +59,7 @@ public abstract class LegacyAbstractValidator<T> implements Validator {
      *            the message to be included in an {@link InvalidValueException}
      *            (with "{0}" replaced by the value that failed validation).
      */
-    public LegacyAbstractValidator(String errorMessage) {
+    public AbstractValidator(String errorMessage) {
         this.errorMessage = errorMessage;
     }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyBeanValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BeanValidator.java
index dfc107280f..9afd816ac0 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyBeanValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BeanValidator.java
@@ -44,7 +44,7 @@ import com.vaadin.v7.data.Validator;
  * @author Petri Hakala
  * @author Henri Sara
  */
-public class LegacyBeanValidator implements Validator {
+public class BeanValidator implements Validator {
 
     private static final long serialVersionUID = 1L;
     private static ValidatorFactory factory;
@@ -97,7 +97,7 @@ public class LegacyBeanValidator implements Validator {
      * @param propertyName
      *            property to validate
      */
-    public LegacyBeanValidator(Class<?> beanClass, String propertyName) {
+    public BeanValidator(Class<?> beanClass, String propertyName) {
         this.beanClass = beanClass;
         this.propertyName = propertyName;
         locale = Locale.getDefault();
@@ -169,7 +169,7 @@ public class LegacyBeanValidator implements Validator {
     /**
      * Returns a shared Validator instance to use. An instance is created using
      * the validator factory if necessary and thereafter reused by the
-     * {@link LegacyBeanValidator} instance.
+     * {@link BeanValidator} instance.
      *
      * @return the JSR-303 {@link javax.validation.Validator} to use
      */
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyBigDecimalRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BigDecimalRangeValidator.java
index 72c959e773..652e33e12e 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyBigDecimalRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BigDecimalRangeValidator.java
@@ -24,8 +24,8 @@ import java.math.BigDecimal;
  * @since 7.4
  */
 @SuppressWarnings("serial")
-public class LegacyBigDecimalRangeValidator
-        extends LegacyRangeValidator<BigDecimal> {
+public class BigDecimalRangeValidator
+        extends RangeValidator<BigDecimal> {
 
     /**
      * Creates a validator for checking that an BigDecimal is within a given
@@ -43,7 +43,7 @@ public class LegacyBigDecimalRangeValidator
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public LegacyBigDecimalRangeValidator(String errorMessage,
+    public BigDecimalRangeValidator(String errorMessage,
             BigDecimal minValue, BigDecimal maxValue) {
         super(errorMessage, BigDecimal.class, minValue, maxValue);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyBigIntegerRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BigIntegerRangeValidator.java
index 363a9bb82c..62ec012344 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyBigIntegerRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BigIntegerRangeValidator.java
@@ -24,8 +24,8 @@ import java.math.BigInteger;
  * @since 7.4
  */
 @SuppressWarnings("serial")
-public class LegacyBigIntegerRangeValidator
-        extends LegacyRangeValidator<BigInteger> {
+public class BigIntegerRangeValidator
+        extends RangeValidator<BigInteger> {
 
     /**
      * Creates a validator for checking that an BigInteger is within a given
@@ -43,7 +43,7 @@ public class LegacyBigIntegerRangeValidator
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public LegacyBigIntegerRangeValidator(String errorMessage,
+    public BigIntegerRangeValidator(String errorMessage,
             BigInteger minValue, BigInteger maxValue) {
         super(errorMessage, BigInteger.class, minValue, maxValue);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyByteRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/ByteRangeValidator.java
index 14694c4a52..4bbb1b3290 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyByteRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/ByteRangeValidator.java
@@ -22,7 +22,7 @@ package com.vaadin.v7.data.validator;
  * @since 7.4
  */
 @SuppressWarnings("serial")
-public class LegacyByteRangeValidator extends LegacyRangeValidator<Byte> {
+public class ByteRangeValidator extends RangeValidator<Byte> {
 
     /**
      * Creates a validator for checking that an Byte is within a given range.
@@ -39,7 +39,7 @@ public class LegacyByteRangeValidator extends LegacyRangeValidator<Byte> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public LegacyByteRangeValidator(String errorMessage, Byte minValue,
+    public ByteRangeValidator(String errorMessage, Byte minValue,
             Byte maxValue) {
         super(errorMessage, Byte.class, minValue, maxValue);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyCompositeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/CompositeValidator.java
index ecf4d121f2..2827c401ed 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyCompositeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/CompositeValidator.java
@@ -34,7 +34,7 @@ import com.vaadin.v7.data.Validator;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-public class LegacyCompositeValidator implements Validator {
+public class CompositeValidator implements Validator {
 
     public enum CombinationMode {
         /**
@@ -78,7 +78,7 @@ public class LegacyCompositeValidator implements Validator {
      * Construct a composite validator in <code>AND</code> mode without error
      * message.
      */
-    public LegacyCompositeValidator() {
+    public CompositeValidator() {
         this(CombinationMode.AND, "");
     }
 
@@ -88,7 +88,7 @@ public class LegacyCompositeValidator implements Validator {
      * @param mode
      * @param errorMessage
      */
-    public LegacyCompositeValidator(CombinationMode mode, String errorMessage) {
+    public CompositeValidator(CombinationMode mode, String errorMessage) {
         setErrorMessage(errorMessage);
         setMode(mode);
     }
@@ -243,9 +243,9 @@ public class LegacyCompositeValidator implements Validator {
             if (validatorType.isAssignableFrom(v.getClass())) {
                 found.add(v);
             }
-            if (v instanceof LegacyCompositeValidator
-                    && ((LegacyCompositeValidator) v).getMode() == MODE_AND) {
-                final Collection<Validator> c = ((LegacyCompositeValidator) v)
+            if (v instanceof CompositeValidator
+                    && ((CompositeValidator) v).getMode() == MODE_AND) {
+                final Collection<Validator> c = ((CompositeValidator) v)
                         .getSubValidators(validatorType);
                 if (c != null) {
                     found.addAll(c);
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyDateRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DateRangeValidator.java
index 94cc2f78e7..f46f8d989e 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyDateRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DateRangeValidator.java
@@ -31,7 +31,7 @@ import com.vaadin.shared.ui.datefield.Resolution;
  * @author Vaadin Ltd.
  * @since 7.0
  */
-public class LegacyDateRangeValidator extends LegacyRangeValidator<Date> {
+public class DateRangeValidator extends RangeValidator<Date> {
 
     /**
      * Creates a validator for checking that an Date is within a given range.
@@ -53,7 +53,7 @@ public class LegacyDateRangeValidator extends LegacyRangeValidator<Date> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public LegacyDateRangeValidator(String errorMessage, Date minValue,
+    public DateRangeValidator(String errorMessage, Date minValue,
             Date maxValue, Resolution resolution) {
         super(errorMessage, Date.class, minValue, maxValue);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyDoubleRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DoubleRangeValidator.java
index 7416ad60e6..1a6d8cd208 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyDoubleRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DoubleRangeValidator.java
@@ -22,7 +22,7 @@ package com.vaadin.v7.data.validator;
  * @since 7.0
  */
 @SuppressWarnings("serial")
-public class LegacyDoubleRangeValidator extends LegacyRangeValidator<Double> {
+public class DoubleRangeValidator extends RangeValidator<Double> {
 
     /**
      * Creates a validator for checking that an Double is within a given range.
@@ -39,7 +39,7 @@ public class LegacyDoubleRangeValidator extends LegacyRangeValidator<Double> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public LegacyDoubleRangeValidator(String errorMessage, Double minValue,
+    public DoubleRangeValidator(String errorMessage, Double minValue,
             Double maxValue) {
         super(errorMessage, Double.class, minValue, maxValue);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyDoubleValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DoubleValidator.java
index fcc94f6e7c..0d0dd8ff40 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyDoubleValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DoubleValidator.java
@@ -15,23 +15,23 @@
  */
 package com.vaadin.v7.data.validator;
 
-import com.vaadin.data.Property;
-import com.vaadin.v7.data.util.converter.LegacyStringToDoubleConverter;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.converter.StringToDoubleConverter;
 
 /**
  * String validator for a double precision floating point number. See
- * {@link com.vaadin.v7.data.validator.LegacyAbstractStringValidator} for
+ * {@link com.vaadin.v7.data.validator.AbstractStringValidator} for
  * more information.
  *
  * @author Vaadin Ltd.
  * @since 5.4
- * @deprecated As of 7.0. Use a {@link LegacyStringToDoubleConverter} converter
+ * @deprecated As of 7.0. Use a {@link StringToDoubleConverter} converter
  *             on the field instead or bind the field to a {@link Property} of
  *             type {@link Double}.
  */
 @Deprecated
 @SuppressWarnings("serial")
-public class LegacyDoubleValidator extends LegacyAbstractStringValidator {
+public class DoubleValidator extends AbstractStringValidator {
 
     /**
      * Creates a validator for checking that a string can be parsed as an
@@ -40,11 +40,11 @@ public class LegacyDoubleValidator extends LegacyAbstractStringValidator {
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @deprecated As of 7.0. Use a Double converter on the field instead and/or
-     *             use a {@link LegacyDoubleRangeValidator} for validating that
+     *             use a {@link DoubleRangeValidator} for validating that
      *             the value is inside a given range.
      */
     @Deprecated
-    public LegacyDoubleValidator(String errorMessage) {
+    public DoubleValidator(String errorMessage) {
         super(errorMessage);
     }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyEmailValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/EmailValidator.java
index 836ff5ff15..7d87eda52e 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyEmailValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/EmailValidator.java
@@ -20,7 +20,7 @@ package com.vaadin.v7.data.validator;
  * complete according to RFC 822 but handles the vast majority of valid e-mail
  * addresses correctly.
  *
- * See {@link com.vaadin.v7.data.validator.LegacyAbstractStringValidator}
+ * See {@link com.vaadin.v7.data.validator.AbstractStringValidator}
  * for more information.
  *
  * <p>
@@ -33,7 +33,7 @@ package com.vaadin.v7.data.validator;
  * @since 5.4
  */
 @SuppressWarnings("serial")
-public class LegacyEmailValidator extends LegacyRegexpValidator {
+public class EmailValidator extends RegexpValidator {
 
     /**
      * Creates a validator for checking that a string is a syntactically valid
@@ -42,7 +42,7 @@ public class LegacyEmailValidator extends LegacyRegexpValidator {
      * @param errorMessage
      *            the message to display in case the value does not validate.
      */
-    public LegacyEmailValidator(String errorMessage) {
+    public EmailValidator(String errorMessage) {
         super("^([a-zA-Z0-9_\\.\\-+])+@(([a-zA-Z0-9-])+\\.)+([a-zA-Z0-9]{2,4})+$",
                 true, errorMessage);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyFloatRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/FloatRangeValidator.java
index 9dc27d3727..c63b4a51a2 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyFloatRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/FloatRangeValidator.java
@@ -22,7 +22,7 @@ package com.vaadin.v7.data.validator;
  * @since 7.4
  */
 @SuppressWarnings("serial")
-public class LegacyFloatRangeValidator extends LegacyRangeValidator<Float> {
+public class FloatRangeValidator extends RangeValidator<Float> {
 
     /**
      * Creates a validator for checking that an Float is within a given range.
@@ -39,7 +39,7 @@ public class LegacyFloatRangeValidator extends LegacyRangeValidator<Float> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public LegacyFloatRangeValidator(String errorMessage, Float minValue,
+    public FloatRangeValidator(String errorMessage, Float minValue,
             Float maxValue) {
         super(errorMessage, Float.class, minValue, maxValue);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyIntegerRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/IntegerRangeValidator.java
index 09de051e1d..48fa420f06 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyIntegerRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/IntegerRangeValidator.java
@@ -22,7 +22,7 @@ package com.vaadin.v7.data.validator;
  * @since 5.4
  */
 @SuppressWarnings("serial")
-public class LegacyIntegerRangeValidator extends LegacyRangeValidator<Integer> {
+public class IntegerRangeValidator extends RangeValidator<Integer> {
 
     /**
      * Creates a validator for checking that an Integer is within a given range.
@@ -39,7 +39,7 @@ public class LegacyIntegerRangeValidator extends LegacyRangeValidator<Integer> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public LegacyIntegerRangeValidator(String errorMessage, Integer minValue,
+    public IntegerRangeValidator(String errorMessage, Integer minValue,
             Integer maxValue) {
         super(errorMessage, Integer.class, minValue, maxValue);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyIntegerValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/IntegerValidator.java
index 34d2e7e76b..b5f671b6f1 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyIntegerValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/IntegerValidator.java
@@ -15,23 +15,23 @@
  */
 package com.vaadin.v7.data.validator;
 
-import com.vaadin.data.Property;
-import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.converter.StringToIntegerConverter;
 
 /**
  * String validator for integers. See
- * {@link com.vaadin.v7.data.validator.LegacyAbstractStringValidator} for
+ * {@link com.vaadin.v7.data.validator.AbstractStringValidator} for
  * more information.
  *
  * @author Vaadin Ltd.
  * @since 5.4
- * @deprecated As of 7.0. Use a {@link LegacyStringToIntegerConverter} converter
+ * @deprecated As of 7.0. Use a {@link StringToIntegerConverter} converter
  *             on the field instead or bind the field to a {@link Property} of
  *             type {@link Integer}.
  */
 @SuppressWarnings("serial")
 @Deprecated
-public class LegacyIntegerValidator extends LegacyAbstractStringValidator {
+public class IntegerValidator extends AbstractStringValidator {
 
     /**
      * Creates a validator for checking that a string can be parsed as an
@@ -40,11 +40,11 @@ public class LegacyIntegerValidator extends LegacyAbstractStringValidator {
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @deprecated As of 7.0. Use an Integer converter on the field instead
-     *             and/or use an {@link LegacyIntegerRangeValidator} for
+     *             and/or use an {@link IntegerRangeValidator} for
      *             validating that the value is inside a given range.
      */
     @Deprecated
-    public LegacyIntegerValidator(String errorMessage) {
+    public IntegerValidator(String errorMessage) {
         super(errorMessage);
 
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyLongRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LongRangeValidator.java
index 8e5523b46a..440961430c 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyLongRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LongRangeValidator.java
@@ -22,7 +22,7 @@ package com.vaadin.v7.data.validator;
  * @since 7.4
  */
 @SuppressWarnings("serial")
-public class LegacyLongRangeValidator extends LegacyRangeValidator<Long> {
+public class LongRangeValidator extends RangeValidator<Long> {
 
     /**
      * Creates a validator for checking that an Long is within a given range.
@@ -39,7 +39,7 @@ public class LegacyLongRangeValidator extends LegacyRangeValidator<Long> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public LegacyLongRangeValidator(String errorMessage, Long minValue,
+    public LongRangeValidator(String errorMessage, Long minValue,
             Long maxValue) {
         super(errorMessage, Long.class, minValue, maxValue);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyNullValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/NullValidator.java
index 282f5baf29..60e1cb4550 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyNullValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/NullValidator.java
@@ -26,7 +26,7 @@ import com.vaadin.v7.data.Validator;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-public class LegacyNullValidator implements Validator {
+public class NullValidator implements Validator {
 
     private boolean onlyNullAllowed;
 
@@ -40,7 +40,7 @@ public class LegacyNullValidator implements Validator {
      * @param onlyNullAllowed
      *            Are only nulls allowed?
      */
-    public LegacyNullValidator(String errorMessage, boolean onlyNullAllowed) {
+    public NullValidator(String errorMessage, boolean onlyNullAllowed) {
         setErrorMessage(errorMessage);
         setNullAllowed(onlyNullAllowed);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/RangeValidator.java
index 27830be7dd..c4749ae2a6 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/RangeValidator.java
@@ -21,10 +21,10 @@ package com.vaadin.v7.data.validator;
  *
  * Verifies that the value is of the given type and within the (optionally)
  * given limits. Typically you want to use a sub class of this like
- * {@link LegacyIntegerRangeValidator}, {@link LegacyDoubleRangeValidator} or
- * {@link LegacyDateRangeValidator} in applications.
+ * {@link IntegerRangeValidator}, {@link DoubleRangeValidator} or
+ * {@link DateRangeValidator} in applications.
  * <p>
- * Note that {@link LegacyRangeValidator} always accept null values. Make a
+ * Note that {@link RangeValidator} always accept null values. Make a
  * field required to ensure that no empty values are accepted or override
  * {@link #isValidValue(Comparable)}.
  * </p>
@@ -35,8 +35,8 @@ package com.vaadin.v7.data.validator;
  * @author Vaadin Ltd.
  * @since 7.0
  */
-public class LegacyRangeValidator<T extends Comparable>
-        extends LegacyAbstractValidator<T> {
+public class RangeValidator<T extends Comparable>
+        extends AbstractValidator<T> {
 
     private T minValue = null;
     private boolean minValueIncluded = true;
@@ -56,7 +56,7 @@ public class LegacyRangeValidator<T extends Comparable>
      * @param maxValue
      *            The maximum value that should be accepted or null for no limit
      */
-    public LegacyRangeValidator(String errorMessage, Class<T> type, T minValue,
+    public RangeValidator(String errorMessage, Class<T> type, T minValue,
             T maxValue) {
         super(errorMessage);
         this.type = type;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyRegexpValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/RegexpValidator.java
index 0649dd2f13..a9af0d0167 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyRegexpValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/RegexpValidator.java
@@ -27,7 +27,7 @@ import java.util.regex.Pattern;
  * {@link java.util.regex.Pattern#sum}
  * </p>
  * <p>
- * See {@link com.vaadin.v7.data.validator.LegacyAbstractStringValidator}
+ * See {@link com.vaadin.v7.data.validator.AbstractStringValidator}
  * for more information.
  * </p>
  * <p>
@@ -40,7 +40,7 @@ import java.util.regex.Pattern;
  * @since 5.4
  */
 @SuppressWarnings("serial")
-public class LegacyRegexpValidator extends LegacyAbstractStringValidator {
+public class RegexpValidator extends AbstractStringValidator {
 
     private Pattern pattern;
     private boolean complete;
@@ -55,7 +55,7 @@ public class LegacyRegexpValidator extends LegacyAbstractStringValidator {
      * @param errorMessage
      *            the message to display in case the value does not validate.
      */
-    public LegacyRegexpValidator(String regexp, String errorMessage) {
+    public RegexpValidator(String regexp, String errorMessage) {
         this(regexp, true, errorMessage);
     }
 
@@ -71,7 +71,7 @@ public class LegacyRegexpValidator extends LegacyAbstractStringValidator {
      * @param errorMessage
      *            the message to display in case the value does not validate.
      */
-    public LegacyRegexpValidator(String regexp, boolean complete,
+    public RegexpValidator(String regexp, boolean complete,
             String errorMessage) {
         super(errorMessage);
         pattern = Pattern.compile(regexp);
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyShortRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/ShortRangeValidator.java
index e23575e4d9..2bf89cbca8 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyShortRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/ShortRangeValidator.java
@@ -22,7 +22,7 @@ package com.vaadin.v7.data.validator;
  * @since 7.4
  */
 @SuppressWarnings("serial")
-public class LegacyShortRangeValidator extends LegacyRangeValidator<Short> {
+public class ShortRangeValidator extends RangeValidator<Short> {
 
     /**
      * Creates a validator for checking that an Short is within a given range.
@@ -39,7 +39,7 @@ public class LegacyShortRangeValidator extends LegacyRangeValidator<Short> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public LegacyShortRangeValidator(String errorMessage, Short minValue,
+    public ShortRangeValidator(String errorMessage, Short minValue,
             Short maxValue) {
         super(errorMessage, Short.class, minValue, maxValue);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyStringLengthValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/StringLengthValidator.java
index 4bf7d430ba..dc863ab31a 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyStringLengthValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/StringLengthValidator.java
@@ -24,7 +24,7 @@ package com.vaadin.v7.data.validator;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-public class LegacyStringLengthValidator extends LegacyAbstractStringValidator {
+public class StringLengthValidator extends AbstractStringValidator {
 
     private Integer minLength = null;
 
@@ -38,7 +38,7 @@ public class LegacyStringLengthValidator extends LegacyAbstractStringValidator {
      * @param errorMessage
      *            the message to display in case the value does not validate.
      */
-    public LegacyStringLengthValidator(String errorMessage) {
+    public StringLengthValidator(String errorMessage) {
         super(errorMessage);
     }
 
@@ -60,7 +60,7 @@ public class LegacyStringLengthValidator extends LegacyAbstractStringValidator {
      *            Are null strings permissible? This can be handled better by
      *            setting a field as required or not.
      */
-    public LegacyStringLengthValidator(String errorMessage, Integer minLength,
+    public StringLengthValidator(String errorMessage, Integer minLength,
             Integer maxLength, boolean allowNull) {
         this(errorMessage);
         setMinLength(minLength);
diff --git a/compatibility-server/src/main/java/com/vaadin/server/communication/data/DataGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/DataGenerator.java
index f7459a7dd3..ee71b587f9 100644
--- a/compatibility-server/src/main/java/com/vaadin/server/communication/data/DataGenerator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/DataGenerator.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.server.communication.data;
+package com.vaadin.v7.server.communication.data;
 
 import java.io.Serializable;
 
-import com.vaadin.data.Item;
-import com.vaadin.ui.LegacyGrid.AbstractGridExtension;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Grid.AbstractGridExtension;
 
 import elemental.json.JsonObject;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.java b/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/RpcDataProviderExtension.java
index 341c3f1a45..dce3eb1cfa 100644
--- a/compatibility-server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/RpcDataProviderExtension.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.server.communication.data;
+package com.vaadin.v7.server.communication.data;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -26,18 +26,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.Indexed;
-import com.vaadin.data.Container.Indexed.ItemAddEvent;
-import com.vaadin.data.Container.Indexed.ItemRemoveEvent;
-import com.vaadin.data.Container.ItemSetChangeEvent;
-import com.vaadin.data.Container.ItemSetChangeListener;
-import com.vaadin.data.Container.ItemSetChangeNotifier;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.Property.ValueChangeNotifier;
 import com.vaadin.server.AbstractExtension;
 import com.vaadin.server.ClientConnector;
 import com.vaadin.server.KeyMapper;
@@ -45,8 +33,20 @@ import com.vaadin.shared.data.DataProviderRpc;
 import com.vaadin.shared.data.DataRequestRpc;
 import com.vaadin.shared.ui.grid.GridState;
 import com.vaadin.shared.ui.grid.Range;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.Column;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Indexed;
+import com.vaadin.v7.data.Container.Indexed.ItemAddEvent;
+import com.vaadin.v7.data.Container.Indexed.ItemRemoveEvent;
+import com.vaadin.v7.data.Container.ItemSetChangeEvent;
+import com.vaadin.v7.data.Container.ItemSetChangeListener;
+import com.vaadin.v7.data.Container.ItemSetChangeNotifier;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.Property.ValueChangeNotifier;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.Column;
 
 import elemental.json.Json;
 import elemental.json.JsonArray;
@@ -151,7 +151,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
 
     /**
      * A class to listen to changes in property values in the Container added
-     * with {@link LegacyGrid#setContainerDatasource(Container.Indexed)}, and notifies
+     * with {@link Grid#setContainerDatasource(Container.Indexed)}, and notifies
      * the data source to update the client-side representation of the modified
      * item.
      * <p>
@@ -164,8 +164,8 @@ public class RpcDataProviderExtension extends AbstractExtension {
      * value changes, an instance of this class needs to be attached to each and
      * every Item's Property in the container.
      *
-     * @see LegacyGrid#addValueChangeListener(Container, Object, Object)
-     * @see LegacyGrid#valueChangeListeners
+     * @see Grid#addValueChangeListener(Container, Object, Object)
+     * @see Grid#valueChangeListeners
      */
     private class GridValueChangeListener implements ValueChangeListener {
         private final Object itemId;
@@ -408,14 +408,14 @@ public class RpcDataProviderExtension extends AbstractExtension {
     }
 
     /**
-     * Makes the data source available to the given {@link LegacyGrid} component.
+     * Makes the data source available to the given {@link Grid} component.
      *
      * @param component
      *            the remote data grid component to extend
      * @param columnKeys
      *            the key mapper for columns
      */
-    public void extend(LegacyGrid component) {
+    public void extend(Grid component) {
         super.extend(component);
     }
 
@@ -568,7 +568,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
                         .removeItemSetChangeListener(itemListener);
             }
 
-        } else if (!(parent instanceof LegacyGrid)) {
+        } else if (!(parent instanceof Grid)) {
             throw new IllegalStateException(
                     "Grid is the only accepted parent type");
         }
@@ -626,7 +626,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
         return activeItemHandler.keyMapper;
     }
 
-    protected LegacyGrid getGrid() {
-        return (LegacyGrid) getParent();
+    protected Grid getGrid() {
+        return (Grid) getParent();
     }
 }
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/AbstractColorPicker.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractColorPicker.java
index d7d12c6d03..da03136593 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/AbstractColorPicker.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractColorPicker.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -25,14 +25,16 @@ import org.jsoup.nodes.Element;
 import com.vaadin.shared.ui.colorpicker.Color;
 import com.vaadin.shared.ui.colorpicker.ColorPickerServerRpc;
 import com.vaadin.shared.ui.colorpicker.ColorPickerState;
+import com.vaadin.ui.AbstractComponent;
+import com.vaadin.ui.UI;
 import com.vaadin.ui.Window.CloseEvent;
 import com.vaadin.ui.Window.CloseListener;
-import com.vaadin.ui.components.colorpicker.ColorChangeEvent;
-import com.vaadin.ui.components.colorpicker.ColorChangeListener;
-import com.vaadin.ui.components.colorpicker.ColorPickerPopup;
-import com.vaadin.ui.components.colorpicker.ColorSelector;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
+import com.vaadin.v7.ui.components.colorpicker.ColorChangeEvent;
+import com.vaadin.v7.ui.components.colorpicker.ColorChangeListener;
+import com.vaadin.v7.ui.components.colorpicker.ColorPickerPopup;
+import com.vaadin.v7.ui.components.colorpicker.ColorSelector;
 
 /**
  * An abstract class that defines default implementation for a color picker
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/AbstractSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
index 5411a63c15..b7b241598b 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/AbstractSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -31,10 +31,6 @@ import java.util.Set;
 
 import org.jsoup.nodes.Element;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.dd.DragAndDropEvent;
@@ -51,21 +47,26 @@ import com.vaadin.server.VaadinSession;
 import com.vaadin.shared.ui.combobox.FilteringMode;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
 import com.vaadin.shared.ui.select.AbstractSelectState;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.LegacyComponent;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignException;
 import com.vaadin.ui.declarative.DesignFormatter;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.Validator.InvalidValueException;
-import com.vaadin.v7.data.util.converter.LegacyConverter;
-import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
-import com.vaadin.v7.data.util.converter.LegacyConverterUtil;
-import com.vaadin.v7.ui.LegacyAbstractField;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.data.util.converter.Converter;
+import com.vaadin.v7.data.util.converter.Converter.ConversionException;
+import com.vaadin.v7.data.util.converter.ConverterUtil;
 
 /**
  * <p>
  * A class representing a selection of items the user has selected in a UI. The
- * set of choices is presented as a set of {@link com.vaadin.data.Item}s in a
- * {@link com.vaadin.data.Container}.
+ * set of choices is presented as a set of {@link com.com.vaadin.v7.data.Item}s
+ * in a {@link com.com.vaadin.v7.data.Container}.
  * </p>
  *
  * <p>
@@ -79,7 +80,7 @@ import com.vaadin.v7.ui.LegacyAbstractField;
  */
 @SuppressWarnings("serial")
 // TODO currently cannot specify type more precisely in case of multi-select
-public abstract class AbstractSelect extends LegacyAbstractField<Object>
+public abstract class AbstractSelect extends AbstractField<Object>
         implements Container, Container.Viewer,
         Container.PropertySetChangeListener,
         Container.PropertySetChangeNotifier, Container.ItemSetChangeNotifier,
@@ -643,7 +644,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Gets the selected item id or in multiselect mode a set of selected ids.
      *
-     * @see com.vaadin.v7.ui.LegacyAbstractField#getValue()
+     * @see com.vaadin.v7.ui.AbstractField#getValue()
      */
     @Override
     public Object getValue() {
@@ -683,7 +684,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      *
      * @param newValue
      *            the New selected item or collection of selected items.
-     * @see com.vaadin.v7.ui.LegacyAbstractField#setValue(java.lang.Object)
+     * @see com.vaadin.v7.ui.AbstractField#setValue(java.lang.Object)
      */
     @Override
     public void setValue(Object newValue) throws Property.ReadOnlyException {
@@ -710,13 +711,13 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      *            True if caller is sure that repaint is not needed.
      * @param ignoreReadOnly
      *            True if read-only check should be omitted.
-     * @see com.vaadin.v7.ui.LegacyAbstractField#setValue(java.lang.Object,
+     * @see com.vaadin.v7.ui.AbstractField#setValue(java.lang.Object,
      *      java.lang.Boolean)
      */
     @Override
     protected void setValue(Object newFieldValue, boolean repaintIsNotNeeded,
             boolean ignoreReadOnly)
-            throws com.vaadin.data.Property.ReadOnlyException,
+            throws com.vaadin.v7.data.Property.ReadOnlyException,
             ConversionException, InvalidValueException {
         if (isMultiSelect()) {
             if (newFieldValue == null) {
@@ -774,7 +775,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      *
      * @param propertyId
      *            the Id identifying the property.
-     * @see com.vaadin.data.Container#getType(java.lang.Object)
+     * @see com.com.vaadin.v7.data.Container#getType(java.lang.Object)
      */
     @Override
     public Class<?> getType(Object propertyId) {
@@ -814,7 +815,8 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * Gets the Property identified by the given itemId and propertyId from the
      * Container
      *
-     * @see com.vaadin.data.Container#getContainerProperty(Object, Object)
+     * @see com.com.vaadin.v7.data.Container#getContainerProperty(Object,
+     *      Object)
      */
     @Override
     public Property getContainerProperty(Object itemId, Object propertyId) {
@@ -829,7 +831,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * returns false.
      *
      * @return True if the operation succeeded.
-     * @see com.vaadin.data.Container#addContainerProperty(java.lang.Object,
+     * @see com.com.vaadin.v7.data.Container#addContainerProperty(java.lang.Object,
      *      java.lang.Class, java.lang.Object)
      */
     @Override
@@ -851,7 +853,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * returns false.
      *
      * @return True if the operation succeeded.
-     * @see com.vaadin.data.Container#removeAllItems()
+     * @see com.com.vaadin.v7.data.Container#removeAllItems()
      */
     @Override
     public boolean removeAllItems() throws UnsupportedOperationException {
@@ -873,7 +875,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * method. if the creation fails, null is returned.
      *
      * @return the Id of the created item or null in case of failure.
-     * @see com.vaadin.data.Container#addItem()
+     * @see com.com.vaadin.v7.data.Container#addItem()
      */
     @Override
     public Object addItem() throws UnsupportedOperationException {
@@ -898,7 +900,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * @param itemId
      *            the Identification of the item to be created.
      * @return the Created item with the given id, or null in case of failure.
-     * @see com.vaadin.data.Container#addItem(java.lang.Object)
+     * @see com.com.vaadin.v7.data.Container#addItem(java.lang.Object)
      */
     @Override
     public Item addItem(Object itemId) throws UnsupportedOperationException {
@@ -1005,7 +1007,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * returns false.
      *
      * @return True if the operation succeeded.
-     * @see com.vaadin.data.Container#removeContainerProperty(java.lang.Object)
+     * @see com.com.vaadin.v7.data.Container#removeContainerProperty(java.lang.Object)
      */
     @Override
     public boolean removeContainerProperty(Object propertyId)
@@ -1026,7 +1028,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * As a side-effect the fields value (selection) is set to null due old
      * selection not necessary exists in new Container.
      *
-     * @see com.vaadin.data.Container.Viewer#setContainerDataSource(Container)
+     * @see com.com.vaadin.v7.data.Container.Viewer#setContainerDataSource(Container)
      *
      * @param newDataSource
      *            the new data source.
@@ -1085,7 +1087,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Gets the viewing data-source container.
      *
-     * @see com.vaadin.data.Container.Viewer#getContainerDataSource()
+     * @see com.com.vaadin.v7.data.Container.Viewer#getContainerDataSource()
      */
     @Override
     public Container getContainerDataSource() {
@@ -1263,10 +1265,10 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     private String idToCaption(Object itemId) {
         try {
-            LegacyConverter<String, Object> c = (LegacyConverter<String, Object>) LegacyConverterUtil
+            Converter<String, Object> c = (Converter<String, Object>) ConverterUtil
                     .getConverter(String.class, itemId.getClass(),
                             getSession());
-            return LegacyConverterUtil.convertFromModel(itemId, String.class, c,
+            return ConverterUtil.convertFromModel(itemId, String.class, c,
                     getLocale());
         } catch (Exception e) {
             return itemId.toString();
@@ -1563,7 +1565,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Notifies this listener that the Containers contents has changed.
      *
-     * @see com.vaadin.data.Container.PropertySetChangeListener#containerPropertySetChange(com.vaadin.data.Container.PropertySetChangeEvent)
+     * @see com.com.vaadin.v7.data.Container.PropertySetChangeListener#containerPropertySetChange(com.com.vaadin.v7.data.Container.PropertySetChangeEvent)
      */
     @Override
     public void containerPropertySetChange(
@@ -1574,7 +1576,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Adds a new Property set change listener for this Container.
      *
-     * @see com.vaadin.data.Container.PropertySetChangeNotifier#addListener(com.vaadin.data.Container.PropertySetChangeListener)
+     * @see com.com.vaadin.v7.data.Container.PropertySetChangeNotifier#addListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)
      */
     @Override
     public void addPropertySetChangeListener(
@@ -1587,7 +1589,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     *             {@link #addPropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)}
      **/
     @Override
     @Deprecated
@@ -1598,7 +1600,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Removes a previously registered Property set change listener.
      *
-     * @see com.vaadin.data.Container.PropertySetChangeNotifier#removeListener(com.vaadin.data.Container.PropertySetChangeListener)
+     * @see com.com.vaadin.v7.data.Container.PropertySetChangeNotifier#removeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)
      */
     @Override
     public void removePropertySetChangeListener(
@@ -1613,7 +1615,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     *             {@link #removePropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)}
      **/
     @Override
     @Deprecated
@@ -1624,7 +1626,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Adds an Item set change listener for the object.
      *
-     * @see com.vaadin.data.Container.ItemSetChangeNotifier#addListener(com.vaadin.data.Container.ItemSetChangeListener)
+     * @see com.com.vaadin.v7.data.Container.ItemSetChangeNotifier#addListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)
      */
     @Override
     public void addItemSetChangeListener(
@@ -1637,7 +1639,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #addItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Override
     @Deprecated
@@ -1648,7 +1650,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Removes the Item set change listener from the object.
      *
-     * @see com.vaadin.data.Container.ItemSetChangeNotifier#removeListener(com.vaadin.data.Container.ItemSetChangeListener)
+     * @see com.com.vaadin.v7.data.Container.ItemSetChangeNotifier#removeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)
      */
     @Override
     public void removeItemSetChangeListener(
@@ -1663,7 +1665,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #removeItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Override
     @Deprecated
@@ -1696,7 +1698,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Lets the listener know a Containers Item set has changed.
      *
-     * @see com.vaadin.data.Container.ItemSetChangeListener#containerItemSetChange(com.vaadin.data.Container.ItemSetChangeEvent)
+     * @see com.com.vaadin.v7.data.Container.ItemSetChangeListener#containerItemSetChange(com.com.vaadin.v7.data.Container.ItemSetChangeEvent)
      */
     @Override
     public void containerItemSetChange(Container.ItemSetChangeEvent event) {
@@ -1753,7 +1755,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
         /**
          * Gets the Property where the event occurred.
          *
-         * @see com.vaadin.data.Container.ItemSetChangeEvent#getContainer()
+         * @see com.com.vaadin.v7.data.Container.ItemSetChangeEvent#getContainer()
          */
         @Override
         public Container getContainer() {
@@ -1775,7 +1777,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
         /**
          * Retrieves the Container whose contents have been modified.
          *
-         * @see com.vaadin.data.Container.PropertySetChangeEvent#getContainer()
+         * @see com.com.vaadin.v7.data.Container.PropertySetChangeEvent#getContainer()
          */
         @Override
         public Container getContainer() {
@@ -1874,7 +1876,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Notifies the component that it is connected to an application.
      *
-     * @see com.vaadin.v7.ui.LegacyAbstractField#attach()
+     * @see com.vaadin.v7.ui.AbstractField#attach()
      */
     @Override
     public void attach() {
@@ -1987,13 +1989,13 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
         @Override
         public void valueChange(
-                com.vaadin.data.Property.ValueChangeEvent event) {
+                com.vaadin.v7.data.Property.ValueChangeEvent event) {
             markAsDirty();
         }
 
         @Override
         public void itemPropertySetChange(
-                com.vaadin.data.Item.PropertySetChangeEvent event) {
+                com.vaadin.v7.data.Item.PropertySetChangeEvent event) {
             markAsDirty();
         }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/Calendar.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java
index 1a2c7ef716..5c6e0de421 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/Calendar.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.lang.reflect.Method;
 import java.text.DateFormat;
@@ -41,8 +41,6 @@ import java.util.logging.Logger;
 import org.jsoup.nodes.Attributes;
 import org.jsoup.nodes.Element;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.util.BeanItemContainer;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.dd.DropHandler;
@@ -55,41 +53,45 @@ import com.vaadin.shared.ui.calendar.CalendarEventId;
 import com.vaadin.shared.ui.calendar.CalendarServerRpc;
 import com.vaadin.shared.ui.calendar.CalendarState;
 import com.vaadin.shared.ui.calendar.DateConstants;
-import com.vaadin.ui.components.calendar.CalendarComponentEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.BackwardEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.BackwardHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventClick;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventClickHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventMoveHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResize;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.ForwardEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.ForwardHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.MoveEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.RangeSelectEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.RangeSelectHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.WeekClick;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.WeekClickHandler;
-import com.vaadin.ui.components.calendar.CalendarDateRange;
-import com.vaadin.ui.components.calendar.CalendarTargetDetails;
-import com.vaadin.ui.components.calendar.ContainerEventProvider;
-import com.vaadin.ui.components.calendar.event.BasicEventProvider;
-import com.vaadin.ui.components.calendar.event.CalendarEditableEventProvider;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeListener;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider;
-import com.vaadin.ui.components.calendar.handler.BasicBackwardHandler;
-import com.vaadin.ui.components.calendar.handler.BasicDateClickHandler;
-import com.vaadin.ui.components.calendar.handler.BasicEventMoveHandler;
-import com.vaadin.ui.components.calendar.handler.BasicEventResizeHandler;
-import com.vaadin.ui.components.calendar.handler.BasicForwardHandler;
-import com.vaadin.ui.components.calendar.handler.BasicWeekClickHandler;
+import com.vaadin.ui.AbstractComponent;
+import com.vaadin.ui.LegacyComponent;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.DateClickEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.DateClickHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventClick;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventClickHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventMoveHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResize;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.MoveEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.RangeSelectEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.RangeSelectHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.WeekClick;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.WeekClickHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarDateRange;
+import com.vaadin.v7.ui.components.calendar.CalendarTargetDetails;
+import com.vaadin.v7.ui.components.calendar.ContainerEventProvider;
+import com.vaadin.v7.ui.components.calendar.event.BasicEventProvider;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEditableEventProvider;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeListener;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider;
+import com.vaadin.v7.ui.components.calendar.handler.BasicBackwardHandler;
+import com.vaadin.v7.ui.components.calendar.handler.BasicDateClickHandler;
+import com.vaadin.v7.ui.components.calendar.handler.BasicEventMoveHandler;
+import com.vaadin.v7.ui.components.calendar.handler.BasicEventResizeHandler;
+import com.vaadin.v7.ui.components.calendar.handler.BasicForwardHandler;
+import com.vaadin.v7.ui.components.calendar.handler.BasicWeekClickHandler;
 
 /**
  * <p>
@@ -1521,7 +1523,7 @@ public class Calendar extends AbstractComponent
      * Use this method if you are adding a container which uses the default
      * property ids like {@link BeanItemContainer} for instance. If you are
      * using custom properties instead use
-     * {@link Calendar#setContainerDataSource(com.vaadin.data.Container.Indexed, Object, Object, Object, Object, Object)}
+     * {@link Calendar#setContainerDataSource(com.vaadin.v7.data.Container.Indexed, Object, Object, Object, Object, Object)}
      *
      * Please note that the container must be sorted by date!
      *
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/ColorPicker.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ColorPicker.java
index 67002373d0..34b03a2447 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/ColorPicker.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ColorPicker.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import com.vaadin.shared.ui.colorpicker.Color;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/ColorPickerArea.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ColorPickerArea.java
index c4f3971259..624d567ec7 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/ColorPickerArea.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ColorPickerArea.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import com.vaadin.shared.ui.colorpicker.Color;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/ComboBox.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java
index a78823d9a3..50b6ac505c 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/ComboBox.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -24,8 +24,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.util.filter.SimpleStringFilter;
 import com.vaadin.event.FieldEvents;
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
@@ -38,6 +36,9 @@ import com.vaadin.server.Resource;
 import com.vaadin.shared.ui.combobox.ComboBoxServerRpc;
 import com.vaadin.shared.ui.combobox.ComboBoxState;
 import com.vaadin.shared.ui.combobox.FilteringMode;
+import com.vaadin.ui.Component;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.util.filter.SimpleStringFilter;
 
 /**
  * A filtering dropdown single-select. Suitable for newItemsAllowed, but it's
@@ -794,7 +795,7 @@ public class ComboBox extends AbstractSelect
      *
      * @deprecated As of 7.0, use {@link ListSelect}, {@link OptionGroup} or
      *             {@link TwinColSelect} instead
-     * @see com.vaadin.ui.AbstractSelect#setMultiSelect(boolean)
+     * @see com.vaadin.v7.ui.AbstractSelect#setMultiSelect(boolean)
      * @throws UnsupportedOperationException
      *             if trying to activate multiselect mode
      */
@@ -813,7 +814,7 @@ public class ComboBox extends AbstractSelect
      * @deprecated As of 7.0, use {@link ListSelect}, {@link OptionGroup} or
      *             {@link TwinColSelect} instead
      *
-     * @see com.vaadin.ui.AbstractSelect#isMultiSelect()
+     * @see com.vaadin.v7.ui.AbstractSelect#isMultiSelect()
      *
      * @return false
      */
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/LegacyDateField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java
index 0d094c28bf..b02e7b87a4 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/LegacyDateField.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java
@@ -27,7 +27,6 @@ import java.util.logging.Logger;
 
 import org.jsoup.nodes.Element;
 
-import com.vaadin.data.Property;
 import com.vaadin.event.FieldEvents;
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
@@ -42,10 +41,11 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.LegacyComponent;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
+import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.Validator;
 import com.vaadin.v7.data.Validator.InvalidValueException;
-import com.vaadin.v7.data.util.converter.LegacyConverter;
-import com.vaadin.v7.data.validator.LegacyDateRangeValidator;
+import com.vaadin.v7.data.util.converter.Converter;
+import com.vaadin.v7.data.validator.DateRangeValidator;
 
 /**
  * <p>
@@ -54,11 +54,11 @@ import com.vaadin.v7.data.validator.LegacyDateRangeValidator;
  * </p>
  * <p>
  * Since <code>DateField</code> extends <code>LegacyAbstractField</code> it
- * implements the {@link com.vaadin.data.Buffered}interface.
+ * implements the {@link com.vaadin.v7.data.Buffered}interface.
  * </p>
  * <p>
  * A <code>DateField</code> is in write-through mode by default, so
- * {@link com.vaadin.v7.ui.LegacyAbstractField#setWriteThrough(boolean)}must
+ * {@link com.vaadin.v7.ui.AbstractField#setWriteThrough(boolean)}must
  * be called to enable buffering.
  * </p>
  *
@@ -66,7 +66,7 @@ import com.vaadin.v7.data.validator.LegacyDateRangeValidator;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-public class LegacyDateField extends LegacyAbstractField<Date> implements
+public class DateField extends AbstractField<Date> implements
         FieldEvents.BlurNotifier, FieldEvents.FocusNotifier, LegacyComponent {
 
     /**
@@ -157,7 +157,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
 
     private String dateOutOfRangeMessage = "Date is out of allowed range";
 
-    private LegacyDateRangeValidator currentRangeValidator;
+    private DateRangeValidator currentRangeValidator;
 
     /**
      * Determines whether the ValueChangeEvent should be fired. Used to prevent
@@ -180,7 +180,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
     /**
      * Constructs an empty <code>DateField</code> with no caption.
      */
-    public LegacyDateField() {
+    public DateField() {
     }
 
     /**
@@ -189,7 +189,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
      * @param caption
      *            the caption of the datefield.
      */
-    public LegacyDateField(String caption) {
+    public DateField(String caption) {
         setCaption(caption);
     }
 
@@ -202,7 +202,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
      * @param dataSource
      *            the Property to be edited with this editor.
      */
-    public LegacyDateField(String caption, Property dataSource) {
+    public DateField(String caption, Property dataSource) {
         this(dataSource);
         setCaption(caption);
     }
@@ -214,7 +214,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
      * @param dataSource
      *            the Property to be edited with this editor.
      */
-    public LegacyDateField(Property dataSource)
+    public DateField(Property dataSource)
             throws IllegalArgumentException {
         if (!Date.class.isAssignableFrom(dataSource.getType())) {
             throw new IllegalArgumentException(
@@ -229,7 +229,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
      * Constructs a new <code>DateField</code> with the given caption and
      * initial text contents. The editor constructed this way will not be bound
      * to a Property unless
-     * {@link com.vaadin.data.Property.Viewer#setPropertyDataSource(Property)}
+     * {@link com.vaadin.v7.data.Property.Viewer#setPropertyDataSource(Property)}
      * is called to bind it.
      *
      * @param caption
@@ -237,7 +237,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
      * @param value
      *            the Date value.
      */
-    public LegacyDateField(String caption, Date value) {
+    public DateField(String caption, Date value) {
         setValue(value);
         setCaption(caption);
     }
@@ -421,7 +421,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
             currentRangeValidator = null;
         }
         if (getRangeStart() != null || getRangeEnd() != null) {
-            currentRangeValidator = new LegacyDateRangeValidator(
+            currentRangeValidator = new DateRangeValidator(
                     dateOutOfRangeMessage, getRangeStart(resolution),
                     getRangeEnd(resolution), null);
             addValidator(currentRangeValidator);
@@ -555,7 +555,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
                      * this case the invalid text remains in the DateField.
                      */
                     markAsDirty();
-                } catch (LegacyConverter.ConversionException e) {
+                } catch (Converter.ConversionException e) {
 
                     /*
                      * Datefield now contains some text that could't be parsed
@@ -650,9 +650,9 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
      *             to keep the old value and indicate an error
      */
     protected Date handleUnparsableDateString(String dateString)
-            throws LegacyConverter.ConversionException {
+            throws Converter.ConversionException {
         currentParseErrorMessage = null;
-        throw new LegacyConverter.ConversionException(getParseErrorMessage());
+        throw new Converter.ConversionException(getParseErrorMessage());
     }
 
     /* Property features */
@@ -886,7 +886,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
      * invalid if it contains text typed in by the user that couldn't be parsed
      * into a Date value.
      *
-     * @see com.vaadin.v7.ui.LegacyAbstractField#validate()
+     * @see com.vaadin.v7.ui.AbstractField#validate()
      */
     @Override
     public void validate() throws InvalidValueException {
@@ -980,7 +980,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
                     .parse(design.attr("value"), Date.class);
             // formatting will return null if it cannot parse the string
             if (date == null) {
-                Logger.getLogger(LegacyDateField.class.getName()).info(
+                Logger.getLogger(DateField.class.getName()).info(
                         "cannot parse " + design.attr("value") + " as date");
             }
             this.setValue(date, false, true);
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/DefaultFieldFactory.java
index 2ee5ecf00e..53035ba087 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/DefaultFieldFactory.java
@@ -13,18 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.text.Normalizer.Form;
 import java.util.Date;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Property;
 import com.vaadin.shared.util.SharedUtil;
-import com.vaadin.v7.ui.LegacyCheckBox;
-import com.vaadin.v7.ui.LegacyDateField;
-import com.vaadin.v7.ui.LegacyField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.ui.Component;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Property;
 
 /**
  * This class contains a basic implementation for {@link TableFieldFactory}. The
@@ -53,12 +50,12 @@ public class DefaultFieldFactory implements TableFieldFactory {
     }
 
     @Override
-    public LegacyField createField(Container container, Object itemId,
+    public Field createField(Container container, Object itemId,
             Object propertyId, Component uiContext) {
         Property containerProperty = container.getContainerProperty(itemId,
                 propertyId);
         Class<?> type = containerProperty.getType();
-        LegacyField<?> field = createFieldByPropertyType(type);
+        Field<?> field = createFieldByPropertyType(type);
         field.setCaption(createCaptionByPropertyId(propertyId));
         return field;
     }
@@ -77,20 +74,20 @@ public class DefaultFieldFactory implements TableFieldFactory {
     /**
      * Creates fields based on the property type.
      * <p>
-     * The default field type is {@link LegacyTextField}. Other field types
-     * generated by this method:
+     * The default field type is {@link TextField}. Other field types generated
+     * by this method:
      * <p>
      * <b>Boolean</b>: {@link CheckBox}.<br/>
-     * <b>Date</b>: {@link LegacyDateField}(resolution: day).<br/>
+     * <b>Date</b>: {@link DateField}(resolution: day).<br/>
      * <b>Item</b>: {@link Form}. <br/>
-     * <b>default field type</b>: {@link LegacyTextField}.
+     * <b>default field type</b>: {@link TextField}.
      * <p>
      *
      * @param type
      *            the type of the property
-     * @return the most suitable generic {@link LegacyField} for given type
+     * @return the most suitable generic {@link Field} for given type
      */
-    public static LegacyField<?> createFieldByPropertyType(Class<?> type) {
+    public static Field<?> createFieldByPropertyType(Class<?> type) {
         // Null typed properties can not be edited
         if (type == null) {
             return null;
@@ -98,17 +95,17 @@ public class DefaultFieldFactory implements TableFieldFactory {
 
         // Date field
         if (Date.class.isAssignableFrom(type)) {
-            final LegacyDateField df = new LegacyDateField();
-            df.setResolution(LegacyDateField.RESOLUTION_DAY);
+            final DateField df = new DateField();
+            df.setResolution(DateField.RESOLUTION_DAY);
             return df;
         }
 
         // Boolean field
         if (Boolean.class.isAssignableFrom(type)) {
-            return new LegacyCheckBox();
+            return new CheckBox();
         }
 
-        return new LegacyTextField();
+        return new TextField();
     }
 
 }
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/LegacyGrid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
index 9a98593b83..0a5e5b40a4 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/LegacyGrid.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -42,24 +42,8 @@ import org.jsoup.nodes.Attributes;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.Indexed;
-import com.vaadin.data.Container.ItemSetChangeEvent;
-import com.vaadin.data.Container.ItemSetChangeListener;
-import com.vaadin.data.Container.ItemSetChangeNotifier;
-import com.vaadin.data.Container.PropertySetChangeEvent;
-import com.vaadin.data.Container.PropertySetChangeListener;
-import com.vaadin.data.Container.PropertySetChangeNotifier;
-import com.vaadin.data.Container.Sortable;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.fieldgroup.DefaultFieldGroupFieldFactory;
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
-import com.vaadin.data.fieldgroup.FieldGroupFieldFactory;
 import com.vaadin.data.sort.Sort;
 import com.vaadin.data.sort.SortOrder;
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.event.ContextClickEvent;
 import com.vaadin.event.ItemClickEvent;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
@@ -78,8 +62,6 @@ import com.vaadin.server.Extension;
 import com.vaadin.server.JsonCodec;
 import com.vaadin.server.KeyMapper;
 import com.vaadin.server.VaadinSession;
-import com.vaadin.server.communication.data.DataGenerator;
-import com.vaadin.server.communication.data.RpcDataProviderExtension;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.data.sort.SortDirection;
 import com.vaadin.shared.ui.grid.EditorClientRpc;
@@ -101,19 +83,40 @@ import com.vaadin.shared.ui.grid.selection.MultiSelectionModelState;
 import com.vaadin.shared.ui.grid.selection.SingleSelectionModelServerRpc;
 import com.vaadin.shared.ui.grid.selection.SingleSelectionModelState;
 import com.vaadin.shared.util.SharedUtil;
+import com.vaadin.ui.AbstractFocusable;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.ConnectorTracker;
+import com.vaadin.ui.SelectiveRenderer;
+import com.vaadin.ui.UI;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignException;
 import com.vaadin.ui.declarative.DesignFormatter;
-import com.vaadin.ui.renderers.HtmlRenderer;
-import com.vaadin.ui.renderers.Renderer;
-import com.vaadin.ui.renderers.TextRenderer;
 import com.vaadin.util.ReflectTools;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Indexed;
+import com.vaadin.v7.data.Container.ItemSetChangeEvent;
+import com.vaadin.v7.data.Container.ItemSetChangeListener;
+import com.vaadin.v7.data.Container.ItemSetChangeNotifier;
+import com.vaadin.v7.data.Container.PropertySetChangeEvent;
+import com.vaadin.v7.data.Container.PropertySetChangeListener;
+import com.vaadin.v7.data.Container.PropertySetChangeNotifier;
+import com.vaadin.v7.data.Container.Sortable;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.Validator.InvalidValueException;
-import com.vaadin.v7.data.util.converter.LegacyConverter;
-import com.vaadin.v7.data.util.converter.LegacyConverterUtil;
-import com.vaadin.v7.ui.LegacyCheckBox;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.data.fieldgroup.DefaultFieldGroupFieldFactory;
+import com.vaadin.v7.data.fieldgroup.FieldGroup;
+import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
+import com.vaadin.v7.data.fieldgroup.FieldGroupFieldFactory;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.data.util.converter.Converter;
+import com.vaadin.v7.data.util.converter.ConverterUtil;
+import com.vaadin.v7.server.communication.data.DataGenerator;
+import com.vaadin.v7.server.communication.data.RpcDataProviderExtension;
+import com.vaadin.v7.ui.renderers.HtmlRenderer;
+import com.vaadin.v7.ui.renderers.Renderer;
+import com.vaadin.v7.ui.renderers.TextRenderer;
 
 import elemental.json.Json;
 import elemental.json.JsonObject;
@@ -134,7 +137,7 @@ import elemental.json.JsonValue;
  * <p>
  * Each column has its own {@link Renderer} that displays data into something
  * that can be displayed in the browser. That data is first converted with a
- * {@link com.vaadin.v7.data.util.converter.LegacyConverter Converter} into
+ * {@link com.vaadin.v7.data.util.converter.Converter Converter} into
  * something that the Renderer can process. This can also be an implicit step -
  * if a column has a simple data type, like a String, no explicit assignment is
  * needed.
@@ -181,7 +184,7 @@ import elemental.json.JsonValue;
  * @since 7.4
  * @author Vaadin Ltd
  */
-public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
+public class Grid extends AbstractFocusable implements SelectionNotifier,
         SortNotifier, SelectiveRenderer, ItemClickNotifier {
 
     /**
@@ -223,7 +226,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *            <code>true</code> iff the event was triggered by an UI
          *            interaction
          */
-        public ColumnVisibilityChangeEvent(LegacyGrid source, Column column,
+        public ColumnVisibilityChangeEvent(Grid source, Column column,
                 boolean hidden, boolean isUserOriginated) {
             super(source);
             this.column = column;
@@ -335,11 +338,11 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          */
         private final Set<Object> openDetails = new HashSet<>();
 
-        public DetailComponentManager(LegacyGrid grid) {
+        public DetailComponentManager(Grid grid) {
             this(grid, DetailsGenerator.NULL);
         }
 
-        public DetailComponentManager(LegacyGrid grid,
+        public DetailComponentManager(Grid grid,
                 DetailsGenerator detailsGenerator) {
             super(grid);
             setDetailsGenerator(detailsGenerator);
@@ -349,7 +352,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * Creates a details component with the help of the user-defined
          * {@link DetailsGenerator}.
          * <p>
-         * This method attaches created components to the parent {@link LegacyGrid}.
+         * This method attaches created components to the parent {@link Grid}.
          *
          * @param itemId
          *            the item id for which to create the details component.
@@ -397,7 +400,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         /**
          * Destroys a details component correctly.
          * <p>
-         * This method will detach the component from parent {@link LegacyGrid}.
+         * This method will detach the component from parent {@link Grid}.
          *
          * @param itemId
          *            the item id for which to destroy the details component
@@ -541,10 +544,10 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         }
 
         @Override
-        protected <T extends LegacyField> T build(String caption,
+        protected <T extends Field> T build(String caption,
                 Class<?> dataType, Class<T> fieldType) throws BindException {
             T field = super.build(caption, dataType, fieldType);
-            if (field instanceof LegacyCheckBox) {
+            if (field instanceof CheckBox) {
                 field.setCaption(null);
             }
             return field;
@@ -574,7 +577,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         }
 
         @Override
-        public <T extends LegacyField> T createField(Class<?> type,
+        public <T extends Field> T createField(Class<?> type,
                 Class<T> fieldType) {
             T f = super.createField(type, fieldType);
             if (f != null) {
@@ -631,7 +634,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         private final Object propertyId;
         private final Section section;
 
-        public GridContextClickEvent(LegacyGrid source,
+        public GridContextClickEvent(Grid source,
                 MouseEventDetails mouseEventDetails, Section section,
                 int rowIndex, Object itemId, Object propertyId) {
             super(source, mouseEventDetails);
@@ -672,7 +675,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * Returns the clicked row index relative to Grid section. In the body
          * of the Grid the index is the item index in the Container. Header and
          * Footer rows for index can be fetched with
-         * {@link LegacyGrid#getHeaderRow(int)} and {@link LegacyGrid#getFooterRow(int)}.
+         * {@link Grid#getHeaderRow(int)} and {@link Grid#getFooterRow(int)}.
          *
          * @return row index in section
          */
@@ -681,8 +684,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         }
 
         @Override
-        public LegacyGrid getComponent() {
-            return (LegacyGrid) super.getComponent();
+        public Grid getComponent() {
+            return (Grid) super.getComponent();
         }
     }
 
@@ -697,7 +700,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
         private String userErrorMessage;
 
-        public CommitErrorEvent(LegacyGrid grid, CommitException cause) {
+        public CommitErrorEvent(Grid grid, CommitException cause) {
             super(grid);
             this.cause = cause;
             userErrorMessage = cause.getLocalizedMessage();
@@ -713,8 +716,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         }
 
         @Override
-        public LegacyGrid getComponent() {
-            return (LegacyGrid) super.getComponent();
+        public Grid getComponent() {
+            return (Grid) super.getComponent();
         }
 
         /**
@@ -800,7 +803,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *            <code>true</code> if event is a result of user
          *            interaction, <code>false</code> if from API call
          */
-        public ColumnReorderEvent(LegacyGrid source, boolean userOriginated) {
+        public ColumnReorderEvent(Grid source, boolean userOriginated) {
             super(source);
             this.userOriginated = userOriginated;
         }
@@ -852,7 +855,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *            <code>true</code> if event is a result of user
          *            interaction, <code>false</code> if from API call
          */
-        public ColumnResizeEvent(LegacyGrid source, Column column,
+        public ColumnResizeEvent(Grid source, Column column,
                 boolean userOriginated) {
             super(source);
             this.column = column;
@@ -926,7 +929,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
         private Object itemID;
 
-        protected EditorEvent(LegacyGrid source, Object itemID) {
+        protected EditorEvent(Grid source, Object itemID) {
             super(source);
             this.itemID = itemID;
         }
@@ -945,7 +948,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      */
     public static class EditorOpenEvent extends EditorEvent {
 
-        public EditorOpenEvent(LegacyGrid source, Object itemID) {
+        public EditorOpenEvent(Grid source, Object itemID) {
             super(source, itemID);
         }
     }
@@ -956,7 +959,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      */
     public static class EditorMoveEvent extends EditorEvent {
 
-        public EditorMoveEvent(LegacyGrid source, Object itemID) {
+        public EditorMoveEvent(Grid source, Object itemID) {
             super(source, itemID);
         }
     }
@@ -967,7 +970,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      */
     public static class EditorCloseEvent extends EditorEvent {
 
-        public EditorCloseEvent(LegacyGrid source, Object itemID) {
+        public EditorCloseEvent(Grid source, Object itemID) {
             super(source, itemID);
         }
     }
@@ -980,17 +983,17 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
         @Override
         public void commitError(CommitErrorEvent event) {
-            Map<LegacyField<?>, InvalidValueException> invalidFields = event
+            Map<Field<?>, InvalidValueException> invalidFields = event
                     .getCause().getInvalidFields();
 
             if (!invalidFields.isEmpty()) {
                 Object firstErrorPropertyId = null;
-                LegacyField<?> firstErrorField = null;
+                Field<?> firstErrorField = null;
 
                 FieldGroup fieldGroup = event.getCause().getFieldGroup();
                 for (Column column : getColumns()) {
                     Object propertyId = column.getPropertyId();
-                    LegacyField<?> field = fieldGroup.getField(propertyId);
+                    Field<?> field = fieldGroup.getField(propertyId);
                     if (invalidFields.keySet().contains(field)) {
                         event.addErrorColumn(column);
 
@@ -1012,16 +1015,16 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
                 event.setUserErrorMessage(caption + ": " + message);
             } else {
-                com.vaadin.server.ErrorEvent.findErrorHandler(LegacyGrid.this).error(
-                        new ConnectorErrorEvent(LegacyGrid.this, event.getCause()));
+                com.vaadin.server.ErrorEvent.findErrorHandler(Grid.this).error(
+                        new ConnectorErrorEvent(Grid.this, event.getCause()));
             }
         }
 
         private Object getFirstPropertyId(FieldGroup fieldGroup,
-                Set<LegacyField<?>> keySet) {
+                Set<Field<?>> keySet) {
             for (Column c : getColumns()) {
                 Object propertyId = c.getPropertyId();
-                LegacyField<?> f = fieldGroup.getField(propertyId);
+                Field<?> f = fieldGroup.getField(propertyId);
                 if (keySet.contains(f)) {
                     return propertyId;
                 }
@@ -1032,15 +1035,15 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Selection modes representing built-in {@link SelectionModel
-     * SelectionModels} that come bundled with {@link LegacyGrid}.
+     * SelectionModels} that come bundled with {@link Grid}.
      * <p>
      * Passing one of these enums into
-     * {@link LegacyGrid#setSelectionMode(SelectionMode)} is equivalent to calling
-     * {@link LegacyGrid#setSelectionModel(SelectionModel)} with one of the built-in
+     * {@link Grid#setSelectionMode(SelectionMode)} is equivalent to calling
+     * {@link Grid#setSelectionModel(SelectionModel)} with one of the built-in
      * implementations of {@link SelectionModel}.
      *
-     * @see LegacyGrid#setSelectionMode(SelectionMode)
-     * @see LegacyGrid#setSelectionModel(SelectionModel)
+     * @see Grid#setSelectionMode(SelectionMode)
+     * @see Grid#setSelectionModel(SelectionModel)
      */
     public enum SelectionMode {
         /** A SelectionMode that maps to {@link SingleSelectionModel} */
@@ -1093,7 +1096,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         Collection<Object> getSelectedRows();
 
         /**
-         * Injects the current {@link LegacyGrid} instance into the SelectionModel.
+         * Injects the current {@link Grid} instance into the SelectionModel.
          * This method should usually call the extend method of
          * {@link AbstractExtension}.
          * <p>
@@ -1104,7 +1107,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *            <code>null</code> when a selection model is being detached
          *            from a Grid.
          */
-        void setGrid(LegacyGrid grid);
+        void setGrid(Grid grid);
 
         /**
          * Resets the SelectiomModel to an initial state.
@@ -1352,7 +1355,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         }
 
         @Override
-        public void setGrid(final LegacyGrid grid) {
+        public void setGrid(final Grid grid) {
             if (grid != null) {
                 extend(grid);
             }
@@ -1891,7 +1894,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * A data class which contains information which identifies a row in a
-     * {@link LegacyGrid}.
+     * {@link Grid}.
      * <p>
      * Since this class follows the <code>Flyweight</code>-pattern any instance
      * of this object is subject to change without the user knowing it and so
@@ -1899,7 +1902,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      * instances.
      */
     public static class RowReference implements Serializable {
-        private final LegacyGrid grid;
+        private final Grid grid;
 
         private Object itemId;
 
@@ -1909,7 +1912,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * @param grid
          *            the grid that the row belongs to
          */
-        public RowReference(LegacyGrid grid) {
+        public RowReference(Grid grid) {
             this.grid = grid;
         }
 
@@ -1928,7 +1931,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *
          * @return the grid that contains referenced row
          */
-        public LegacyGrid getGrid() {
+        public Grid getGrid() {
             return grid;
         }
 
@@ -1953,7 +1956,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * A data class which contains information which identifies a cell in a
-     * {@link LegacyGrid}.
+     * {@link Grid}.
      * <p>
      * Since this class follows the <code>Flyweight</code>-pattern any instance
      * of this object is subject to change without the user knowing it and so
@@ -1984,7 +1987,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *
          * @return the grid that contains referenced cell
          */
-        public LegacyGrid getGrid() {
+        public Grid getGrid() {
             return rowReference.getGrid();
         }
 
@@ -2033,7 +2036,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
     /**
      * A callback interface for generating custom style names for Grid rows.
      *
-     * @see LegacyGrid#setRowStyleGenerator(RowStyleGenerator)
+     * @see Grid#setRowStyleGenerator(RowStyleGenerator)
      */
     public interface RowStyleGenerator extends Serializable {
 
@@ -2051,7 +2054,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
     /**
      * A callback interface for generating custom style names for Grid cells.
      *
-     * @see LegacyGrid#setCellStyleGenerator(CellStyleGenerator)
+     * @see Grid#setCellStyleGenerator(CellStyleGenerator)
      */
     public interface CellStyleGenerator extends Serializable {
 
@@ -2072,7 +2075,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      * the cells in the row for which a {@link CellDescriptionGenerator cell
      * description} is not generated.
      *
-     * @see LegacyGrid#setRowDescriptionGenerator
+     * @see Grid#setRowDescriptionGenerator
      *
      * @since 7.6
      */
@@ -2096,7 +2099,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      * Grid cells. If a cell has both a {@link RowDescriptionGenerator row
      * description} and a cell description, the latter has precedence.
      *
-     * @see LegacyGrid#setCellDescriptionGenerator(CellDescriptionGenerator)
+     * @see Grid#setCellDescriptionGenerator(CellDescriptionGenerator)
      *
      * @since 7.6
      */
@@ -2129,7 +2132,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
         @Override
         public void generateData(Object itemId, Item item, JsonObject rowData) {
-            RowReference row = new RowReference(LegacyGrid.this);
+            RowReference row = new RowReference(Grid.this);
             row.set(itemId);
 
             if (rowStyleGenerator != null) {
@@ -2190,7 +2193,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
         private void writeData(CellReference cell, JsonObject data) {
             Column column = getColumn(cell.getPropertyId());
-            LegacyConverter<?, ?> converter = column.getConverter();
+            Converter<?, ?> converter = column.getConverter();
             Renderer<?> renderer = column.getRenderer();
 
             Item item = cell.getItem();
@@ -2399,7 +2402,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
             protected void writeDesign(Element trElement,
                     DesignContext designContext) {
                 Set<CELLTYPE> visited = new HashSet<>();
-                for (LegacyGrid.Column column : section.grid.getColumns()) {
+                for (Grid.Column column : section.grid.getColumns()) {
                     CELLTYPE cell = getCell(column.getPropertyId());
                     if (visited.contains(cell)) {
                         continue;
@@ -2686,7 +2689,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
             }
         }
 
-        protected LegacyGrid grid;
+        protected Grid grid;
         protected List<ROWTYPE> rows = new ArrayList<>();
 
         /**
@@ -2968,7 +2971,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         private HeaderRow defaultRow = null;
         private final GridStaticSectionState headerState = new GridStaticSectionState();
 
-        protected Header(LegacyGrid grid) {
+        protected Header(Grid grid) {
             this.grid = grid;
             grid.getState(true).header = headerState;
             HeaderRow row = createRow();
@@ -3137,7 +3140,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
         private final GridStaticSectionState footerState = new GridStaticSectionState();
 
-        protected Footer(LegacyGrid grid) {
+        protected Footer(Grid grid) {
             this.grid = grid;
             grid.getState(true).footer = footerState;
         }
@@ -3191,7 +3194,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * A column in the grid. Can be obtained by calling
-     * {@link LegacyGrid#getColumn(Object propertyId)}.
+     * {@link Grid#getColumn(Object propertyId)}.
      */
     public static class Column implements Serializable {
 
@@ -3203,19 +3206,19 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         /**
          * The grid this column is associated with
          */
-        private final LegacyGrid grid;
+        private final Grid grid;
 
         /**
          * Backing property for column
          */
         private final Object propertyId;
 
-        private LegacyConverter<?, Object> converter;
+        private Converter<?, Object> converter;
 
         /**
          * A check for allowing the
-         * {@link #Column(LegacyGrid, GridColumnState, Object) constructor} to call
-         * {@link #setConverter(LegacyConverter)} with a <code>null</code>, even
+         * {@link #Column(Grid, GridColumnState, Object) constructor} to call
+         * {@link #setConverter(Converter)} with a <code>null</code>, even
          * if model and renderer aren't compatible.
          */
         private boolean isFirstConverterAssignment = true;
@@ -3230,7 +3233,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * @param propertyId
          *            the backing property id for this column
          */
-        Column(LegacyGrid grid, GridColumnState state, Object propertyId) {
+        Column(Grid grid, GridColumnState state, Object propertyId) {
             this.grid = grid;
             this.state = state;
             this.propertyId = propertyId;
@@ -3433,7 +3436,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *
          * @throws IllegalArgumentException
          *             if the column is no longer attached to any grid
-         * @see LegacyGrid#setFrozenColumnCount(int)
+         * @see Grid#setFrozenColumnCount(int)
          */
         public Column setLastFrozenColumn() {
             checkColumnIsAttached();
@@ -3457,8 +3460,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *             if no compatible converter could be found
          *
          * @see VaadinSession#getConverterFactory()
-         * @see LegacyConverterUtil#getConverter(Class, Class, VaadinSession)
-         * @see #setConverter(LegacyConverter)
+         * @see ConverterUtil#getConverter(Class, Class, VaadinSession)
+         * @see #setConverter(Converter)
          */
         public Column setRenderer(Renderer<?> renderer) {
             if (!internalSetRenderer(renderer)) {
@@ -3486,7 +3489,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *             if the renderer is already associated with a grid column
          */
         public <T> Column setRenderer(Renderer<T> renderer,
-                LegacyConverter<? extends T, ?> converter) {
+                Converter<? extends T, ?> converter) {
             if (renderer.getParent() != null) {
                 throw new IllegalArgumentException(
                         "Cannot set a renderer that is already connected to a grid column (in "
@@ -3515,7 +3518,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * @throws IllegalArgumentException
          *             if the types are not compatible
          */
-        public Column setConverter(LegacyConverter<?, ?> converter)
+        public Column setConverter(Converter<?, ?> converter)
                 throws IllegalArgumentException {
             Class<?> modelType = getModelType();
             if (converter != null) {
@@ -3566,7 +3569,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
             isFirstConverterAssignment = false;
 
             @SuppressWarnings("unchecked")
-            LegacyConverter<?, Object> castConverter = (LegacyConverter<?, Object>) converter;
+            Converter<?, Object> castConverter = (Converter<?, Object>) converter;
             this.converter = castConverter;
 
             return this;
@@ -3586,19 +3589,19 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *
          * @return the converter
          */
-        public LegacyConverter<?, ?> getConverter() {
+        public Converter<?, ?> getConverter() {
             return converter;
         }
 
         private <T> boolean internalSetRenderer(Renderer<T> renderer) {
 
-            LegacyConverter<? extends T, ?> converter;
+            Converter<? extends T, ?> converter;
             if (isCompatibleWithProperty(renderer, getConverter())) {
                 // Use the existing converter (possibly none) if types
                 // compatible
-                converter = (LegacyConverter<? extends T, ?>) getConverter();
+                converter = (Converter<? extends T, ?>) getConverter();
             } else {
-                converter = LegacyConverterUtil.getConverter(
+                converter = ConverterUtil.getConverter(
                         renderer.getPresentationType(), getModelType(),
                         getSession());
             }
@@ -3612,7 +3615,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         }
 
         private boolean isCompatibleWithProperty(Renderer<?> renderer,
-                LegacyConverter<?, ?> converter) {
+                Converter<?, ?> converter) {
             Class<?> type;
             if (converter == null) {
                 type = getModelType();
@@ -3837,8 +3840,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * @throws IllegalStateException
          *             if the editor is currently active
          *
-         * @see LegacyGrid#editItem(Object)
-         * @see LegacyGrid#isEditorActive()
+         * @see Grid#editItem(Object)
+         * @see Grid#isEditorActive()
          */
         public Column setEditable(boolean editable) {
             checkColumnIsAttached();
@@ -3858,7 +3861,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * @return {@code true} if this column is editable, {@code false}
          *         otherwise
          *
-         * @see LegacyGrid#editItem(Object)
+         * @see Grid#editItem(Object)
          * @see #setEditable(boolean)
          */
 
@@ -3880,7 +3883,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *            the editor field
          * @return this column
          */
-        public Column setEditorField(LegacyField<?> editor) {
+        public Column setEditorField(Field<?> editor) {
             grid.setEditorField(getPropertyId(), editor);
             return this;
         }
@@ -3896,7 +3899,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * Getting a field before the editor has been opened depends on special
          * support from the {@link FieldGroup} in use. Using this method with a
          * user-provided <code>FieldGroup</code> might cause
-         * {@link com.vaadin.data.fieldgroup.FieldGroup.BindException
+         * {@link com.vaadin.v7.data.fieldgroup.FieldGroup.BindException
          * BindException} to be thrown.
          *
          * @return the bound field; or <code>null</code> if the respective
@@ -3908,7 +3911,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *             if no field has been configured and there is a problem
          *             building or binding
          */
-        public LegacyField<?> getEditorField() {
+        public Field<?> getEditorField() {
             return grid.getEditorField(getPropertyId());
         }
 
@@ -4115,7 +4118,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * An abstract base class for server-side
-     * {@link com.vaadin.ui.renderers.Renderer Grid renderers}. This class
+     * {@link com.vaadin.v7.ui.renderers.Renderer Grid renderers}. This class
      * currently extends the AbstractExtension superclass, but this fact should
      * be regarded as an implementation detail and subject to change in a future
      * major or minor Vaadin revision.
@@ -4146,8 +4149,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          */
         @Deprecated
         @Override
-        protected Class<LegacyGrid> getSupportedParentType() {
-            return LegacyGrid.class;
+        protected Class<Grid> getSupportedParentType() {
+            return Grid.class;
         }
 
         /**
@@ -4222,7 +4225,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * @return an encoded value ready to be sent to the client
          */
         public static <T> JsonValue encodeValue(Object modelValue,
-                Renderer<T> renderer, LegacyConverter<?, ?> converter,
+                Renderer<T> renderer, Converter<?, ?> converter,
                 Locale locale) {
             Class<T> presentationType = renderer.getPresentationType();
             T presentationValue;
@@ -4237,7 +4240,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
                         // Class.cast(null) will always succeed
                         presentationValue = (T) modelValue.toString();
                     } else {
-                        throw new LegacyConverter.ConversionException(
+                        throw new Converter.ConversionException(
                                 "Unable to convert value of type "
                                         + modelValue.getClass().getName()
                                         + " to presentation type "
@@ -4249,7 +4252,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
                 assert presentationType
                         .isAssignableFrom(converter.getPresentationType());
                 @SuppressWarnings("unchecked")
-                LegacyConverter<T, Object> safeConverter = (LegacyConverter<T, Object>) converter;
+                Converter<T, Object> safeConverter = (Converter<T, Object>) converter;
                 presentationValue = safeConverter.convertToPresentation(
                         modelValue, safeConverter.getPresentationType(),
                         locale);
@@ -4297,7 +4300,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * @param grid
          *            a grid instance
          */
-        public AbstractGridExtension(LegacyGrid grid) {
+        public AbstractGridExtension(Grid grid) {
             super();
             extend(grid);
         }
@@ -4359,9 +4362,9 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * @throws IllegalStateException
          *             if parent is not Grid
          */
-        protected LegacyGrid getParentGrid() {
-            if (getParent() instanceof LegacyGrid) {
-                LegacyGrid grid = (LegacyGrid) getParent();
+        protected Grid getParentGrid() {
+            if (getParent() instanceof Grid) {
+                Grid grid = (Grid) getParent();
                 return grid;
             } else if (getParent() == null) {
                 throw new IllegalStateException(
@@ -4559,7 +4562,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      * Creates a new Grid with a new {@link IndexedContainer} as the data
      * source.
      */
-    public LegacyGrid() {
+    public Grid() {
         this(null, null);
     }
 
@@ -4569,7 +4572,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      * @param dataSource
      *            the indexed container to use as a data source
      */
-    public LegacyGrid(final Container.Indexed dataSource) {
+    public Grid(final Container.Indexed dataSource) {
         this(null, dataSource);
     }
 
@@ -4580,7 +4583,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      * @param caption
      *            the caption of the grid
      */
-    public LegacyGrid(String caption) {
+    public Grid(String caption) {
         this(caption, null);
     }
 
@@ -4593,7 +4596,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      * @param dataSource
      *            the indexed container to use as a data source
      */
-    public LegacyGrid(String caption, Container.Indexed dataSource) {
+    public Grid(String caption, Container.Indexed dataSource) {
         if (dataSource == null) {
             internalSetContainerDataSource(new IndexedContainer());
         } else {
@@ -4631,7 +4634,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
                     ConnectorTracker connectorTracker = getUI()
                             .getConnectorTracker();
                     JsonObject diffState = connectorTracker
-                            .getDiffState(LegacyGrid.this);
+                            .getDiffState(Grid.this);
                     diffState.remove("sortColumns");
                     diffState.remove("sortDirs");
                     markAsDirty();
@@ -4644,7 +4647,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
                 Object itemId = getKeyMapper().get(rowKey);
                 Item item = datasource.getItem(itemId);
                 Object propertyId = getPropertyIdByColumnId(columnId);
-                fireEvent(new ItemClickEvent(LegacyGrid.this, item, itemId,
+                fireEvent(new ItemClickEvent(Grid.this, item, itemId,
                         propertyId, details));
             }
 
@@ -4654,7 +4657,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
                 final String diffStateKey = "columnOrder";
                 ConnectorTracker connectorTracker = getUI()
                         .getConnectorTracker();
-                JsonObject diffState = connectorTracker.getDiffState(LegacyGrid.this);
+                JsonObject diffState = connectorTracker.getDiffState(Grid.this);
                 // discard the change if the columns have been reordered from
                 // the server side, as the server side is always right
                 if (getState(false).columnOrder.equals(oldColumnOrder)) {
@@ -4701,7 +4704,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
                     ConnectorTracker connectorTracker = getUI()
                             .getConnectorTracker();
                     JsonObject diffState = connectorTracker
-                            .getDiffState(LegacyGrid.this);
+                            .getDiffState(Grid.this);
 
                     assert diffState
                             .hasKey(diffStateKey) : "Field name has changed";
@@ -4734,7 +4737,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
                 if (rowKey != null) {
                     itemId = getKeyMapper().get(rowKey);
                 }
-                fireEvent(new GridContextClickEvent(LegacyGrid.this, details, section,
+                fireEvent(new GridContextClickEvent(Grid.this, details, section,
                         rowIndex, itemId, getPropertyIdByColumnId(columnId)));
             }
 
@@ -4806,7 +4809,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
                     success = true;
                 } catch (CommitException e) {
                     try {
-                        CommitErrorEvent event = new CommitErrorEvent(LegacyGrid.this,
+                        CommitErrorEvent event = new CommitErrorEvent(Grid.this,
                                 e);
                         getEditorErrorHandler().commitError(event);
 
@@ -4829,8 +4832,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
             }
 
             private void handleError(Exception e) {
-                com.vaadin.server.ErrorEvent.findErrorHandler(LegacyGrid.this)
-                        .error(new ConnectorErrorEvent(LegacyGrid.this, e));
+                com.vaadin.server.ErrorEvent.findErrorHandler(Grid.this)
+                        .error(new ConnectorErrorEvent(Grid.this, e));
             }
         });
     }
@@ -5154,9 +5157,9 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
     }
 
     /**
-     * Used internally by the {@link LegacyGrid} to get a {@link Column} by
+     * Used internally by the {@link Grid} to get a {@link Column} by
      * referencing its generated state id. Also used by {@link Column} to verify
-     * if it has been detached from the {@link LegacyGrid}.
+     * if it has been detached from the {@link Grid}.
      *
      * @param columnId
      *            the client id generated for the column when the column is
@@ -5169,7 +5172,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
     }
 
     /**
-     * Used internally by the {@link LegacyGrid} to get a property id by referencing
+     * Used internally by the {@link Grid} to get a property id by referencing
      * the columns generated state id.
      *
      * @param columnId
@@ -6652,7 +6655,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
     }
 
     private static Logger getLogger() {
-        return Logger.getLogger(LegacyGrid.class.getName());
+        return Logger.getLogger(Grid.class.getName());
     }
 
     /**
@@ -6746,14 +6749,14 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         }
     }
 
-    private LegacyField<?> getEditorField(Object propertyId) {
+    private Field<?> getEditorField(Object propertyId) {
         checkColumnExists(propertyId);
 
         if (!getColumn(propertyId).isEditable()) {
             return null;
         }
 
-        LegacyField<?> editor = editorFieldGroup.getField(propertyId);
+        Field<?> editor = editorFieldGroup.getField(propertyId);
 
         try {
             if (editor == null) {
@@ -6764,7 +6767,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
                 editor = editorFieldGroup.getField(propertyId);
             }
 
-            if (editor != null && editor.getParent() != LegacyGrid.this) {
+            if (editor != null && editor.getParent() != Grid.this) {
                 assert editor.getParent() == null;
                 editor.setParent(this);
             }
@@ -6817,7 +6820,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         editorActive = true;
         // Must ensure that all fields, recursively, are sent to the client
         // This is needed because the fields are hidden using isRendered
-        for (LegacyField<?> f : getEditorFields()) {
+        for (Field<?> f : getEditorFields()) {
             f.markAsDirtyRecursive();
         }
 
@@ -6827,10 +6830,10 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         }
     }
 
-    private void setEditorField(Object propertyId, LegacyField<?> field) {
+    private void setEditorField(Object propertyId, Field<?> field) {
         checkColumnExists(propertyId);
 
-        LegacyField<?> oldField = editorFieldGroup.getField(propertyId);
+        Field<?> oldField = editorFieldGroup.getField(propertyId);
         if (oldField != null) {
             editorFieldGroup.unbind(oldField);
             oldField.setParent(null);
@@ -6892,7 +6895,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
              */
             cancelEditor();
         }
-        for (LegacyField<?> editor : getEditorFields()) {
+        for (Field<?> editor : getEditorFields()) {
             editor.setParent(null);
         }
 
@@ -6909,8 +6912,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      *
      * @return a collection of all the fields bound to the item editor
      */
-    Collection<LegacyField<?>> getEditorFields() {
-        Collection<LegacyField<?>> fields = editorFieldGroup.getFields();
+    Collection<Field<?>> getEditorFields() {
+        Collection<Field<?>> fields = editorFieldGroup.getFields();
         assert allAttached(fields);
         return fields;
     }
@@ -7264,7 +7267,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         super.writeDesign(design, context);
 
         Attributes attrs = design.attributes();
-        LegacyGrid def = context.getDefaultInstance(this);
+        Grid def = context.getDefaultInstance(this);
 
         DesignAttributeHandler.writeAttribute("editable", attrs,
                 isEditorEnabled(), def.isEditorEnabled(), boolean.class);
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/LegacyInlineDateField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/InlineDateField.java
index 4e1ad7e997..1bec2bc61e 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/LegacyInlineDateField.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/InlineDateField.java
@@ -18,7 +18,7 @@ package com.vaadin.v7.ui;
 
 import java.util.Date;
 
-import com.vaadin.data.Property;
+import com.vaadin.v7.data.Property;
 
 /**
  * <p>
@@ -26,31 +26,31 @@ import com.vaadin.data.Property;
  *
  * </p>
  *
- * @see LegacyDateField
- * @see LegacyPopupDateField
+ * @see DateField
+ * @see PopupDateField
  * @author Vaadin Ltd.
  * @since 5.0
  */
-public class LegacyInlineDateField extends LegacyDateField {
+public class InlineDateField extends DateField {
 
-    public LegacyInlineDateField() {
+    public InlineDateField() {
         super();
     }
 
-    public LegacyInlineDateField(Property dataSource)
+    public InlineDateField(Property dataSource)
             throws IllegalArgumentException {
         super(dataSource);
     }
 
-    public LegacyInlineDateField(String caption, Date value) {
+    public InlineDateField(String caption, Date value) {
         super(caption, value);
     }
 
-    public LegacyInlineDateField(String caption, Property dataSource) {
+    public InlineDateField(String caption, Property dataSource) {
         super(caption, dataSource);
     }
 
-    public LegacyInlineDateField(String caption) {
+    public InlineDateField(String caption) {
         super(caption);
     }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/ListSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ListSelect.java
index 9a720d1895..3b5683f55d 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/ListSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ListSelect.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.util.Collection;
 
-import com.vaadin.data.Container;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
+import com.vaadin.v7.data.Container;
 
 /**
  * This is a simple list select without, for instance, support for new items,
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/NativeSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/NativeSelect.java
index 13556a0387..d68f184d43 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/NativeSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/NativeSelect.java
@@ -14,17 +14,17 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.util.Collection;
 
-import com.vaadin.data.Container;
 import com.vaadin.event.FieldEvents;
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusAndBlurServerRpcImpl;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
+import com.vaadin.v7.data.Container;
 
 /**
  * This is a simple drop-down select without, for instance, support for
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/OptionGroup.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java
index 3e491906d5..f4e3415cf5 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/OptionGroup.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -23,7 +23,6 @@ import java.util.Set;
 
 import org.jsoup.nodes.Element;
 
-import com.vaadin.data.Container;
 import com.vaadin.event.FieldEvents;
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
@@ -35,6 +34,7 @@ import com.vaadin.shared.ui.optiongroup.OptionGroupConstants;
 import com.vaadin.shared.ui.optiongroup.OptionGroupState;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignFormatter;
+import com.vaadin.v7.data.Container;
 
 /**
  * Configures select to be used as an option group.
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/LegacyPopupDateField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/PopupDateField.java
index c2470daf26..1ae0f79b30 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/LegacyPopupDateField.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/PopupDateField.java
@@ -18,10 +18,10 @@ package com.vaadin.v7.ui;
 
 import java.util.Date;
 
-import com.vaadin.data.Property;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
 import com.vaadin.shared.ui.datefield.PopupDateFieldState;
+import com.vaadin.v7.data.Property;
 
 /**
  * <p>
@@ -29,33 +29,33 @@ import com.vaadin.shared.ui.datefield.PopupDateFieldState;
  *
  * </p>
  *
- * @see LegacyDateField
- * @see LegacyInlineDateField
+ * @see DateField
+ * @see InlineDateField
  * @author Vaadin Ltd.
  * @since 5.0
  */
-public class LegacyPopupDateField extends LegacyDateField {
+public class PopupDateField extends DateField {
 
     private String inputPrompt = null;
 
-    public LegacyPopupDateField() {
+    public PopupDateField() {
         super();
     }
 
-    public LegacyPopupDateField(Property dataSource)
+    public PopupDateField(Property dataSource)
             throws IllegalArgumentException {
         super(dataSource);
     }
 
-    public LegacyPopupDateField(String caption, Date value) {
+    public PopupDateField(String caption, Date value) {
         super(caption, value);
     }
 
-    public LegacyPopupDateField(String caption, Property dataSource) {
+    public PopupDateField(String caption, Property dataSource) {
         super(caption, dataSource);
     }
 
-    public LegacyPopupDateField(String caption) {
+    public PopupDateField(String caption) {
         super(caption);
     }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/RichTextArea.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/RichTextArea.java
index e52db6d043..e7a790a2cc 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/RichTextArea.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/RichTextArea.java
@@ -14,28 +14,27 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.util.Map;
 
 import org.jsoup.nodes.Element;
 
-import com.vaadin.data.Property;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
 import com.vaadin.shared.ui.textarea.RichTextAreaState;
+import com.vaadin.ui.LegacyComponent;
 import com.vaadin.ui.declarative.DesignContext;
-import com.vaadin.v7.ui.LegacyAbstractField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property;
 
 /**
  * A simple RichTextArea to edit HTML format text.
  *
- * Note, that using {@link LegacyTextField#setMaxLength(int)} method in
+ * Note, that using {@link TextField#setMaxLength(int)} method in
  * {@link RichTextArea} may produce unexpected results as formatting is counted
  * into length of field.
  */
-public class RichTextArea extends LegacyAbstractField<String>
+public class RichTextArea extends AbstractField<String>
         implements LegacyComponent {
 
     /**
@@ -213,7 +212,7 @@ public class RichTextArea extends LegacyAbstractField<String>
      * </p>
      *
      * @return the String Textual representation for null strings.
-     * @see LegacyTextField#isNullSettingAllowed()
+     * @see TextField#isNullSettingAllowed()
      */
     public String getNullRepresentation() {
         return nullRepresentation;
@@ -237,7 +236,7 @@ public class RichTextArea extends LegacyAbstractField<String>
      *
      * @return boolean Should the null-string represenation be always converted
      *         to null-values.
-     * @see LegacyTextField#getNullRepresentation()
+     * @see TextField#getNullRepresentation()
      */
     public boolean isNullSettingAllowed() {
         return nullSettingAllowed;
@@ -258,7 +257,7 @@ public class RichTextArea extends LegacyAbstractField<String>
      *
      * @param nullRepresentation
      *            Textual representation for null strings.
-     * @see LegacyTextField#setNullSettingAllowed(boolean)
+     * @see TextField#setNullSettingAllowed(boolean)
      */
     public void setNullRepresentation(String nullRepresentation) {
         this.nullRepresentation = nullRepresentation;
@@ -283,7 +282,7 @@ public class RichTextArea extends LegacyAbstractField<String>
      * @param nullSettingAllowed
      *            Should the null-string represenation be always converted to
      *            null-values.
-     * @see LegacyTextField#getNullRepresentation()
+     * @see TextField#getNullRepresentation()
      */
     public void setNullSettingAllowed(boolean nullSettingAllowed) {
         this.nullSettingAllowed = nullSettingAllowed;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/Select.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Select.java
index 66b36f8ac2..2710287445 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/Select.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Select.java
@@ -14,17 +14,17 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.util.Collection;
 
-import com.vaadin.data.Container;
+import com.vaadin.v7.data.Container;
 
 /**
  * <p>
  * A class representing a selection of items the user has selected in a UI. The
- * set of choices is presented as a set of {@link com.vaadin.data.Item}s in a
- * {@link com.vaadin.data.Container}.
+ * set of choices is presented as a set of {@link com.vaadin.v7.data.Item}s in a
+ * {@link com.vaadin.v7.data.Container}.
  * </p>
  *
  * <p>
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/Table.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
index 13333146f2..760940a482 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/Table.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -37,11 +37,6 @@ import java.util.logging.Logger;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.ContainerOrderedWrapper;
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ContextClickEvent;
@@ -69,14 +64,22 @@ import com.vaadin.shared.ui.table.TableConstants.Section;
 import com.vaadin.shared.ui.table.TableServerRpc;
 import com.vaadin.shared.ui.table.TableState;
 import com.vaadin.shared.util.SharedUtil;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.HasChildMeasurementHint;
+import com.vaadin.ui.HasComponents;
+import com.vaadin.ui.UniqueSerializable;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignException;
 import com.vaadin.ui.declarative.DesignFormatter;
 import com.vaadin.util.ReflectTools;
-import com.vaadin.v7.data.util.converter.LegacyConverter;
-import com.vaadin.v7.data.util.converter.LegacyConverterUtil;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.ContainerOrderedWrapper;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.data.util.converter.Converter;
+import com.vaadin.v7.data.util.converter.ConverterUtil;
 
 /**
  * <p>
@@ -582,11 +585,11 @@ public class Table extends AbstractSelect implements Action.Container,
 
     private RowGenerator rowGenerator = null;
 
-    private final Map<LegacyField<?>, Property<?>> associatedProperties = new HashMap<LegacyField<?>, Property<?>>();
+    private final Map<Field<?>, Property<?>> associatedProperties = new HashMap<Field<?>, Property<?>>();
 
     private boolean painted = false;
 
-    private HashMap<Object, LegacyConverter<String, Object>> propertyValueConverters = new HashMap<Object, LegacyConverter<String, Object>>();
+    private HashMap<Object, Converter<String, Object>> propertyValueConverters = new HashMap<Object, Converter<String, Object>>();
 
     /**
      * Set to true if the client-side should be informed that the key mapper has
@@ -2552,8 +2555,8 @@ public class Table extends AbstractSelect implements Action.Container,
          * Also remove property data sources to unregister listeners keeping the
          * fields in memory.
          */
-        if (component instanceof LegacyField) {
-            LegacyField<?> field = (LegacyField<?>) component;
+        if (component instanceof Field) {
+            Field<?> field = (Field<?>) component;
             Property<?> associatedProperty = associatedProperties
                     .remove(component);
             if (associatedProperty != null
@@ -2777,7 +2780,7 @@ public class Table extends AbstractSelect implements Action.Container,
                     .getContainerPropertyIds();
             LinkedList<Object> retainableValueConverters = new LinkedList<Object>();
             for (Object propertyId : newPropertyIds) {
-                LegacyConverter<String, ?> converter = getConverter(propertyId);
+                Converter<String, ?> converter = getConverter(propertyId);
                 if (converter != null) {
                     if (typeIsCompatible(converter.getModelType(),
                             newDataSource.getType(propertyId))) {
@@ -2941,7 +2944,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Invoked when the value of a variable has changed.
      *
-     * @see com.vaadin.ui.Select#changeVariables(java.lang.Object,
+     * @see com.vaadin.v7.ui.Select#changeVariables(java.lang.Object,
      *      java.util.Map)
      */
 
@@ -4105,7 +4108,7 @@ public class Table extends AbstractSelect implements Action.Container,
     protected Object getPropertyValue(Object rowId, Object colId,
             Property property) {
         if (isEditable() && fieldFactory != null) {
-            final LegacyField<?> f = fieldFactory
+            final Field<?> f = fieldFactory
                     .createField(getContainerDataSource(), rowId, colId, this);
             if (f != null) {
                 // Remember that we have made this association so we can remove
@@ -4132,7 +4135,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * @since 6.7.3
      */
     protected void bindPropertyToField(Object rowId, Object colId,
-            Property property, LegacyField field) {
+            Property property, Field field) {
         // check if field has a property that is Viewer set. In that case we
         // expect developer has e.g. PropertyFormatter that he wishes to use and
         // assign the property to the Viewer instead.
@@ -4164,12 +4167,12 @@ public class Table extends AbstractSelect implements Action.Container,
         if (property == null) {
             return "";
         }
-        LegacyConverter<String, Object> converter = null;
+        Converter<String, Object> converter = null;
 
         if (hasConverter(colId)) {
             converter = getConverter(colId);
         } else {
-            converter = (LegacyConverter) LegacyConverterUtil.getConverter(
+            converter = (Converter) ConverterUtil.getConverter(
                     String.class, property.getType(), getSession());
         }
         Object value = property.getValue();
@@ -4254,7 +4257,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *
      * Also listens changes in rendered items to refresh content area.
      *
-     * @see com.vaadin.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent)
+     * @see com.vaadin.v7.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent)
      */
 
     @Override
@@ -4309,7 +4312,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Removes all Items from the Container.
      *
-     * @see com.vaadin.data.Container#removeAllItems()
+     * @see com.vaadin.v7.data.Container#removeAllItems()
      */
 
     @Override
@@ -4322,7 +4325,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Removes the Item identified by <code>ItemId</code> from the Container.
      *
-     * @see com.vaadin.data.Container#removeItem(Object)
+     * @see com.vaadin.v7.data.Container#removeItem(Object)
      */
 
     @Override
@@ -4342,7 +4345,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Removes a Property specified by the given Property ID from the Container.
      *
-     * @see com.vaadin.data.Container#removeContainerProperty(Object)
+     * @see com.vaadin.v7.data.Container#removeContainerProperty(Object)
      */
 
     @Override
@@ -4370,7 +4373,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *            the class of the property.
      * @param defaultValue
      *            the default value given for all existing items.
-     * @see com.vaadin.data.Container#addContainerProperty(Object, Class,
+     * @see com.vaadin.v7.data.Container#addContainerProperty(Object, Class,
      *      Object)
      */
 
@@ -4415,7 +4418,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *            the Alignment of the column. Null implies align left.
      * @throws UnsupportedOperationException
      *             if the operation is not supported.
-     * @see com.vaadin.data.Container#addContainerProperty(Object, Class,
+     * @see com.vaadin.v7.data.Container#addContainerProperty(Object, Class,
      *      Object)
      */
     public boolean addContainerProperty(Object propertyId, Class<?> type,
@@ -4527,7 +4530,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * {@link #getPageLength()} may produce good enough estimates in some
      * situations.
      *
-     * @see com.vaadin.ui.Select#getVisibleItemIds()
+     * @see com.vaadin.v7.ui.Select#getVisibleItemIds()
      */
 
     @Override
@@ -4551,7 +4554,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Container datasource item set change. Table must flush its buffers on
      * change.
      *
-     * @see com.vaadin.data.Container.ItemSetChangeListener#containerItemSetChange(com.vaadin.data.Container.ItemSetChangeEvent)
+     * @see com.vaadin.v7.data.Container.ItemSetChangeListener#containerItemSetChange(com.vaadin.v7.data.Container.ItemSetChangeEvent)
      */
 
     @Override
@@ -4597,7 +4600,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Container datasource property set change. Table must flush its buffers on
      * change.
      *
-     * @see com.vaadin.data.Container.PropertySetChangeListener#containerPropertySetChange(com.vaadin.data.Container.PropertySetChangeEvent)
+     * @see com.vaadin.v7.data.Container.PropertySetChangeListener#containerPropertySetChange(com.vaadin.v7.data.Container.PropertySetChangeEvent)
      */
 
     @Override
@@ -4645,7 +4648,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *
      * @throws UnsupportedOperationException
      *             if set to true.
-     * @see com.vaadin.ui.Select#setNewItemsAllowed(boolean)
+     * @see com.vaadin.v7.ui.Select#setNewItemsAllowed(boolean)
      */
 
     @Override
@@ -4659,7 +4662,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Gets the ID of the Item following the Item that corresponds to itemId.
      *
-     * @see com.vaadin.data.Container.Ordered#nextItemId(java.lang.Object)
+     * @see com.vaadin.v7.data.Container.Ordered#nextItemId(java.lang.Object)
      */
 
     @Override
@@ -4671,7 +4674,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Gets the ID of the Item preceding the Item that corresponds to the
      * itemId.
      *
-     * @see com.vaadin.data.Container.Ordered#prevItemId(java.lang.Object)
+     * @see com.vaadin.v7.data.Container.Ordered#prevItemId(java.lang.Object)
      */
 
     @Override
@@ -4682,7 +4685,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Gets the ID of the first Item in the Container.
      *
-     * @see com.vaadin.data.Container.Ordered#firstItemId()
+     * @see com.vaadin.v7.data.Container.Ordered#firstItemId()
      */
 
     @Override
@@ -4693,7 +4696,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Gets the ID of the last Item in the Container.
      *
-     * @see com.vaadin.data.Container.Ordered#lastItemId()
+     * @see com.vaadin.v7.data.Container.Ordered#lastItemId()
      */
 
     @Override
@@ -4705,7 +4708,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Tests if the Item corresponding to the given Item ID is the first Item in
      * the Container.
      *
-     * @see com.vaadin.data.Container.Ordered#isFirstId(java.lang.Object)
+     * @see com.vaadin.v7.data.Container.Ordered#isFirstId(java.lang.Object)
      */
 
     @Override
@@ -4717,7 +4720,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Tests if the Item corresponding to the given Item ID is the last Item in
      * the Container.
      *
-     * @see com.vaadin.data.Container.Ordered#isLastId(java.lang.Object)
+     * @see com.vaadin.v7.data.Container.Ordered#isLastId(java.lang.Object)
      */
 
     @Override
@@ -4728,7 +4731,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Adds new item after the given item.
      *
-     * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object)
+     * @see com.vaadin.v7.data.Container.Ordered#addItemAfter(java.lang.Object)
      */
 
     @Override
@@ -4745,7 +4748,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Adds new item after the given item.
      *
-     * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object,
+     * @see com.vaadin.v7.data.Container.Ordered#addItemAfter(java.lang.Object,
      *      java.lang.Object)
      */
 
@@ -4801,7 +4804,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * property to true.
      *
      * @return true if table is editable, false otherwise.
-     * @see LegacyField
+     * @see Field
      * @see FieldFactory
      *
      */
@@ -4821,7 +4824,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *
      * @param editable
      *            true if table should be editable by user.
-     * @see LegacyField
+     * @see Field
      * @see FieldFactory
      *
      */
@@ -4838,7 +4841,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * @throws UnsupportedOperationException
      *             if the container data source does not implement
      *             Container.Sortable
-     * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[],
+     * @see com.vaadin.v7.data.Container.Sortable#sort(java.lang.Object[],
      *      boolean[])
      *
      */
@@ -4893,7 +4896,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * collection.
      * </p>
      *
-     * @see com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds()
+     * @see com.vaadin.v7.data.Container.Sortable#getSortableContainerPropertyIds()
      */
 
     @Override
@@ -6077,7 +6080,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *            The converter to use for the property id
      */
     public void setConverter(Object propertyId,
-            LegacyConverter<String, ?> converter) {
+            Converter<String, ?> converter) {
         if (!getContainerPropertyIds().contains(propertyId)) {
             throw new IllegalArgumentException(
                     "PropertyId " + propertyId + " must be in the container");
@@ -6090,7 +6093,7 @@ public class Table extends AbstractSelect implements Action.Container,
                             + converter.getModelType() + ")");
         }
         propertyValueConverters.put(propertyId,
-                (LegacyConverter<String, Object>) converter);
+                (Converter<String, Object>) converter);
         refreshRowCache();
     }
 
@@ -6114,7 +6117,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * @return The converter used to format the propertyId or null if no
      *         converter has been set
      */
-    public LegacyConverter<String, Object> getConverter(Object propertyId) {
+    public Converter<String, Object> getConverter(Object propertyId) {
         return propertyValueConverters.get(propertyId);
     }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/TableFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TableFieldFactory.java
index 54f8bc5110..1ed286738d 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/TableFieldFactory.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TableFieldFactory.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.io.Serializable;
 
-import com.vaadin.data.Container;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.ui.Component;
+import com.vaadin.v7.data.Container;
 
 /**
  * Factory interface for creating new LegacyField-instances based on Container
  * (datasource), item id, property id and uiContext (the component responsible
  * for displaying fields). Currently this interface is used by {@link Table},
- * but might later be used by some other components for {@link LegacyField}
+ * but might later be used by some other components for {@link Field}
  * generation.
  *
  * <p>
@@ -50,7 +50,7 @@ public interface TableFieldFactory extends Serializable {
      * @return A field suitable for editing the specified data or null if the
      *         property should not be editable.
      */
-    LegacyField<?> createField(Container container, Object itemId,
+    Field<?> createField(Container container, Object itemId,
             Object propertyId, Component uiContext);
 
 }
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/TextArea.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java
index 056667a696..e4cd20a59b 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/TextArea.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java
@@ -14,20 +14,19 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import org.jsoup.nodes.Element;
 
-import com.vaadin.data.Property;
 import com.vaadin.shared.ui.textarea.TextAreaState;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignFormatter;
-import com.vaadin.v7.ui.LegacyAbstractTextField;
+import com.vaadin.v7.data.Property;
 
 /**
  * A text field that supports multi line editing.
  */
-public class TextArea extends LegacyAbstractTextField {
+public class TextArea extends AbstractTextField {
 
     /**
      * Constructs an empty TextArea.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/Tree.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java
index 5da499f94e..83f805ffb4 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/Tree.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -32,10 +32,6 @@ import java.util.StringTokenizer;
 
 import org.jsoup.nodes.Element;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.ContainerHierarchicalWrapper;
-import com.vaadin.data.util.HierarchicalContainer;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ContextClickEvent;
@@ -62,10 +58,15 @@ import com.vaadin.shared.ui.dd.VerticalDropLocation;
 import com.vaadin.shared.ui.tree.TreeConstants;
 import com.vaadin.shared.ui.tree.TreeServerRpc;
 import com.vaadin.shared.ui.tree.TreeState;
+import com.vaadin.ui.Component;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignException;
 import com.vaadin.util.ReflectTools;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.ContainerHierarchicalWrapper;
+import com.vaadin.v7.data.util.HierarchicalContainer;
 
 /**
  * Tree component. A Tree can be used to select an item (or multiple items) from
@@ -857,7 +858,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Tests if the Item with given ID can have any children.
      *
-     * @see com.vaadin.data.Container.Hierarchical#areChildrenAllowed(Object)
+     * @see com.vaadin.v7.data.Container.Hierarchical#areChildrenAllowed(Object)
      */
     @Override
     public boolean areChildrenAllowed(Object itemId) {
@@ -867,7 +868,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Gets the IDs of all Items that are children of the specified Item.
      *
-     * @see com.vaadin.data.Container.Hierarchical#getChildren(Object)
+     * @see com.vaadin.v7.data.Container.Hierarchical#getChildren(Object)
      */
     @Override
     public Collection<?> getChildren(Object itemId) {
@@ -877,7 +878,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Gets the ID of the parent Item of the specified Item.
      *
-     * @see com.vaadin.data.Container.Hierarchical#getParent(Object)
+     * @see com.vaadin.v7.data.Container.Hierarchical#getParent(Object)
      */
     @Override
     public Object getParent(Object itemId) {
@@ -887,7 +888,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Tests if the Item specified with <code>itemId</code> has child Items.
      *
-     * @see com.vaadin.data.Container.Hierarchical#hasChildren(Object)
+     * @see com.vaadin.v7.data.Container.Hierarchical#hasChildren(Object)
      */
     @Override
     public boolean hasChildren(Object itemId) {
@@ -897,7 +898,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Tests if the Item specified with <code>itemId</code> is a root Item.
      *
-     * @see com.vaadin.data.Container.Hierarchical#isRoot(Object)
+     * @see com.vaadin.v7.data.Container.Hierarchical#isRoot(Object)
      */
     @Override
     public boolean isRoot(Object itemId) {
@@ -907,7 +908,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Gets the IDs of all Items in the container that don't have a parent.
      *
-     * @see com.vaadin.data.Container.Hierarchical#rootItemIds()
+     * @see com.vaadin.v7.data.Container.Hierarchical#rootItemIds()
      */
     @Override
     public Collection<?> rootItemIds() {
@@ -917,7 +918,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Sets the given Item's capability to have children.
      *
-     * @see com.vaadin.data.Container.Hierarchical#setChildrenAllowed(Object,
+     * @see com.vaadin.v7.data.Container.Hierarchical#setChildrenAllowed(Object,
      *      boolean)
      */
     @Override
@@ -952,7 +953,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Sets the Container that serves as the data source of the viewer.
      *
-     * @see com.vaadin.data.Container.Viewer#setContainerDataSource(Container)
+     * @see com.vaadin.v7.data.Container.Viewer#setContainerDataSource(Container)
      */
     @Override
     public void setContainerDataSource(Container newDataSource) {
@@ -988,7 +989,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     @Override
     public void containerItemSetChange(
-            com.vaadin.data.Container.ItemSetChangeEvent event) {
+            com.vaadin.v7.data.Container.ItemSetChangeEvent event) {
         super.containerItemSetChange(event);
         if (getContainerDataSource() instanceof Filterable) {
             boolean hasFilters = !((Filterable) getContainerDataSource())
@@ -1283,7 +1284,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Gets the visible item ids.
      *
-     * @see com.vaadin.ui.Select#getVisibleItemIds()
+     * @see com.vaadin.v7.ui.Select#getVisibleItemIds()
      */
     @Override
     public Collection<?> getVisibleItemIds() {
@@ -1327,7 +1328,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Tree does not support <code>setNullSelectionItemId</code>.
      *
-     * @see com.vaadin.ui.AbstractSelect#setNullSelectionItemId(java.lang.Object)
+     * @see com.vaadin.v7.ui.AbstractSelect#setNullSelectionItemId(java.lang.Object)
      */
     @Override
     public void setNullSelectionItemId(Object nullSelectionItemId)
@@ -1343,7 +1344,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      *
      * @throws UnsupportedOperationException
      *             if set to true.
-     * @see com.vaadin.ui.Select#setNewItemsAllowed(boolean)
+     * @see com.vaadin.v7.ui.Select#setNewItemsAllowed(boolean)
      */
     @Override
     public void setNewItemsAllowed(boolean allowNewOptions)
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/TreeTable.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java
index 2e69a0071d..446c9c271c 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/TreeTable.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -30,25 +30,25 @@ import java.util.logging.Logger;
 
 import org.jsoup.nodes.Element;
 
-import com.vaadin.data.Collapsible;
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.Hierarchical;
-import com.vaadin.data.Container.ItemSetChangeEvent;
-import com.vaadin.data.util.ContainerHierarchicalWrapper;
-import com.vaadin.data.util.HierarchicalContainer;
-import com.vaadin.data.util.HierarchicalContainerOrderedWrapper;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
 import com.vaadin.server.Resource;
 import com.vaadin.shared.ui.treetable.TreeTableConstants;
 import com.vaadin.shared.ui.treetable.TreeTableState;
-import com.vaadin.ui.Tree.CollapseEvent;
-import com.vaadin.ui.Tree.CollapseListener;
-import com.vaadin.ui.Tree.ExpandEvent;
-import com.vaadin.ui.Tree.ExpandListener;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignException;
+import com.vaadin.v7.data.Collapsible;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Hierarchical;
+import com.vaadin.v7.data.Container.ItemSetChangeEvent;
+import com.vaadin.v7.data.util.ContainerHierarchicalWrapper;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.data.util.HierarchicalContainerOrderedWrapper;
+import com.vaadin.v7.ui.Tree.CollapseEvent;
+import com.vaadin.v7.ui.Tree.CollapseListener;
+import com.vaadin.v7.ui.Tree.ExpandEvent;
+import com.vaadin.v7.ui.Tree.ExpandListener;
 
 /**
  * TreeTable extends the {@link Table} component so that it can also visualize a
@@ -624,7 +624,7 @@ public class TreeTable extends Table implements Hierarchical {
 
     @Override
     public void containerItemSetChange(
-            com.vaadin.data.Container.ItemSetChangeEvent event) {
+            com.vaadin.v7.data.Container.ItemSetChangeEvent event) {
         // Can't do partial repaints if items are added or removed during the
         // expand/collapse request
         toggledItemId = null;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/TwinColSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TwinColSelect.java
index 261d813ffa..68853ddaa1 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/TwinColSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TwinColSelect.java
@@ -14,15 +14,15 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.util.Collection;
 
-import com.vaadin.data.Container;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
 import com.vaadin.shared.ui.twincolselect.TwinColSelectConstants;
 import com.vaadin.shared.ui.twincolselect.TwinColSelectState;
+import com.vaadin.v7.data.Container;
 
 /**
  * Multiselect component with two lists: left side for available items and right
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvent.java
index f007f0cf34..230d87b7f7 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvent.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar;
+package com.vaadin.v7.ui.components.calendar;
 
-import com.vaadin.ui.Calendar;
 import com.vaadin.ui.Component;
+import com.vaadin.v7.ui.Calendar;
 
 /**
  * All Calendar events extends this class.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvents.java
index 2c4fec95d4..14494eedbe 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvents.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar;
+package com.vaadin.v7.ui.components.calendar;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -21,9 +21,9 @@ import java.util.Date;
 import java.util.EventListener;
 
 import com.vaadin.shared.ui.calendar.CalendarEventId;
-import com.vaadin.ui.Calendar;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
 import com.vaadin.util.ReflectTools;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
 
 /**
  * Interface for all Vaadin Calendar events.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarDateRange.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarDateRange.java
index 09d6c80a7f..69a4123c1b 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarDateRange.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarDateRange.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar;
+package com.vaadin.v7.ui.components.calendar;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarTargetDetails.java
index 3b71ab5a00..f9f4100e53 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarTargetDetails.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar;
+package com.vaadin.v7.ui.components.calendar;
 
 import java.util.Date;
 import java.util.Map;
 
 import com.vaadin.event.dd.DropTarget;
 import com.vaadin.event.dd.TargetDetailsImpl;
-import com.vaadin.ui.Calendar;
+import com.vaadin.v7.ui.Calendar;
 
 /**
- * Drop details for {@link com.vaadin.ui.addon.calendar.ui.Calendar Calendar}.
+ * Drop details for {@link com.vaadin.v7.ui.addon.calendar.ui.Calendar Calendar}.
  * When something is dropped on the Calendar, this class contains the specific
  * details of the drop point. Specifically, this class gives access to the date
  * where the drop happened. If the Calendar was in weekly mode, the date also
@@ -71,7 +71,7 @@ public class CalendarTargetDetails extends TargetDetailsImpl {
     }
 
     /**
-     * @return the {@link com.vaadin.ui.addon.calendar.ui.Calendar Calendar}
+     * @return the {@link com.vaadin.v7.ui.addon.calendar.ui.Calendar Calendar}
      *         instance which was the target of the drop
      */
     public Calendar getTargetCalendar() {
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/ContainerEventProvider.java
index b0a6aaa95a..961b2d8fec 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/ContainerEventProvider.java
@@ -13,32 +13,32 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar;
+package com.vaadin.v7.ui.components.calendar;
 
 import java.util.Collections;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.Indexed;
-import com.vaadin.data.Container.ItemSetChangeEvent;
-import com.vaadin.data.Container.ItemSetChangeNotifier;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeNotifier;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventMoveHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResize;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.MoveEvent;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEditableEventProvider;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeListener;
-import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeNotifier;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider.EventSetChangeNotifier;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Indexed;
+import com.vaadin.v7.data.Container.ItemSetChangeEvent;
+import com.vaadin.v7.data.Container.ItemSetChangeNotifier;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeNotifier;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventMoveHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResize;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.MoveEvent;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEditableEventProvider;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeListener;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeNotifier;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider.EventSetChangeNotifier;
 
 /**
  * A event provider which uses a {@link Container} as a datasource. Container
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEvent.java
index e2a580085a..f1b6524d2c 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEvent.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.event;
+package com.vaadin.v7.ui.components.calendar.event;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeNotifier;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeNotifier;
 
 /**
  * Simple implementation of {@link com.vaadin.addon.calendar.event.CalendarEvent
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEventProvider.java
index fbf197d3eb..59c8baca9c 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEventProvider.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.event;
+package com.vaadin.v7.ui.components.calendar.event;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider.EventSetChangeNotifier;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider.EventSetChangeNotifier;
 
 /**
  * <p>
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEditableEventProvider.java
index aaa76418a6..90f8992720 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEditableEventProvider.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.ui.components.calendar.event;
+package com.vaadin.v7.ui.components.calendar.event;
 
 /**
  * An event provider which allows adding and removing events
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEvent.java
index b4195cf0b1..9aaa1cd5ba 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEvent.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.event;
+package com.vaadin.v7.ui.components.calendar.event;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEventProvider.java
index 1d4fabed5a..bef6aaea18 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEventProvider.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.event;
+package com.vaadin.v7.ui.components.calendar.event;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/EditableCalendarEvent.java
index 5a44cae4ac..cb3553ec87 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/EditableCalendarEvent.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.event;
+package com.vaadin.v7.ui.components.calendar.event;
 
 import java.util.Date;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java
index 61f738fcd0..956db6b179 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.handler;
+package com.vaadin.v7.ui.components.calendar.handler;
 
 import java.util.Calendar;
 import java.util.Date;
 
 import com.vaadin.shared.ui.calendar.DateConstants;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.BackwardEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.BackwardHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardHandler;
 
 /**
  * Implements basic functionality needed to enable backwards navigation.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicDateClickHandler.java
index 0107e10e3d..381acb6b1d 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicDateClickHandler.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.handler;
+package com.vaadin.v7.ui.components.calendar.handler;
 
 import java.util.Calendar;
 import java.util.Date;
 
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.DateClickEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.DateClickHandler;
 
 /**
  * Implements basic functionality needed to switch to day view when a single day
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventMoveHandler.java
index 60f0016312..be27b606fe 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventMoveHandler.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.handler;
+package com.vaadin.v7.ui.components.calendar.handler;
 
 import java.util.Date;
 
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventMoveHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.MoveEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
-import com.vaadin.ui.components.calendar.event.EditableCalendarEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventMoveHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.MoveEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.ui.components.calendar.event.EditableCalendarEvent;
 
 /**
  * Implements basic functionality needed to enable moving events.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventResizeHandler.java
index 51e4bc1cbc..9b6f08ff09 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventResizeHandler.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.handler;
+package com.vaadin.v7.ui.components.calendar.handler;
 
 import java.util.Date;
 
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResize;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
-import com.vaadin.ui.components.calendar.event.EditableCalendarEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResize;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.ui.components.calendar.event.EditableCalendarEvent;
 
 /**
  * Implements basic functionality needed to enable event resizing.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java
index 6cdc00bee2..d71958536e 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.handler;
+package com.vaadin.v7.ui.components.calendar.handler;
 
 import java.util.Calendar;
 import java.util.Date;
 
 import com.vaadin.shared.ui.calendar.DateConstants;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.ForwardEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.ForwardHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardHandler;
 
 /**
  * Implements basic functionality needed to enable forward navigation.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicWeekClickHandler.java
index 128c6abfbd..420d0a76f6 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicWeekClickHandler.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.handler;
+package com.vaadin.v7.ui.components.calendar.handler;
 
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.WeekClick;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.WeekClickHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.WeekClick;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.WeekClickHandler;
 
 /**
  * Implements basic functionality needed to change to week view when a week
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorChangeEvent.java
index aa703deb19..da0b435ddc 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorChangeEvent.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
 import com.vaadin.shared.ui.colorpicker.Color;
 import com.vaadin.ui.Component;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeListener.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorChangeListener.java
index b234dc3d5d..87f0046242 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeListener.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorChangeListener.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
 import java.io.Serializable;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGradient.java
index 23748a967a..cb9dd698d9 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGradient.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
 import java.lang.reflect.Method;
 
 import com.vaadin.shared.ui.colorpicker.Color;
 import com.vaadin.shared.ui.colorpicker.ColorPickerGradientServerRpc;
 import com.vaadin.shared.ui.colorpicker.ColorPickerGradientState;
-import com.vaadin.ui.AbstractColorPicker.Coordinates2Color;
 import com.vaadin.ui.AbstractComponent;
+import com.vaadin.v7.ui.AbstractColorPicker.Coordinates2Color;
 
 /**
  * A component that represents a color gradient within a color picker.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGrid.java
index 9e5580c719..a1286dbc58 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGrid.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
 import java.awt.Point;
 import java.lang.reflect.Method;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerHistory.java
index 1173faf152..e26e802a32 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerHistory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPopup.java
index dbf3b18bf3..39931ce570 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPopup.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -27,7 +27,6 @@ import java.util.logging.Logger;
 
 import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.shared.ui.colorpicker.Color;
-import com.vaadin.ui.AbstractColorPicker.Coordinates2Color;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -40,6 +39,7 @@ import com.vaadin.ui.Slider.ValueOutOfBoundsException;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.AbstractColorPicker.Coordinates2Color;
 
 /**
  * A component that represents color selection popup within a color picker.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPreview.java
index dc133ce156..2a5b7c456f 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPreview.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
 import java.lang.reflect.Method;
 
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.shared.ui.colorpicker.Color;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CssLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.TextField;
 
 /**
  * A component that represents color selection preview within a color picker.
@@ -51,7 +51,7 @@ public class ColorPickerPreview extends CssLayout
     private Color color;
 
     /** The field. */
-    private final LegacyTextField field;
+    private final TextField field;
 
     /** The old value. */
     private String oldValue;
@@ -59,7 +59,7 @@ public class ColorPickerPreview extends CssLayout
     private ColorPickerPreview() {
         setStyleName("v-colorpicker-preview");
         setImmediate(true);
-        field = new LegacyTextField();
+        field = new TextField();
         field.setImmediate(true);
         field.setSizeFull();
         field.setStyleName("v-colorpicker-preview-textfield");
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerSelect.java
index ae3dee4069..87156b34db 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerSelect.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.shared.ui.colorpicker.Color;
-import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.ComboBox;
 
 /**
  * A component that represents color selection swatches within a color picker.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorSelector.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorSelector.java
index d9264745a8..a4da97c46b 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorSelector.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorSelector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
 import java.io.Serializable;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/HasColorChangeListener.java
index 7980111e2b..ed416c1ebe 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/HasColorChangeListener.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
 import java.io.Serializable;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/AbstractJavaScriptRenderer.java
index ac9ffb0eeb..2d0ac7f62e 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/AbstractJavaScriptRenderer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
 import com.vaadin.server.AbstractJavaScriptExtension;
 import com.vaadin.server.JavaScriptCallbackHelper;
@@ -21,7 +21,7 @@ import com.vaadin.server.JsonCodec;
 import com.vaadin.shared.JavaScriptExtensionState;
 import com.vaadin.shared.communication.ServerRpc;
 import com.vaadin.ui.JavaScriptFunction;
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
+import com.vaadin.v7.ui.Grid.AbstractRenderer;
 
 import elemental.json.Json;
 import elemental.json.JsonValue;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ButtonRenderer.java
index 3d7d5ab9d2..906fc025bb 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ButtonRenderer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
 /**
  * A Renderer that displays a button with a textual caption. The value of the
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ClickableRenderer.java
index d8fcdc3b4e..a1f48a99c4 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ClickableRenderer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
 import java.lang.reflect.Method;
 
@@ -21,10 +21,10 @@ import com.vaadin.event.ConnectorEventListener;
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.grid.renderers.RendererClickRpc;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
-import com.vaadin.ui.LegacyGrid.Column;
 import com.vaadin.util.ReflectTools;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.AbstractRenderer;
+import com.vaadin.v7.ui.Grid.Column;
 
 /**
  * An abstract superclass for Renderers that render clickable items. Click
@@ -67,7 +67,7 @@ public class ClickableRenderer<T> extends AbstractRenderer<T> {
         private Object itemId;
         private Column column;
 
-        protected RendererClickEvent(LegacyGrid source, Object itemId, Column column,
+        protected RendererClickEvent(Grid source, Object itemId, Column column,
                 MouseEventDetails mouseEventDetails) {
             super(source, mouseEventDetails);
             this.itemId = itemId;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/DateRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/DateRenderer.java
index eea18e7445..ac3b831acc 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/DateRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/DateRenderer.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
 import java.text.DateFormat;
 import java.util.Date;
 import java.util.Locale;
 
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
+import com.vaadin.v7.ui.Grid.AbstractRenderer;
 
 import elemental.json.JsonValue;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/HtmlRenderer.java
index 85d7801c41..5264f19e0b 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/HtmlRenderer.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
+import com.vaadin.v7.ui.Grid.AbstractRenderer;
 
 /**
  * A renderer for presenting HTML content.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ImageRenderer.java
index 56e319b47d..19c7a77b01 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ImageRenderer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.Resource;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/NumberRenderer.java
index e54eecc6ef..061f6d5790 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/NumberRenderer.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
 import java.text.NumberFormat;
 import java.util.Locale;
 
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
+import com.vaadin.v7.ui.Grid.AbstractRenderer;
 
 import elemental.json.JsonValue;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ProgressBarRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ProgressBarRenderer.java
index fe90dfdee0..d19c09ec59 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ProgressBarRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ProgressBarRenderer.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
+import com.vaadin.v7.ui.Grid.AbstractRenderer;
 
 import elemental.json.JsonValue;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/Renderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/Renderer.java
index d42e299ea8..ce221760cc 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/Renderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/Renderer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
 import com.vaadin.server.ClientConnector;
 import com.vaadin.server.Extension;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/TextRenderer.java
index 799e67b9e7..23306baf75 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/TextRenderer.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
+import com.vaadin.v7.ui.Grid.AbstractRenderer;
 
 /**
  * A renderer for presenting simple plain-text string values.
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/AllTests.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/AllTests.java
deleted file mode 100644
index 9c3f6c0eaa..0000000000
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/AllTests.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.vaadin.data.util.sqlcontainer;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-import com.vaadin.data.util.sqlcontainer.connection.J2EEConnectionPoolTest;
-import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPoolTest;
-import com.vaadin.data.util.sqlcontainer.filters.BetweenTest;
-import com.vaadin.data.util.sqlcontainer.filters.LikeTest;
-import com.vaadin.data.util.sqlcontainer.generator.SQLGeneratorsTest;
-import com.vaadin.data.util.sqlcontainer.query.FreeformQueryTest;
-import com.vaadin.data.util.sqlcontainer.query.QueryBuilderTest;
-import com.vaadin.data.util.sqlcontainer.query.TableQueryTest;
-
-@RunWith(Suite.class)
-@SuiteClasses({ SimpleJDBCConnectionPoolTest.class,
-        J2EEConnectionPoolTest.class, LikeTest.class, QueryBuilderTest.class,
-        FreeformQueryTest.class, RowIdTest.class, SQLContainerTest.class,
-        SQLContainerTableQueryTest.class, ColumnPropertyTest.class,
-        TableQueryTest.class, SQLGeneratorsTest.class, UtilTest.class,
-        TicketTest.class, BetweenTest.class, ReadOnlyRowIdTest.class })
-public class AllTests {
-}
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java
deleted file mode 100644
index 503ba455fd..0000000000
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.vaadin.tests.server.validation;
-
-import org.junit.Test;
-
-import com.vaadin.v7.data.validator.LegacyIntegerValidator;
-import com.vaadin.v7.ui.LegacyTextField;
-
-public class ReadOnlyValidationTest {
-
-    @Test
-    public void testIntegerValidation() {
-        LegacyTextField field = new LegacyTextField();
-        field.addValidator(new LegacyIntegerValidator("Enter a Valid Number"));
-        field.setValue(String.valueOf(10));
-        field.validate();
-    }
-}
diff --git a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/BeanFieldGroupTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/BeanFieldGroupTest.java
index 3333cd7744..fdb0ae2bf3 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/BeanFieldGroupTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/BeanFieldGroupTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.fieldgroup;
+package com.vaadin.v7.data.fieldgroup;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java
index e5aade1217..7cd4cfb90e 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.fieldgroup;
+package com.vaadin.v7.data.fieldgroup;
 
 import java.lang.reflect.Constructor;
 import java.util.Date;
@@ -22,14 +22,14 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.ui.AbstractSelect;
-import com.vaadin.ui.ComboBox;
-import com.vaadin.ui.ListSelect;
-import com.vaadin.v7.ui.LegacyDateField;
-import com.vaadin.v7.ui.LegacyField;
-import com.vaadin.v7.ui.LegacyInlineDateField;
-import com.vaadin.v7.ui.LegacyPopupDateField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.AbstractSelect;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.DateField;
+import com.vaadin.v7.ui.InlineDateField;
+import com.vaadin.v7.ui.PopupDateField;
+import com.vaadin.v7.ui.ListSelect;
+import com.vaadin.v7.ui.TextField;
 
 public class DefaultFieldGroupFieldFactoryTest {
 
@@ -65,33 +65,33 @@ public class DefaultFieldGroupFieldFactoryTest {
 
     @Test
     public void testDateGenerationForPopupDateField() {
-        LegacyField f = fieldFactory.createField(Date.class,
-                LegacyDateField.class);
+        Field f = fieldFactory.createField(Date.class,
+                DateField.class);
         Assert.assertNotNull(f);
-        Assert.assertEquals(LegacyPopupDateField.class, f.getClass());
+        Assert.assertEquals(PopupDateField.class, f.getClass());
     }
 
     @Test
     public void testDateGenerationForInlineDateField() {
-        LegacyField f = fieldFactory.createField(Date.class,
-                LegacyInlineDateField.class);
+        Field f = fieldFactory.createField(Date.class,
+                InlineDateField.class);
         Assert.assertNotNull(f);
-        Assert.assertEquals(LegacyInlineDateField.class, f.getClass());
+        Assert.assertEquals(InlineDateField.class, f.getClass());
     }
 
     @Test
     public void testDateGenerationForTextField() {
-        LegacyField f = fieldFactory.createField(Date.class,
-                LegacyTextField.class);
+        Field f = fieldFactory.createField(Date.class,
+                TextField.class);
         Assert.assertNotNull(f);
-        Assert.assertEquals(LegacyTextField.class, f.getClass());
+        Assert.assertEquals(TextField.class, f.getClass());
     }
 
     @Test
     public void testDateGenerationForField() {
-        LegacyField f = fieldFactory.createField(Date.class, LegacyField.class);
+        Field f = fieldFactory.createField(Date.class, Field.class);
         Assert.assertNotNull(f);
-        Assert.assertEquals(LegacyPopupDateField.class, f.getClass());
+        Assert.assertEquals(PopupDateField.class, f.getClass());
     }
 
     public enum SomeEnum {
@@ -100,7 +100,7 @@ public class DefaultFieldGroupFieldFactoryTest {
 
     @Test
     public void testEnumComboBox() {
-        LegacyField f = fieldFactory.createField(SomeEnum.class,
+        Field f = fieldFactory.createField(SomeEnum.class,
                 ComboBox.class);
         Assert.assertNotNull(f);
         Assert.assertEquals(ComboBox.class, f.getClass());
@@ -108,7 +108,7 @@ public class DefaultFieldGroupFieldFactoryTest {
 
     @Test
     public void testEnumAnySelect() {
-        LegacyField f = fieldFactory.createField(SomeEnum.class,
+        Field f = fieldFactory.createField(SomeEnum.class,
                 AbstractSelect.class);
         Assert.assertNotNull(f);
         Assert.assertEquals(ListSelect.class, f.getClass());
@@ -116,8 +116,8 @@ public class DefaultFieldGroupFieldFactoryTest {
 
     @Test
     public void testEnumAnyField() {
-        LegacyField f = fieldFactory.createField(SomeEnum.class,
-                LegacyField.class);
+        Field f = fieldFactory.createField(SomeEnum.class,
+                Field.class);
         Assert.assertNotNull(f);
         Assert.assertEquals(ListSelect.class, f.getClass());
     }
diff --git a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/FieldGroupDateTest.java
index e270211abf..d354729bea 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/FieldGroupDateTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.fieldgroup;
+package com.vaadin.v7.data.fieldgroup;
 
 import java.util.Date;
 
@@ -21,9 +21,9 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.util.BeanItem;
-import com.vaadin.v7.ui.LegacyField;
-import com.vaadin.v7.ui.LegacyPopupDateField;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.PopupDateField;
 
 public class FieldGroupDateTest {
 
@@ -66,22 +66,22 @@ public class FieldGroupDateTest {
 
     @Test
     public void testBuildAndBindDate() {
-        LegacyField f = fieldGroup.buildAndBind("javaDate");
+        Field f = fieldGroup.buildAndBind("javaDate");
         Assert.assertNotNull(f);
-        Assert.assertEquals(LegacyPopupDateField.class, f.getClass());
+        Assert.assertEquals(PopupDateField.class, f.getClass());
     }
 
     @Test
     public void testBuildAndBindSqlDate() {
-        LegacyField f = fieldGroup.buildAndBind("sqlDate");
+        Field f = fieldGroup.buildAndBind("sqlDate");
         Assert.assertNotNull(f);
-        Assert.assertEquals(LegacyPopupDateField.class, f.getClass());
+        Assert.assertEquals(PopupDateField.class, f.getClass());
     }
 
     @Test
     public void clearFields() {
-        LegacyPopupDateField sqlDate = new LegacyPopupDateField();
-        LegacyPopupDateField javaDate = new LegacyPopupDateField();
+        PopupDateField sqlDate = new PopupDateField();
+        PopupDateField javaDate = new PopupDateField();
         fieldGroup.bind(sqlDate, "sqlDate");
         fieldGroup.bind(javaDate, "javaDate");
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/FieldGroupExceptionTest.java
index 4622f0960e..6a18e35666 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/FieldGroupExceptionTest.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.fieldgroup;
+package com.vaadin.v7.data.fieldgroup;
 
 import org.junit.Test;
 
-import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
-import com.vaadin.v7.ui.LegacyPopupDateField;
+import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
+import com.vaadin.v7.ui.PopupDateField;
 
 public class FieldGroupExceptionTest {
 
     @Test(expected = CommitException.class)
     public void testUnboundCommitException() throws CommitException {
         FieldGroup fieldGroup = new FieldGroup();
-        LegacyPopupDateField dateField = new LegacyPopupDateField();
+        PopupDateField dateField = new PopupDateField();
         fieldGroup.bind(dateField, "date");
         fieldGroup.commit();
     }
diff --git a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/FieldGroupTest.java
index c0039fc4fb..c8d98c14b5 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/FieldGroupTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.fieldgroup;
+package com.vaadin.v7.data.fieldgroup;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
@@ -9,22 +9,22 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.Transactional;
-import com.vaadin.data.util.BeanItem;
-import com.vaadin.data.util.TransactionalPropertyWrapper;
-import com.vaadin.v7.ui.LegacyField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.Transactional;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.data.util.TransactionalPropertyWrapper;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.TextField;
 
 public class FieldGroupTest {
 
     private FieldGroup sut;
-    private LegacyField field;
+    private Field field;
 
     @Before
     public void setup() {
         sut = new FieldGroup();
-        field = mock(LegacyField.class);
+        field = mock(Field.class);
     }
 
     @Test
@@ -37,7 +37,7 @@ public class FieldGroupTest {
     @Test(expected = FieldGroup.BindException.class)
     public void cannotBindToAlreadyBoundProperty() {
         sut.bind(field, "foobar");
-        sut.bind(mock(LegacyField.class), "foobar");
+        sut.bind(mock(Field.class), "foobar");
     }
 
     @Test(expected = FieldGroup.BindException.class)
@@ -63,7 +63,7 @@ public class FieldGroupTest {
             }
         };
         group.setItemDataSource(new BeanItem<Bean>(bean));
-        LegacyTextField field = new LegacyTextField();
+        TextField field = new TextField();
         group.bind(field, "name");
 
         Property propertyDataSource = field.getPropertyDataSource();
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/AbstractBeanContainerTestBase.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/AbstractBeanContainerTestBase.java
index 4a9e4f9891..9e5b602d39 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/AbstractBeanContainerTestBase.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/AbstractBeanContainerTestBase.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 /**
  * Automated test for {@link AbstractBeanContainer}.
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/AbstractContainerTestBase.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/AbstractContainerTestBase.java
index 955b609735..7ff24f76ae 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/AbstractContainerTestBase.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/AbstractContainerTestBase.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -12,14 +12,14 @@ import java.util.List;
 
 import org.junit.Assert;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.Filterable;
-import com.vaadin.data.Container.ItemSetChangeEvent;
-import com.vaadin.data.Container.ItemSetChangeListener;
-import com.vaadin.data.Container.Ordered;
-import com.vaadin.data.Container.Sortable;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.filter.SimpleStringFilter;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Filterable;
+import com.vaadin.v7.data.Container.ItemSetChangeEvent;
+import com.vaadin.v7.data.Container.ItemSetChangeListener;
+import com.vaadin.v7.data.Container.Ordered;
+import com.vaadin.v7.data.Container.Sortable;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.filter.SimpleStringFilter;
 
 public abstract class AbstractContainerTestBase {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/AbstractHierarchicalContainerTestBase.java
index f3eda74100..816dc251b5 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/AbstractHierarchicalContainerTestBase.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -8,10 +8,10 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.Collection;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.Hierarchical;
-import com.vaadin.data.Container.Sortable;
-import com.vaadin.data.Item;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Hierarchical;
+import com.vaadin.v7.data.Container.Sortable;
+import com.vaadin.v7.data.Item;
 
 public abstract class AbstractHierarchicalContainerTestBase
         extends AbstractContainerTestBase {
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/AbstractInMemoryContainerTestBase.java
index 3858504bc7..020fe5f015 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/AbstractInMemoryContainerTestBase.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 public abstract class AbstractInMemoryContainerTestBase
         extends AbstractContainerTestBase {
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/BeanContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanContainerTest.java
index bdf6ba1958..f536fb489e 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/BeanContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanContainerTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -17,9 +17,9 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.AbstractBeanContainer.BeanIdResolver;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.AbstractBeanContainer.BeanIdResolver;
 
 public class BeanContainerTest extends AbstractBeanContainerTestBase {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemContainerGenerator.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemContainerGenerator.java
index a5bdcc7cf9..2bc90c175c 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemContainerGenerator.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemContainerGenerator.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemContainerSortTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemContainerSortTest.java
index 4f4e35258f..d9544e3e82 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemContainerSortTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemContainerSortTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemContainerTest.java
index 19b0835fd6..31d96fb47e 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemContainerTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -20,13 +20,13 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.Indexed.ItemAddEvent;
-import com.vaadin.data.Container.Indexed.ItemRemoveEvent;
-import com.vaadin.data.Container.ItemSetChangeListener;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.NestedMethodPropertyTest.Address;
-import com.vaadin.data.util.filter.Compare;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Indexed.ItemAddEvent;
+import com.vaadin.v7.data.Container.Indexed.ItemRemoveEvent;
+import com.vaadin.v7.data.Container.ItemSetChangeListener;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.NestedMethodPropertyTest.Address;
+import com.vaadin.v7.data.util.filter.Compare;
 
 /**
  * Test basic functionality of BeanItemContainer.
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemTest.java
index 1bbe74818c..cc5d72f3df 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -12,7 +12,7 @@ import java.util.Map;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Property;
+import com.vaadin.v7.data.Property;
 
 /**
  * Test BeanItem specific features.
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapperTest.java
index e41f751bfd..aa3187fde8 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapperTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import org.junit.Test;
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/ContainerOrderedWrapperTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ContainerOrderedWrapperTest.java
index c3a8b2c4f9..2eded0084d 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/ContainerOrderedWrapperTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ContainerOrderedWrapperTest.java
@@ -1,12 +1,12 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.util.Collection;
 
 import org.junit.Test;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
 
 public class ContainerOrderedWrapperTest extends AbstractContainerTestBase {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/ContainerSizeAssertTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ContainerSizeAssertTest.java
index 58cb2b1d27..bc2815969b 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/ContainerSizeAssertTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ContainerSizeAssertTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import org.junit.Test;
 
-import com.vaadin.data.Container;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.ui.Table;
 
 public class ContainerSizeAssertTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/ContainerSortingTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ContainerSortingTest.java
index 1c4dc1de5e..860f3b7b15 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/ContainerSortingTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ContainerSortingTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -6,9 +6,9 @@ import java.util.Map;
 
 import org.junit.Test;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
 import com.vaadin.tests.util.TestUtil;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
 
 public class ContainerSortingTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/FileSystemContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/FileSystemContainerTest.java
index 992b265702..c421750f87 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/FileSystemContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/FileSystemContainerTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.io.File;
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerBasicTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/GeneratedPropertyContainerBasicTest.java
index 11335314f0..fb7cb06727 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerBasicTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/GeneratedPropertyContainerBasicTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -12,13 +12,13 @@ import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.Indexed.ItemAddEvent;
-import com.vaadin.data.Container.Indexed.ItemRemoveEvent;
-import com.vaadin.data.Container.ItemSetChangeListener;
-import com.vaadin.data.Container.ItemSetChangeNotifier;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.filter.SimpleStringFilter;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Indexed.ItemAddEvent;
+import com.vaadin.v7.data.Container.Indexed.ItemRemoveEvent;
+import com.vaadin.v7.data.Container.ItemSetChangeListener;
+import com.vaadin.v7.data.Container.ItemSetChangeNotifier;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.filter.SimpleStringFilter;
 
 public class GeneratedPropertyContainerBasicTest
         extends AbstractInMemoryContainerTestBase {
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/GeneratedPropertyContainerTest.java
index 1e34567439..6196af79d4 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/GeneratedPropertyContainerTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -23,17 +23,17 @@ import static org.junit.Assert.fail;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.Container.Indexed;
-import com.vaadin.data.Container.ItemSetChangeEvent;
-import com.vaadin.data.Container.ItemSetChangeListener;
-import com.vaadin.data.Container.PropertySetChangeEvent;
-import com.vaadin.data.Container.PropertySetChangeListener;
-import com.vaadin.data.Item;
 import com.vaadin.data.sort.SortOrder;
-import com.vaadin.data.util.GeneratedPropertyContainer.GeneratedPropertyItem;
-import com.vaadin.data.util.filter.Compare;
-import com.vaadin.data.util.filter.UnsupportedFilterException;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Container.Indexed;
+import com.vaadin.v7.data.Container.ItemSetChangeEvent;
+import com.vaadin.v7.data.Container.ItemSetChangeListener;
+import com.vaadin.v7.data.Container.PropertySetChangeEvent;
+import com.vaadin.v7.data.Container.PropertySetChangeListener;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.GeneratedPropertyContainer.GeneratedPropertyItem;
+import com.vaadin.v7.data.util.filter.Compare;
+import com.vaadin.v7.data.util.filter.UnsupportedFilterException;
 
 public class GeneratedPropertyContainerTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapperTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapperTest.java
index 54984f07ad..b8f1cecc4b 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapperTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapperTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import org.junit.Test;
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/HierarchicalContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/HierarchicalContainerTest.java
index 7ab20ca3dd..8e36d751c0 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/HierarchicalContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/HierarchicalContainerTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -6,8 +6,8 @@ import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.Item;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
 
 public class HierarchicalContainerTest
         extends AbstractHierarchicalContainerTestBase {
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/IndexedContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/IndexedContainerTest.java
index b19a425518..712a9b7047 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/IndexedContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/IndexedContainerTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -11,10 +11,10 @@ import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Container.Indexed.ItemAddEvent;
-import com.vaadin.data.Container.Indexed.ItemRemoveEvent;
-import com.vaadin.data.Container.ItemSetChangeListener;
-import com.vaadin.data.Item;
+import com.vaadin.v7.data.Container.Indexed.ItemAddEvent;
+import com.vaadin.v7.data.Container.Indexed.ItemRemoveEvent;
+import com.vaadin.v7.data.Container.ItemSetChangeListener;
+import com.vaadin.v7.data.Item;
 
 public class IndexedContainerTest extends AbstractInMemoryContainerTestBase {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/MethodPropertyMemoryConsumptionTest.java
index 6776021c24..64a7c19b8f 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/MethodPropertyMemoryConsumptionTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/NestedMethodPropertyTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/NestedMethodPropertyTest.java
index 4a1e2a1784..a5103e0e0a 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/NestedMethodPropertyTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/NestedMethodPropertyTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/ObjectPropertyTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ObjectPropertyTest.java
index e0307034cf..3e2cb5cc91 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/ObjectPropertyTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ObjectPropertyTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/PerformanceTestIndexedContainerTest.java
index 5f64c0e8d8..1f27bc226c 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/PerformanceTestIndexedContainerTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/PropertyDescriptorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/PropertyDescriptorTest.java
index af9db229c5..1dd603c328 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/PropertyDescriptorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/PropertyDescriptorTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
@@ -10,8 +10,8 @@ import java.io.ObjectOutputStream;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Property;
-import com.vaadin.data.util.NestedMethodPropertyTest.Person;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.NestedMethodPropertyTest.Person;
 
 public class PropertyDescriptorTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/PropertySetItemTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/PropertySetItemTest.java
index fc91a20dd0..0516c8ae9f 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/PropertySetItemTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/PropertySetItemTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.util.Iterator;
 
@@ -8,8 +8,8 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Item.PropertySetChangeEvent;
-import com.vaadin.data.Item.PropertySetChangeListener;
+import com.vaadin.v7.data.Item.PropertySetChangeEvent;
+import com.vaadin.v7.data.Item.PropertySetChangeListener;
 
 public class PropertySetItemTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ReflectToolsGetSuperFieldTest.java
index df4258f316..2876181b90 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ReflectToolsGetSuperFieldTest.java
@@ -1,12 +1,12 @@
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.fieldgroup.PropertyId;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.fieldgroup.FieldGroup;
+import com.vaadin.v7.data.fieldgroup.PropertyId;
+import com.vaadin.v7.ui.TextField;
 
 public class ReflectToolsGetSuperFieldTest {
 
@@ -14,7 +14,7 @@ public class ReflectToolsGetSuperFieldTest {
     public void getFieldFromSuperClass() {
         class MyClass {
             @PropertyId("testProperty")
-            LegacyTextField test = new LegacyTextField("This is a test");
+            TextField test = new TextField("This is a test");
         }
         class MySubClass extends MyClass {
             // no fields here
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/TransactionalPropertyWrapperTest.java
index ef3e416f96..6aa4c5a2af 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/TransactionalPropertyWrapperTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import static org.junit.Assert.assertTrue;
 
@@ -22,8 +22,8 @@ import java.util.List;
 
 import org.junit.Test;
 
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.fieldgroup.FieldGroup;
+import com.vaadin.v7.ui.TextField;
 
 /**
  * Test verifying that TransactionalPropertyWrapper removes it's listener from
@@ -63,9 +63,9 @@ public class TransactionalPropertyWrapperTest {
         }
     }
 
-    private final LegacyTextField nameField = new LegacyTextField("Name");
-    private final LegacyTextField ageField = new LegacyTextField("Age");
-    private final LegacyTextField unboundField = new LegacyTextField(
+    private final TextField nameField = new TextField("Name");
+    private final TextField ageField = new TextField("Age");
+    private final TextField unboundField = new TextField(
             "No FieldGroup");
     private final TestingProperty<String> unboundProp = new TestingProperty<String>(
             "Hello World");
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/AbstractFilterTestBase.java
index 0c6932c65e..7120a429fc 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/AbstractFilterTestBase.java
@@ -1,10 +1,10 @@
-package com.vaadin.data.util.filter;
+package com.vaadin.v7.data.util.filter;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.data.util.PropertysetItem;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.data.util.PropertysetItem;
 
 import junit.framework.TestCase;
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/filter/AndOrFilterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/AndOrFilterTest.java
index f825ef64c6..827da03790 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/filter/AndOrFilterTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/AndOrFilterTest.java
@@ -1,11 +1,11 @@
-package com.vaadin.data.util.filter;
+package com.vaadin.v7.data.util.filter;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.BeanItem;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.BeanItem;
 
 public class AndOrFilterTest
         extends AbstractFilterTestBase<AbstractJunctionFilter> {
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/filter/CompareFilterDateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/CompareFilterDateTest.java
index 7c3dba9db3..89e9d08cda 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/filter/CompareFilterDateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/CompareFilterDateTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.filter;
+package com.vaadin.v7.data.util.filter;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -6,15 +6,15 @@ import java.util.Date;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.data.util.PropertysetItem;
-import com.vaadin.data.util.filter.Compare.Equal;
-import com.vaadin.data.util.filter.Compare.Greater;
-import com.vaadin.data.util.filter.Compare.GreaterOrEqual;
-import com.vaadin.data.util.filter.Compare.Less;
-import com.vaadin.data.util.filter.Compare.LessOrEqual;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.data.util.PropertysetItem;
+import com.vaadin.v7.data.util.filter.Compare.Equal;
+import com.vaadin.v7.data.util.filter.Compare.Greater;
+import com.vaadin.v7.data.util.filter.Compare.GreaterOrEqual;
+import com.vaadin.v7.data.util.filter.Compare.Less;
+import com.vaadin.v7.data.util.filter.Compare.LessOrEqual;
 
 public class CompareFilterDateTest extends AbstractFilterTestBase<Compare> {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/filter/CompareFilterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/CompareFilterTest.java
index 4bdad3c54d..b93c72e37e 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/filter/CompareFilterTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/CompareFilterTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.filter;
+package com.vaadin.v7.data.util.filter;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -6,15 +6,15 @@ import java.util.Date;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.data.util.PropertysetItem;
-import com.vaadin.data.util.filter.Compare.Equal;
-import com.vaadin.data.util.filter.Compare.Greater;
-import com.vaadin.data.util.filter.Compare.GreaterOrEqual;
-import com.vaadin.data.util.filter.Compare.Less;
-import com.vaadin.data.util.filter.Compare.LessOrEqual;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.data.util.PropertysetItem;
+import com.vaadin.v7.data.util.filter.Compare.Equal;
+import com.vaadin.v7.data.util.filter.Compare.Greater;
+import com.vaadin.v7.data.util.filter.Compare.GreaterOrEqual;
+import com.vaadin.v7.data.util.filter.Compare.Less;
+import com.vaadin.v7.data.util.filter.Compare.LessOrEqual;
 
 public class CompareFilterTest extends AbstractFilterTestBase<Compare> {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/filter/IsNullFilterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/IsNullFilterTest.java
index 18013cd41c..1b5705ea45 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/filter/IsNullFilterTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/IsNullFilterTest.java
@@ -1,12 +1,12 @@
-package com.vaadin.data.util.filter;
+package com.vaadin.v7.data.util.filter;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.data.util.PropertysetItem;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.data.util.PropertysetItem;
 
 public class IsNullFilterTest extends AbstractFilterTestBase<IsNull> {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/filter/LikeFilterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/LikeFilterTest.java
index 39054008cd..cac985f359 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/filter/LikeFilterTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/LikeFilterTest.java
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package com.vaadin.data.util.filter;
+package com.vaadin.v7.data.util.filter;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Item;
-import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.data.util.PropertysetItem;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.data.util.PropertysetItem;
 
 public class LikeFilterTest extends AbstractFilterTestBase<Like> {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/filter/NotFilterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/NotFilterTest.java
index e797b484f8..cdf51abe5a 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/filter/NotFilterTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/NotFilterTest.java
@@ -1,11 +1,11 @@
-package com.vaadin.data.util.filter;
+package com.vaadin.v7.data.util.filter;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.BeanItem;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.BeanItem;
 
 public class NotFilterTest extends AbstractFilterTestBase<Not> {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/filter/SimpleStringFilterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/SimpleStringFilterTest.java
index dd8267107a..cf0af5fe7b 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/filter/SimpleStringFilterTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/SimpleStringFilterTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.filter;
+package com.vaadin.v7.data.util.filter;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/AllTests.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/AllTests.java
new file mode 100644
index 0000000000..caac9ea91d
--- /dev/null
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/AllTests.java
@@ -0,0 +1,24 @@
+package com.vaadin.v7.data.util.sqlcontainer;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+import com.vaadin.v7.data.util.sqlcontainer.connection.J2EEConnectionPoolTest;
+import com.vaadin.v7.data.util.sqlcontainer.connection.SimpleJDBCConnectionPoolTest;
+import com.vaadin.v7.data.util.sqlcontainer.filters.BetweenTest;
+import com.vaadin.v7.data.util.sqlcontainer.filters.LikeTest;
+import com.vaadin.v7.data.util.sqlcontainer.generator.SQLGeneratorsTest;
+import com.vaadin.v7.data.util.sqlcontainer.query.FreeformQueryTest;
+import com.vaadin.v7.data.util.sqlcontainer.query.QueryBuilderTest;
+import com.vaadin.v7.data.util.sqlcontainer.query.TableQueryTest;
+
+@RunWith(Suite.class)
+@SuiteClasses({ SimpleJDBCConnectionPoolTest.class,
+        J2EEConnectionPoolTest.class, LikeTest.class, QueryBuilderTest.class,
+        FreeformQueryTest.class, RowIdTest.class, SQLContainerTest.class,
+        SQLContainerTableQueryTest.class, ColumnPropertyTest.class,
+        TableQueryTest.class, SQLGeneratorsTest.class, UtilTest.class,
+        TicketTest.class, BetweenTest.class, ReadOnlyRowIdTest.class })
+public class AllTests {
+}
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/ColumnPropertyTest.java
index edc56035e1..ce6398b50a 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/ColumnPropertyTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
@@ -11,9 +11,9 @@ import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Property.ReadOnlyException;
-import com.vaadin.data.util.sqlcontainer.ColumnProperty.NotNullableException;
-import com.vaadin.data.util.sqlcontainer.query.QueryDelegate;
+import com.vaadin.v7.data.Property.ReadOnlyException;
+import com.vaadin.v7.data.util.sqlcontainer.ColumnProperty.NotNullableException;
+import com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate;
 
 public class ColumnPropertyTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/DataGenerator.java
index 3d12fc78ba..02d59e4489 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/DataGenerator.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -7,8 +7,8 @@ import java.sql.Statement;
 
 import org.junit.Assert;
 
-import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB;
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants.DB;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
 
 public class DataGenerator {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/FreeformQueryUtil.java
index c8b5b5a2b3..9c14296476 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/FreeformQueryUtil.java
@@ -1,11 +1,11 @@
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.util.List;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
-import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants.DB;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
 
 public class FreeformQueryUtil {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/ReadOnlyRowIdTest.java
index 29968ecf94..b1208c7b94 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/ReadOnlyRowIdTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/RowIdTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/RowIdTest.java
index e93048157b..e9e869223d 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/RowIdTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/RowIdTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainerTableQueryTest.java
index 0bdcc9a3c3..fe1e7e1813 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainerTableQueryTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.hasItems;
@@ -23,15 +23,15 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Container.ItemSetChangeEvent;
-import com.vaadin.data.Container.ItemSetChangeListener;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.filter.Like;
-import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB;
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.OrderBy;
-import com.vaadin.data.util.sqlcontainer.query.TableQuery;
-import com.vaadin.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool;
+import com.vaadin.v7.data.Container.ItemSetChangeEvent;
+import com.vaadin.v7.data.Container.ItemSetChangeListener;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.filter.Like;
+import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants.DB;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy;
+import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery;
+import com.vaadin.v7.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool;
 
 public class SQLContainerTableQueryTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainerTest.java
index d499ceed92..3346bd245a 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainerTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.math.BigDecimal;
 import java.sql.Connection;
@@ -18,24 +18,24 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.Container.ItemSetChangeEvent;
-import com.vaadin.data.Container.ItemSetChangeListener;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.filter.Compare.Equal;
-import com.vaadin.data.util.filter.Like;
-import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB;
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.FreeformQuery;
-import com.vaadin.data.util.sqlcontainer.query.FreeformQueryDelegate;
-import com.vaadin.data.util.sqlcontainer.query.FreeformStatementDelegate;
-import com.vaadin.data.util.sqlcontainer.query.OrderBy;
-import com.vaadin.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.generator.MSSQLGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.OracleGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.SQLGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
-import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Container.ItemSetChangeEvent;
+import com.vaadin.v7.data.Container.ItemSetChangeListener;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.filter.Compare.Equal;
+import com.vaadin.v7.data.util.filter.Like;
+import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants.DB;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.query.FreeformQuery;
+import com.vaadin.v7.data.util.sqlcontainer.query.FreeformQueryDelegate;
+import com.vaadin.v7.data.util.sqlcontainer.query.FreeformStatementDelegate;
+import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy;
+import com.vaadin.v7.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.MSSQLGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.OracleGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.SQLGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
 
 public class SQLContainerTest {
     private static final int offset = SQLTestsConstants.offset;
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/SQLTestsConstants.java
index 3718cf756d..f7a13583c4 100755
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/SQLTestsConstants.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
-import com.vaadin.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.MSSQLGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.OracleGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.SQLGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.MSSQLGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.OracleGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.SQLGenerator;
 
 public class SQLTestsConstants {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/TicketTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/TicketTest.java
index 1a19eda542..34cc791c7a 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/TicketTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/TicketTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.math.BigDecimal;
 import java.sql.SQLException;
@@ -12,19 +12,19 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.filter.Compare.Equal;
-import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB;
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.FreeformQuery;
-import com.vaadin.data.util.sqlcontainer.query.FreeformStatementDelegate;
-import com.vaadin.data.util.sqlcontainer.query.TableQuery;
-import com.vaadin.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
-import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
-import com.vaadin.ui.Table;
 import com.vaadin.ui.Window;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.filter.Compare.Equal;
+import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants.DB;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.query.FreeformQuery;
+import com.vaadin.v7.data.util.sqlcontainer.query.FreeformStatementDelegate;
+import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery;
+import com.vaadin.v7.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
+import com.vaadin.v7.ui.Table;
 
 public class TicketTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/UtilTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/UtilTest.java
index a575d649f1..f71c5b02e9 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/UtilTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/UtilTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
index 1463a27217..403f35ecc9 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.sqlcontainer.connection;
+package com.vaadin.v7.data.util.sqlcontainer.connection;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -63,7 +63,7 @@ public class J2EEConnectionPoolTest {
         EasyMock.expectLastCall().andReturn(connection);
 
         System.setProperty("java.naming.factory.initial",
-                "com.vaadin.data.util.sqlcontainer.connection.MockInitialContextFactory");
+                "com.vaadin.v7.data.util.sqlcontainer.connection.MockInitialContextFactory");
         Context context = EasyMock.createMock(Context.class);
         context.lookup("testDataSource");
         EasyMock.expectLastCall().andReturn(ds);
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/MockInitialContextFactory.java
index 42b02cf874..fce8b4d4ec 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/MockInitialContextFactory.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.sqlcontainer.connection;
+package com.vaadin.v7.data.util.sqlcontainer.connection;
 
 import javax.naming.Context;
 import javax.naming.NamingException;
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
index 5a6ae78aeb..2d63b0a6ab 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.sqlcontainer.connection;
+package com.vaadin.v7.data.util.sqlcontainer.connection;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -8,8 +8,8 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.util.sqlcontainer.SQLTestsConstants;
-import com.vaadin.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants;
+import com.vaadin.v7.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool;
 
 public class SimpleJDBCConnectionPoolTest {
     private JDBCConnectionPool connectionPool;
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/filters/BetweenTest.java
index 41db88b881..59e486b686 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/filters/BetweenTest.java
@@ -1,12 +1,12 @@
-package com.vaadin.data.util.sqlcontainer.filters;
+package com.vaadin.v7.data.util.sqlcontainer.filters;
 
 import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.filter.Between;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.filter.Between;
 
 public class BetweenTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/filters/CompareTest.java
index a6b6f4b55c..9739144b7f 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/filters/CompareTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.filters;
+package com.vaadin.v7.data.util.sqlcontainer.filters;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.util.filter.Compare;
+import com.vaadin.v7.data.util.filter.Compare;
 
 public class CompareTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/filters/LikeTest.java
index f1130aad80..e09705e6f3 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/filters/LikeTest.java
@@ -1,12 +1,12 @@
-package com.vaadin.data.util.sqlcontainer.filters;
+package com.vaadin.v7.data.util.sqlcontainer.filters;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Item;
-import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.data.util.PropertysetItem;
-import com.vaadin.data.util.filter.Like;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.data.util.PropertysetItem;
+import com.vaadin.v7.data.util.filter.Like;
 
 public class LikeTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/generator/SQLGeneratorsTest.java
index dd1db30b72..7f27d2a2fd 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/generator/SQLGeneratorsTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.sqlcontainer.generator;
+package com.vaadin.v7.data.util.sqlcontainer.generator;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -10,22 +10,22 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.Like;
-import com.vaadin.data.util.filter.Or;
-import com.vaadin.data.util.sqlcontainer.DataGenerator;
-import com.vaadin.data.util.sqlcontainer.RowItem;
-import com.vaadin.data.util.sqlcontainer.SQLContainer;
-import com.vaadin.data.util.sqlcontainer.SQLTestsConstants;
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.OrderBy;
-import com.vaadin.data.util.sqlcontainer.query.TableQuery;
-import com.vaadin.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.MSSQLGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.OracleGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.SQLGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.Like;
+import com.vaadin.v7.data.util.filter.Or;
+import com.vaadin.v7.data.util.sqlcontainer.DataGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.RowItem;
+import com.vaadin.v7.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy;
+import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery;
+import com.vaadin.v7.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.MSSQLGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.OracleGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.SQLGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class SQLGeneratorsTest {
     private JDBCConnectionPool connectionPool;
@@ -75,7 +75,7 @@ public class SQLGeneratorsTest {
     @Test
     public void generateSelectQuery_filtersAndOrderingSet_shouldSucceed() {
         SQLGenerator sg = new DefaultSQLGenerator();
-        List<com.vaadin.data.Container.Filter> f = new ArrayList<Filter>();
+        List<com.vaadin.v7.data.Container.Filter> f = new ArrayList<Filter>();
         f.add(new Like("name", "%lle"));
         List<OrderBy> ob = Arrays.asList(new OrderBy("name", true));
         StatementHelper sh = sg.generateSelectQuery("TABLE", f, ob, 0, 0, null);
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/generator/StatementHelperTest.java
index 7201ec7ad8..1c6559dc73 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/generator/StatementHelperTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.generator;
+package com.vaadin.v7.data.util.sqlcontainer.generator;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 /**
  *
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQueryTest.java
index 1b9e14b0d8..b32f16325d 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQueryTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.sqlcontainer.query;
+package com.vaadin.v7.data.util.sqlcontainer.query;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -14,16 +14,16 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.Like;
-import com.vaadin.data.util.sqlcontainer.DataGenerator;
-import com.vaadin.data.util.sqlcontainer.RowId;
-import com.vaadin.data.util.sqlcontainer.RowItem;
-import com.vaadin.data.util.sqlcontainer.SQLContainer;
-import com.vaadin.data.util.sqlcontainer.SQLTestsConstants;
-import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB;
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.Like;
+import com.vaadin.v7.data.util.sqlcontainer.DataGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.RowId;
+import com.vaadin.v7.data.util.sqlcontainer.RowItem;
+import com.vaadin.v7.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants;
+import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants.DB;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class FreeformQueryTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/QueryBuilderTest.java
index 7974582147..834329b3d2 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/QueryBuilderTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.sqlcontainer.query;
+package com.vaadin.v7.data.util.sqlcontainer.query;
 
 import java.util.ArrayList;
 
@@ -6,22 +6,22 @@ import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.And;
-import com.vaadin.data.util.filter.Between;
-import com.vaadin.data.util.filter.Compare.Equal;
-import com.vaadin.data.util.filter.Compare.Greater;
-import com.vaadin.data.util.filter.Compare.GreaterOrEqual;
-import com.vaadin.data.util.filter.Compare.Less;
-import com.vaadin.data.util.filter.Compare.LessOrEqual;
-import com.vaadin.data.util.filter.IsNull;
-import com.vaadin.data.util.filter.Like;
-import com.vaadin.data.util.filter.Not;
-import com.vaadin.data.util.filter.Or;
-import com.vaadin.data.util.filter.SimpleStringFilter;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
-import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
-import com.vaadin.data.util.sqlcontainer.query.generator.filter.StringDecorator;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.And;
+import com.vaadin.v7.data.util.filter.Between;
+import com.vaadin.v7.data.util.filter.Compare.Equal;
+import com.vaadin.v7.data.util.filter.Compare.Greater;
+import com.vaadin.v7.data.util.filter.Compare.GreaterOrEqual;
+import com.vaadin.v7.data.util.filter.Compare.Less;
+import com.vaadin.v7.data.util.filter.Compare.LessOrEqual;
+import com.vaadin.v7.data.util.filter.IsNull;
+import com.vaadin.v7.data.util.filter.Like;
+import com.vaadin.v7.data.util.filter.Not;
+import com.vaadin.v7.data.util.filter.Or;
+import com.vaadin.v7.data.util.filter.SimpleStringFilter;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.StringDecorator;
 
 public class QueryBuilderTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/TableQueryTest.java
index d2067a85b4..23dec7cbf6 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/TableQueryTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.sqlcontainer.query;
+package com.vaadin.v7.data.util.sqlcontainer.query;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -14,17 +14,17 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.Compare.Equal;
-import com.vaadin.data.util.filter.Like;
-import com.vaadin.data.util.sqlcontainer.DataGenerator;
-import com.vaadin.data.util.sqlcontainer.OptimisticLockException;
-import com.vaadin.data.util.sqlcontainer.RowItem;
-import com.vaadin.data.util.sqlcontainer.SQLContainer;
-import com.vaadin.data.util.sqlcontainer.SQLTestsConstants;
-import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB;
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.Compare.Equal;
+import com.vaadin.v7.data.util.filter.Like;
+import com.vaadin.v7.data.util.sqlcontainer.DataGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.OptimisticLockException;
+import com.vaadin.v7.data.util.sqlcontainer.RowItem;
+import com.vaadin.v7.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants;
+import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants.DB;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;
 
 public class TableQueryTest {
     private static final int offset = SQLTestsConstants.offset;
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java
index 8a6ee0aa45..76852c8127 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query;
+package com.vaadin.v7.data.util.sqlcontainer.query;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -21,8 +21,8 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.logging.Logger;
 
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
 
 /**
  * Connection pool for testing SQLContainer. Ensures that only reserved
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/BigDecimalRangeValidatorTest.java
index 3fe6d1f6ff..5547651107 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/BigDecimalRangeValidatorTest.java
@@ -1,21 +1,21 @@
-package com.vaadin.tests.data.validator;
+package com.vaadin.v7.tests.data.validator;
 
 import java.math.BigDecimal;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.v7.data.validator.LegacyBigDecimalRangeValidator;
+import com.vaadin.v7.data.validator.BigDecimalRangeValidator;
 
 public class BigDecimalRangeValidatorTest {
 
-    private LegacyBigDecimalRangeValidator cleanValidator = new LegacyBigDecimalRangeValidator(
+    private BigDecimalRangeValidator cleanValidator = new BigDecimalRangeValidator(
             "no values", null, null);
-    private LegacyBigDecimalRangeValidator minValidator = new LegacyBigDecimalRangeValidator(
+    private BigDecimalRangeValidator minValidator = new BigDecimalRangeValidator(
             "no values", new BigDecimal(10.1), null);
-    private LegacyBigDecimalRangeValidator maxValidator = new LegacyBigDecimalRangeValidator(
+    private BigDecimalRangeValidator maxValidator = new BigDecimalRangeValidator(
             "no values", null, new BigDecimal(100.1));
-    private LegacyBigDecimalRangeValidator minMaxValidator = new LegacyBigDecimalRangeValidator(
+    private BigDecimalRangeValidator minMaxValidator = new BigDecimalRangeValidator(
             "no values", new BigDecimal(10.5), new BigDecimal(100.5));
 
     @Test
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/BigIntegerRangeValidatorTest.java
index c54e868e64..144ca370fa 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/BigIntegerRangeValidatorTest.java
@@ -1,21 +1,21 @@
-package com.vaadin.tests.data.validator;
+package com.vaadin.v7.tests.data.validator;
 
 import java.math.BigInteger;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.v7.data.validator.LegacyBigIntegerRangeValidator;
+import com.vaadin.v7.data.validator.BigIntegerRangeValidator;
 
 public class BigIntegerRangeValidatorTest {
 
-    private LegacyBigIntegerRangeValidator cleanValidator = new LegacyBigIntegerRangeValidator(
+    private BigIntegerRangeValidator cleanValidator = new BigIntegerRangeValidator(
             "no values", null, null);
-    private LegacyBigIntegerRangeValidator minValidator = new LegacyBigIntegerRangeValidator(
+    private BigIntegerRangeValidator minValidator = new BigIntegerRangeValidator(
             "no values", BigInteger.valueOf(10), null);
-    private LegacyBigIntegerRangeValidator maxValidator = new LegacyBigIntegerRangeValidator(
+    private BigIntegerRangeValidator maxValidator = new BigIntegerRangeValidator(
             "no values", null, BigInteger.valueOf(100));
-    private LegacyBigIntegerRangeValidator minMaxValidator = new LegacyBigIntegerRangeValidator(
+    private BigIntegerRangeValidator minMaxValidator = new BigIntegerRangeValidator(
             "no values", BigInteger.valueOf(10), BigInteger.valueOf(100));
 
     @Test
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/ByteRangeValidatorTest.java
index fa6dd8f098..c9bec3ad1a 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/ByteRangeValidatorTest.java
@@ -1,21 +1,21 @@
-package com.vaadin.tests.data.validator;
+package com.vaadin.v7.tests.data.validator;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.v7.data.validator.LegacyByteRangeValidator;
+import com.vaadin.v7.data.validator.ByteRangeValidator;
 
 public class ByteRangeValidatorTest {
 
-    private LegacyByteRangeValidator cleanValidator = new LegacyByteRangeValidator(
+    private ByteRangeValidator cleanValidator = new ByteRangeValidator(
             "no values", null, null);
-    private LegacyByteRangeValidator minValidator = new LegacyByteRangeValidator(
+    private ByteRangeValidator minValidator = new ByteRangeValidator(
             "no values", (byte) 10, null);
-    private LegacyByteRangeValidator maxValidator = new LegacyByteRangeValidator(
+    private ByteRangeValidator maxValidator = new ByteRangeValidator(
             "no values", null, (byte) 100);
-    private LegacyByteRangeValidator minMaxValidator = new LegacyByteRangeValidator(
+    private ByteRangeValidator minMaxValidator = new ByteRangeValidator(
             "no values", (byte) 10, (byte) 100);
 
     @Test
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/CompositeValidatorTest.java
index 2975331e8a..aa86f92091 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/CompositeValidatorTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.data.validator;
+package com.vaadin.v7.tests.data.validator;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -9,19 +9,19 @@ import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.v7.data.Validator;
-import com.vaadin.v7.data.validator.LegacyCompositeValidator;
-import com.vaadin.v7.data.validator.LegacyCompositeValidator.CombinationMode;
-import com.vaadin.v7.data.validator.LegacyEmailValidator;
-import com.vaadin.v7.data.validator.LegacyRegexpValidator;
+import com.vaadin.v7.data.validator.CompositeValidator;
+import com.vaadin.v7.data.validator.CompositeValidator.CombinationMode;
+import com.vaadin.v7.data.validator.EmailValidator;
+import com.vaadin.v7.data.validator.RegexpValidator;
 
 public class CompositeValidatorTest {
 
-    LegacyCompositeValidator and = new LegacyCompositeValidator(
+    CompositeValidator and = new CompositeValidator(
             CombinationMode.AND, "One validator not valid");
-    LegacyCompositeValidator or = new LegacyCompositeValidator(
+    CompositeValidator or = new CompositeValidator(
             CombinationMode.OR, "No validators are valid");
-    LegacyEmailValidator email = new LegacyEmailValidator("Faulty email");
-    LegacyRegexpValidator regex = new LegacyRegexpValidator("@mail.com", false,
+    EmailValidator email = new EmailValidator("Faulty email");
+    RegexpValidator regex = new RegexpValidator("@mail.com", false,
             "Partial match validator error");
 
     @Before
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/DateRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/DateRangeValidatorTest.java
index a0afc9c617..225f344045 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/DateRangeValidatorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/DateRangeValidatorTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.data.validator;
+package com.vaadin.v7.tests.data.validator;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -12,7 +12,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.shared.ui.datefield.Resolution;
-import com.vaadin.v7.data.validator.LegacyDateRangeValidator;
+import com.vaadin.v7.data.validator.DateRangeValidator;
 
 public class DateRangeValidatorTest {
     Calendar startDate = new GregorianCalendar(TimeZone.getTimeZone("GMT"),
@@ -20,24 +20,24 @@ public class DateRangeValidatorTest {
     Calendar endDate = new GregorianCalendar(TimeZone.getTimeZone("GMT"),
             Locale.ENGLISH);
 
-    private LegacyDateRangeValidator cleanValidator;
-    private LegacyDateRangeValidator minValidator;
-    private LegacyDateRangeValidator maxValidator;
-    private LegacyDateRangeValidator minMaxValidator;
+    private DateRangeValidator cleanValidator;
+    private DateRangeValidator minValidator;
+    private DateRangeValidator maxValidator;
+    private DateRangeValidator minMaxValidator;
 
     @Before
     public void setUp() {
         startDate.set(2000, Calendar.JANUARY, 1, 12, 0, 0);
         endDate.set(2000, Calendar.FEBRUARY, 20, 12, 0, 0);
 
-        cleanValidator = new LegacyDateRangeValidator(
+        cleanValidator = new DateRangeValidator(
                 "Given date outside range", null, null, Resolution.DAY);
-        minValidator = new LegacyDateRangeValidator(
+        minValidator = new DateRangeValidator(
                 "Given date before startDate", startDate.getTime(), null,
                 Resolution.DAY);
-        maxValidator = new LegacyDateRangeValidator("Given date after endDate",
+        maxValidator = new DateRangeValidator("Given date after endDate",
                 null, endDate.getTime(), Resolution.DAY);
-        minMaxValidator = new LegacyDateRangeValidator(
+        minMaxValidator = new DateRangeValidator(
                 "Given date outside range", startDate.getTime(),
                 endDate.getTime(), Resolution.DAY);
     }
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/DoubleRangeValidatorTest.java
index ec3a34bfa6..146ee3ba39 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/DoubleRangeValidatorTest.java
@@ -1,21 +1,21 @@
-package com.vaadin.tests.data.validator;
+package com.vaadin.v7.tests.data.validator;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.v7.data.validator.LegacyDoubleRangeValidator;
+import com.vaadin.v7.data.validator.DoubleRangeValidator;
 
 public class DoubleRangeValidatorTest {
 
-    private LegacyDoubleRangeValidator cleanValidator = new LegacyDoubleRangeValidator(
+    private DoubleRangeValidator cleanValidator = new DoubleRangeValidator(
             "no values", null, null);
-    private LegacyDoubleRangeValidator minValidator = new LegacyDoubleRangeValidator(
+    private DoubleRangeValidator minValidator = new DoubleRangeValidator(
             "no values", 10.1, null);
-    private LegacyDoubleRangeValidator maxValidator = new LegacyDoubleRangeValidator(
+    private DoubleRangeValidator maxValidator = new DoubleRangeValidator(
             "no values", null, 100.1);
-    private LegacyDoubleRangeValidator minMaxValidator = new LegacyDoubleRangeValidator(
+    private DoubleRangeValidator minMaxValidator = new DoubleRangeValidator(
             "no values", 10.5, 100.5);
 
     @Test
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/EmailValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/EmailValidatorTest.java
index 92eef3d4b8..b8f8109028 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/EmailValidatorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/EmailValidatorTest.java
@@ -1,13 +1,13 @@
-package com.vaadin.tests.data.validator;
+package com.vaadin.v7.tests.data.validator;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.v7.data.validator.LegacyEmailValidator;
+import com.vaadin.v7.data.validator.EmailValidator;
 
 public class EmailValidatorTest {
 
-    private LegacyEmailValidator validator = new LegacyEmailValidator("Error");
+    private EmailValidator validator = new EmailValidator("Error");
 
     @Test
     public void testEmailValidatorWithNull() {
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/FloatRangeValidatorTest.java
index 36bd41864c..b0fa43a92d 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/FloatRangeValidatorTest.java
@@ -1,21 +1,21 @@
-package com.vaadin.tests.data.validator;
+package com.vaadin.v7.tests.data.validator;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.v7.data.validator.LegacyFloatRangeValidator;
+import com.vaadin.v7.data.validator.FloatRangeValidator;
 
 public class FloatRangeValidatorTest {
 
-    private LegacyFloatRangeValidator cleanValidator = new LegacyFloatRangeValidator(
+    private FloatRangeValidator cleanValidator = new FloatRangeValidator(
             "no values", null, null);
-    private LegacyFloatRangeValidator minValidator = new LegacyFloatRangeValidator(
+    private FloatRangeValidator minValidator = new FloatRangeValidator(
             "no values", 10.1f, null);
-    private LegacyFloatRangeValidator maxValidator = new LegacyFloatRangeValidator(
+    private FloatRangeValidator maxValidator = new FloatRangeValidator(
             "no values", null, 100.1f);
-    private LegacyFloatRangeValidator minMaxValidator = new LegacyFloatRangeValidator(
+    private FloatRangeValidator minMaxValidator = new FloatRangeValidator(
             "no values", 10.5f, 100.5f);
 
     @Test
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/IntegerRangeValidatorTest.java
index 595d5f4ab8..5e6c09fd5f 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/IntegerRangeValidatorTest.java
@@ -1,21 +1,21 @@
-package com.vaadin.tests.data.validator;
+package com.vaadin.v7.tests.data.validator;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator;
+import com.vaadin.v7.data.validator.IntegerRangeValidator;
 
 public class IntegerRangeValidatorTest {
 
-    private LegacyIntegerRangeValidator cleanValidator = new LegacyIntegerRangeValidator(
+    private IntegerRangeValidator cleanValidator = new IntegerRangeValidator(
             "no values", null, null);
-    private LegacyIntegerRangeValidator minValidator = new LegacyIntegerRangeValidator(
+    private IntegerRangeValidator minValidator = new IntegerRangeValidator(
             "no values", 10, null);
-    private LegacyIntegerRangeValidator maxValidator = new LegacyIntegerRangeValidator(
+    private IntegerRangeValidator maxValidator = new IntegerRangeValidator(
             "no values", null, 100);
-    private LegacyIntegerRangeValidator minMaxValidator = new LegacyIntegerRangeValidator(
+    private IntegerRangeValidator minMaxValidator = new IntegerRangeValidator(
             "no values", 10, 100);
 
     @Test
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/LongRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/LongRangeValidatorTest.java
index 6ecd21984c..d6d03d67e6 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/LongRangeValidatorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/LongRangeValidatorTest.java
@@ -1,21 +1,21 @@
-package com.vaadin.tests.data.validator;
+package com.vaadin.v7.tests.data.validator;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.v7.data.validator.LegacyLongRangeValidator;
+import com.vaadin.v7.data.validator.LongRangeValidator;
 
 public class LongRangeValidatorTest {
 
-    private LegacyLongRangeValidator cleanValidator = new LegacyLongRangeValidator(
+    private LongRangeValidator cleanValidator = new LongRangeValidator(
             "no values", null, null);
-    private LegacyLongRangeValidator minValidator = new LegacyLongRangeValidator(
+    private LongRangeValidator minValidator = new LongRangeValidator(
             "no values", 10l, null);
-    private LegacyLongRangeValidator maxValidator = new LegacyLongRangeValidator(
+    private LongRangeValidator maxValidator = new LongRangeValidator(
             "no values", null, 100l);
-    private LegacyLongRangeValidator minMaxValidator = new LegacyLongRangeValidator(
+    private LongRangeValidator minMaxValidator = new LongRangeValidator(
             "no values", 10l, 100l);
 
     @Test
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/NullValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/NullValidatorTest.java
index 6e43b30cdf..90b6efd610 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/NullValidatorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/NullValidatorTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.data.validator;
+package com.vaadin.v7.tests.data.validator;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -6,13 +6,13 @@ import static org.junit.Assert.fail;
 import org.junit.Test;
 
 import com.vaadin.v7.data.Validator;
-import com.vaadin.v7.data.validator.LegacyNullValidator;
+import com.vaadin.v7.data.validator.NullValidator;
 
 public class NullValidatorTest {
 
-    LegacyNullValidator notNull = new LegacyNullValidator("Null not accepted",
+    NullValidator notNull = new NullValidator("Null not accepted",
             false);
-    LegacyNullValidator onlyNull = new LegacyNullValidator("Only null accepted",
+    NullValidator onlyNull = new NullValidator("Only null accepted",
             true);
 
     @Test
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/RegexpValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/RegexpValidatorTest.java
index 1768999969..f08916258e 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/RegexpValidatorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/RegexpValidatorTest.java
@@ -1,17 +1,17 @@
-package com.vaadin.tests.data.validator;
+package com.vaadin.v7.tests.data.validator;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.v7.data.validator.LegacyRegexpValidator;
+import com.vaadin.v7.data.validator.RegexpValidator;
 
 public class RegexpValidatorTest {
 
-    private LegacyRegexpValidator completeValidator = new LegacyRegexpValidator(
+    private RegexpValidator completeValidator = new RegexpValidator(
             "pattern", true, "Complete match validator error");
-    private LegacyRegexpValidator partialValidator = new LegacyRegexpValidator(
+    private RegexpValidator partialValidator = new RegexpValidator(
             "pattern", false, "Partial match validator error");
 
     @Test
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/ShortRangeValidatorTest.java
index 41c3e67942..4b42f9fba8 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/ShortRangeValidatorTest.java
@@ -1,21 +1,21 @@
-package com.vaadin.tests.data.validator;
+package com.vaadin.v7.tests.data.validator;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.v7.data.validator.LegacyShortRangeValidator;
+import com.vaadin.v7.data.validator.ShortRangeValidator;
 
 public class ShortRangeValidatorTest {
 
-    private LegacyShortRangeValidator cleanValidator = new LegacyShortRangeValidator(
+    private ShortRangeValidator cleanValidator = new ShortRangeValidator(
             "no values", null, null);
-    private LegacyShortRangeValidator minValidator = new LegacyShortRangeValidator(
+    private ShortRangeValidator minValidator = new ShortRangeValidator(
             "no values", (short) 10, null);
-    private LegacyShortRangeValidator maxValidator = new LegacyShortRangeValidator(
+    private ShortRangeValidator maxValidator = new ShortRangeValidator(
             "no values", null, (short) 100);
-    private LegacyShortRangeValidator minMaxValidator = new LegacyShortRangeValidator(
+    private ShortRangeValidator minMaxValidator = new ShortRangeValidator(
             "no values", (short) 10, (short) 100);
 
     @Test
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/StringLengthValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/StringLengthValidatorTest.java
index e24e8fcd5d..e00f540c0f 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/StringLengthValidatorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/StringLengthValidatorTest.java
@@ -1,21 +1,21 @@
-package com.vaadin.tests.data.validator;
+package com.vaadin.v7.tests.data.validator;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.v7.data.validator.LegacyStringLengthValidator;
+import com.vaadin.v7.data.validator.StringLengthValidator;
 
 public class StringLengthValidatorTest {
 
-    private LegacyStringLengthValidator validator = new LegacyStringLengthValidator(
+    private StringLengthValidator validator = new StringLengthValidator(
             "Error");
-    private LegacyStringLengthValidator validatorNoNull = new LegacyStringLengthValidator(
+    private StringLengthValidator validatorNoNull = new StringLengthValidator(
             "Error", 1, 5, false);
-    private LegacyStringLengthValidator validatorMinValue = new LegacyStringLengthValidator(
+    private StringLengthValidator validatorMinValue = new StringLengthValidator(
             "Error", 5, null, true);
-    private LegacyStringLengthValidator validatorMaxValue = new LegacyStringLengthValidator(
+    private StringLengthValidator validatorMaxValue = new StringLengthValidator(
             "Error", null, 15, true);
 
     @Test
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/design/ParseAllSupportedComponentsTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/design/ParseAllSupportedComponentsTest.java
index 6694372539..8e6a87add6 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/design/ParseAllSupportedComponentsTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/design/ParseAllSupportedComponentsTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.design;
+package com.vaadin.v7.tests.design;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/design/ParseLegacyPrefixTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/design/ParseLegacyPrefixTest.java
index 5dd21b35f8..7884cdfa7a 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/design/ParseLegacyPrefixTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/design/ParseLegacyPrefixTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.design;
+package com.vaadin.v7.tests.design;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/design/WriteLegacyDesignTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/design/WriteLegacyDesignTest.java
index eb3841b094..046b365601 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/design/WriteLegacyDesignTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/design/WriteLegacyDesignTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.design;
+package com.vaadin.v7.tests.design;
 
 import static org.junit.Assert.assertTrue;
 
@@ -88,7 +88,7 @@ public class WriteLegacyDesignTest {
 
     private void checkNode(Node node) {
         if (node instanceof Element) {
-            assertTrue("Wrong design element prefix",
+            assertTrue("Expected " + node.nodeName() + " to start with v-",
                     node.nodeName().startsWith("v-"));
             for (Node child : node.childNodes()) {
                 checkNode(child);
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/AbstractBeanContainerListenersTest.java
index 98a2513515..5e5954e662 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/AbstractBeanContainerListenersTest.java
@@ -1,9 +1,9 @@
-package com.vaadin.tests.server;
+package com.vaadin.v7.tests.server;
 
-import com.vaadin.data.Container.PropertySetChangeEvent;
-import com.vaadin.data.Container.PropertySetChangeListener;
-import com.vaadin.data.util.BeanItemContainer;
 import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
+import com.vaadin.v7.data.Container.PropertySetChangeEvent;
+import com.vaadin.v7.data.Container.PropertySetChangeListener;
+import com.vaadin.v7.data.util.BeanItemContainer;
 
 public class AbstractBeanContainerListenersTest
         extends AbstractListenerMethodsTestBase {
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractContainerListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/AbstractContainerListenersTest.java
index 5e0d464fe8..4aaba36733 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractContainerListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/AbstractContainerListenersTest.java
@@ -1,13 +1,13 @@
-package com.vaadin.tests.server;
+package com.vaadin.v7.tests.server;
 
 import org.junit.Test;
 
-import com.vaadin.data.Container.ItemSetChangeEvent;
-import com.vaadin.data.Container.ItemSetChangeListener;
-import com.vaadin.data.Container.PropertySetChangeEvent;
-import com.vaadin.data.Container.PropertySetChangeListener;
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
+import com.vaadin.v7.data.Container.ItemSetChangeEvent;
+import com.vaadin.v7.data.Container.ItemSetChangeListener;
+import com.vaadin.v7.data.Container.PropertySetChangeEvent;
+import com.vaadin.v7.data.Container.PropertySetChangeListener;
+import com.vaadin.v7.data.util.IndexedContainer;
 
 public class AbstractContainerListenersTest
         extends AbstractListenerMethodsTestBase {
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/AbstractInMemoryContainerListenersTest.java
index d5a7131182..462ec7ff68 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/AbstractInMemoryContainerListenersTest.java
@@ -1,9 +1,9 @@
-package com.vaadin.tests.server;
+package com.vaadin.v7.tests.server;
 
-import com.vaadin.data.Container.ItemSetChangeEvent;
-import com.vaadin.data.Container.ItemSetChangeListener;
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
+import com.vaadin.v7.data.Container.ItemSetChangeEvent;
+import com.vaadin.v7.data.Container.ItemSetChangeListener;
+import com.vaadin.v7.data.util.IndexedContainer;
 
 public class AbstractInMemoryContainerListenersTest
         extends AbstractListenerMethodsTestBase {
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/ContextClickListenerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/ContextClickListenerTest.java
index 1b93a3063d..df833b0cba 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/ContextClickListenerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/ContextClickListenerTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server;
+package com.vaadin.v7.tests.server;
 
 import java.util.EventObject;
 
@@ -24,8 +24,8 @@ import org.junit.Test;
 import com.vaadin.event.ContextClickEvent;
 import com.vaadin.event.ContextClickEvent.ContextClickListener;
 import com.vaadin.ui.AbstractComponent;
-import com.vaadin.ui.LegacyGrid.GridContextClickEvent;
-import com.vaadin.ui.Table.TableContextClickEvent;
+import com.vaadin.v7.ui.Grid.GridContextClickEvent;
+import com.vaadin.v7.ui.Table.TableContextClickEvent;
 
 /**
  * Server-side unit tests to see that context click events are sent to listeners
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/IndexedContainerListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/IndexedContainerListenersTest.java
index d8a1290b68..33339ce2c9 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/IndexedContainerListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/IndexedContainerListenersTest.java
@@ -1,13 +1,13 @@
-package com.vaadin.tests.server;
+package com.vaadin.v7.tests.server;
 
 import org.junit.Test;
 
-import com.vaadin.data.Container.PropertySetChangeEvent;
-import com.vaadin.data.Container.PropertySetChangeListener;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
+import com.vaadin.v7.data.Container.PropertySetChangeEvent;
+import com.vaadin.v7.data.Container.PropertySetChangeListener;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.IndexedContainer;
 
 public class IndexedContainerListenersTest
         extends AbstractListenerMethodsTestBase {
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/SerializationTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/SerializationTest.java
index 30b0729ace..cb1a6cc0d6 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/SerializationTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/SerializationTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server;
+package com.vaadin.v7.tests.server;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -11,21 +11,21 @@ import java.io.Serializable;
 
 import org.junit.Test;
 
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.data.util.MethodProperty;
 import com.vaadin.server.VaadinSession;
-import com.vaadin.v7.data.validator.LegacyRegexpValidator;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.data.util.MethodProperty;
+import com.vaadin.v7.data.validator.RegexpValidator;
 
 public class SerializationTest {
 
     @Test
     public void testValidators() throws Exception {
-        LegacyRegexpValidator validator = new LegacyRegexpValidator(".*",
+        RegexpValidator validator = new RegexpValidator(".*",
                 "Error");
         validator.validate("aaa");
-        LegacyRegexpValidator validator2 = serializeAndDeserialize(validator);
+        RegexpValidator validator2 = serializeAndDeserialize(validator);
         validator2.validate("aaa");
     }
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractfield/LegacyAbstractFieldListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbstractFieldListenersTest.java
index 5843bd901f..f284229e28 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractfield/LegacyAbstractFieldListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbstractFieldListenersTest.java
@@ -1,15 +1,15 @@
-package com.vaadin.tests.server.component.abstractfield;
+package com.vaadin.v7.tests.server.component.abstractfield;
 
 import org.junit.Test;
 
-import com.vaadin.data.Property.ReadOnlyStatusChangeEvent;
-import com.vaadin.data.Property.ReadOnlyStatusChangeListener;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Property.ReadOnlyStatusChangeEvent;
+import com.vaadin.v7.data.Property.ReadOnlyStatusChangeListener;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.Table;
 
-public class LegacyAbstractFieldListenersTest
+public class AbstractFieldListenersTest
         extends AbstractListenerMethodsTestBase {
 
     @Test
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java
index 9a8777909f..6b0315a845 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.abstractselect;
+package com.vaadin.v7.tests.server.component.abstractselect;
 
 import org.jsoup.nodes.Attributes;
 import org.jsoup.nodes.Element;
@@ -21,18 +21,18 @@ import org.jsoup.parser.Tag;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.Resource;
 import com.vaadin.tests.design.DeclarativeTestBase;
 import com.vaadin.tests.design.DeclarativeTestBaseBase;
-import com.vaadin.ui.AbstractSelect;
-import com.vaadin.ui.AbstractSelect.ItemCaptionMode;
-import com.vaadin.ui.ComboBox;
-import com.vaadin.ui.ListSelect;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignException;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.AbstractSelect;
+import com.vaadin.v7.ui.AbstractSelect.ItemCaptionMode;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.ListSelect;
 
 /**
  * Test cases for reading the properties of selection components.
@@ -43,7 +43,7 @@ public class AbstractSelectDeclarativeTest
         extends DeclarativeTestBase<AbstractSelect> {
 
     public String getDesignSingleSelectNewItemsAllowed() {
-        return "<vaadin-combo-box new-items-allowed item-caption-mode='icon_only'"
+        return "<vaadin7-combo-box new-items-allowed item-caption-mode='icon_only'"
                 + " null-selection-item-id='nullIid'/>";
 
     }
@@ -58,7 +58,7 @@ public class AbstractSelectDeclarativeTest
     }
 
     public String getDesignMultiSelect() {
-        return "<vaadin-list-select multi-select null-selection-allowed='false' new-items-allowed item-caption-mode='property' />";
+        return "<vaadin7-list-select multi-select null-selection-allowed='false' new-items-allowed item-caption-mode='property' />";
     }
 
     public AbstractSelect getExpectedMultiSelect() {
@@ -99,8 +99,8 @@ public class AbstractSelectDeclarativeTest
 
     @Test(expected = DesignException.class)
     public void testReadMultipleValuesForSingleSelect() {
-        testRead("<vaadin-list-select>" + "<option selected>1</option>"
-                + "<option selected>2</option>" + "</vaadin-list-select>",
+        testRead("<vaadin7-list-select>" + "<option selected>1</option>"
+                + "<option selected>2</option>" + "</vaadin7-list-select>",
                 null);
     }
 
@@ -112,9 +112,9 @@ public class AbstractSelectDeclarativeTest
         ls.addItem("2");
         ls.select("1");
         ls.select("2");
-        testRead("<vaadin-list-select multi-select>"
+        testRead("<vaadin7-list-select multi-select>"
                 + "<option selected>1</option>" + "<option selected>2</option>"
-                + "</vaadin-list-select>", ls);
+                + "</vaadin7-list-select>", ls);
     }
 
     @Test
@@ -124,9 +124,9 @@ public class AbstractSelectDeclarativeTest
         ls.addItem("1");
         ls.addItem("2");
         ls.select("1");
-        testRead("<vaadin-list-select multi-select>"
+        testRead("<vaadin7-list-select multi-select>"
                 + "<option selected>1</option>" + "<option>2</option>"
-                + "</vaadin-list-select>", ls);
+                + "</vaadin7-list-select>", ls);
     }
 
     @Test
@@ -136,8 +136,8 @@ public class AbstractSelectDeclarativeTest
         ls.addItem("1");
         ls.addItem("2");
         ls.select("1");
-        testRead("<vaadin-list-select>" + "<option selected>1</option>"
-                + "<option>2</option>" + "</vaadin-list-select>", ls);
+        testRead("<vaadin7-list-select>" + "<option selected>1</option>"
+                + "<option>2</option>" + "</vaadin7-list-select>", ls);
     }
 
     @Test
@@ -154,10 +154,10 @@ public class AbstractSelectDeclarativeTest
     }
 
     private String getDesignForInlineData() {
-        return "<vaadin-list-select>\n"
+        return "<vaadin7-list-select>\n"
                 + "        <option icon='http://some.url/icon.png'>Value 1</option>\n" //
                 + "        <option selected>Value 2</option>\n"//
-                + "</vaadin-list-select>";
+                + "</vaadin7-list-select>";
     }
 
     private AbstractSelect getExpectedComponentForInlineData() {
@@ -262,9 +262,9 @@ public class AbstractSelectDeclarativeTest
 
     @Test
     public void testHtmlEntities() {
-        String design = "<vaadin-combo-box>"
+        String design = "<vaadin7-combo-box>"
                 + "  <option item-id=\"one\">&gt; One</option>"
-                + "  <option>&gt; Two</option>" + "</vaadin-combo-box>";
+                + "  <option>&gt; Two</option>" + "</vaadin7-combo-box>";
         AbstractSelect read = read(design);
 
         Assert.assertEquals("> One", read.getItemCaption("one"));
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectListenersTest.java
index 7fc584e3d5..7d90cda572 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectListenersTest.java
@@ -1,13 +1,13 @@
-package com.vaadin.tests.server.component.abstractselect;
+package com.vaadin.v7.tests.server.component.abstractselect;
 
 import org.junit.Test;
 
-import com.vaadin.data.Container.ItemSetChangeEvent;
-import com.vaadin.data.Container.ItemSetChangeListener;
-import com.vaadin.data.Container.PropertySetChangeEvent;
-import com.vaadin.data.Container.PropertySetChangeListener;
 import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.data.Container.ItemSetChangeEvent;
+import com.vaadin.v7.data.Container.ItemSetChangeListener;
+import com.vaadin.v7.data.Container.PropertySetChangeEvent;
+import com.vaadin.v7.data.Container.PropertySetChangeListener;
+import com.vaadin.v7.ui.ComboBox;
 
 public class AbstractSelectListenersTest
         extends AbstractListenerMethodsTestBase {
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectStateTest.java
index c5ff297d7b..cc1c9f8d27 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectStateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectStateTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.abstractselect;
+package com.vaadin.v7.tests.server.component.abstractselect;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.shared.ui.select.AbstractSelectState;
-import com.vaadin.ui.AbstractSelect;
+import com.vaadin.v7.ui.AbstractSelect;
 
 /**
  * Tests for AbstractSelect state
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java
index 8bd253ab64..c4aab7d506 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.abstractselect;
+package com.vaadin.v7.tests.server.component.abstractselect;
 
 import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.design.DeclarativeTestBase;
-import com.vaadin.ui.OptionGroup;
+import com.vaadin.v7.ui.OptionGroup;
 
 public class OptionGroupDeclarativeTest
         extends DeclarativeTestBase<OptionGroup> {
@@ -35,7 +35,7 @@ public class OptionGroupDeclarativeTest
     @Test
     public void testBasicSyntax() {
 
-        String expected = "<vaadin-option-group />";
+        String expected = "<vaadin7-option-group />";
         testReadWrite(expected);
 
     }
@@ -47,12 +47,12 @@ public class OptionGroupDeclarativeTest
 
         //@formatter:off
         String expected = 
-                "<vaadin-option-group>"
+                "<vaadin7-option-group>"
                 + "<option>foo</option>"
                 + "<option>bar</option>"
                 + "<option>baz</option>"
                 + "<option>bang</option>"
-                + "</vaadin-option-group>";
+                + "</vaadin7-option-group>";
         //@formatter:on
 
         testReadWrite(expected);
@@ -67,12 +67,12 @@ public class OptionGroupDeclarativeTest
 
         //@formatter:off
         String expected = 
-                "<vaadin-option-group>"
+                "<vaadin7-option-group>"
                 + "<option>foo</option>"
                 + "<option>bar</option>"
                 + "<option disabled>baz</option>"
                 + "<option>bang</option>"
-                + "</vaadin-option-group>";
+                + "</vaadin7-option-group>";
         //@formatter:on
 
         testReadWrite(expected);
@@ -87,12 +87,12 @@ public class OptionGroupDeclarativeTest
 
         //@formatter:off
         String expected = 
-                "<vaadin-option-group>"
+                "<vaadin7-option-group>"
                 + "<option>foo</option>"
                 + "<option icon='theme://foobar.png'>bar</option>"
                 + "<option>baz</option>"
                 + "<option>bang</option>"
-                + "</vaadin-option-group>";
+                + "</vaadin7-option-group>";
         //@formatter:on
 
         testReadWrite(expected);
@@ -111,12 +111,12 @@ public class OptionGroupDeclarativeTest
 
         //@formatter:off
         String expected = 
-                "<vaadin-option-group html-content-allowed>"
+                "<vaadin7-option-group html-content-allowed>"
                 + "<option item-id=\"foo\"><b>True</b></option>"
                 + "<option item-id=\"bar\"><font color='red'>False</font></option>"
                 + "<option>baz</option>"
                 + "<option>bang</option>"
-                + "</vaadin-option-group>";
+                + "</vaadin7-option-group>";
         //@formatter:on
 
         testReadWrite(expected);
@@ -132,12 +132,12 @@ public class OptionGroupDeclarativeTest
 
         //@formatter:off
         String expected =
-                "<vaadin-option-group>"
+                "<vaadin7-option-group>"
                 + "<option item-id=\"foo\">&lt;b&gt;True&lt;/b&gt;</option>"
                 + "<option item-id=\"bar\">&lt;font color=\"red\"&gt;False&lt;/font&gt;</option>"
                 + "<option>baz</option>"
                 + "<option>bang</option>"
-                + "</vaadin-option-group>";
+                + "</vaadin7-option-group>";
         //@formatter:on
 
         testReadWrite(expected);
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/OptionGroupTest.java
index 9a20d2fd79..b4081e659d 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/OptionGroupTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.component.abstractselect;
+package com.vaadin.v7.tests.server.component.abstractselect;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -8,7 +8,7 @@ import java.util.Collection;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.ui.OptionGroup;
+import com.vaadin.v7.ui.OptionGroup;
 
 public class OptionGroupTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/calendar/CalendarBasicsTest.java
index 7d011afc8b..8939dc91c8 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/calendar/CalendarBasicsTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.calendar;
+package com.vaadin.v7.tests.server.component.calendar;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -27,16 +27,16 @@ import java.util.TimeZone;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.ui.Calendar;
-import com.vaadin.ui.Calendar.TimeFormat;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.BackwardEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResize;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.ForwardEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.MoveEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.WeekClick;
-import com.vaadin.ui.components.calendar.event.BasicEventProvider;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.Calendar.TimeFormat;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.DateClickEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResize;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.MoveEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.WeekClick;
+import com.vaadin.v7.ui.components.calendar.event.BasicEventProvider;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider;
 
 /**
  * Basic API tests for the calendar
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/calendar/CalendarDeclarativeTest.java
index f6896ff15d..604774710a 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/calendar/CalendarDeclarativeTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.calendar;
+package com.vaadin.v7.tests.server.component.calendar;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -23,20 +23,20 @@ import java.util.TimeZone;
 import org.junit.Test;
 
 import com.vaadin.tests.design.DeclarativeTestBase;
-import com.vaadin.ui.Calendar;
-import com.vaadin.ui.Calendar.TimeFormat;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.Calendar.TimeFormat;
 
 public class CalendarDeclarativeTest extends DeclarativeTestBase<Calendar> {
 
     @Test
     public void testEmpty() {
-        verifyDeclarativeDesign("<vaadin-calendar></vaadin-calendar>",
+        verifyDeclarativeDesign("<vaadin7-calendar></vaadin7-calendar>",
                 new Calendar());
     }
 
     @Test
     public void testCalendarAllFeatures() throws ParseException {
-        String design = "<vaadin-calendar start-date='2014-11-17' end-date='2014-11-23' "
+        String design = "<vaadin7-calendar start-date='2014-11-17' end-date='2014-11-23' "
                 + "first-visible-day-of-week=2 last-visible-day-of-week=5 "
                 + "time-zone='EST' time-format='12h' first-visible-hour-of-day=8 "
                 + "last-visible-hour-of-day=18 weekly-caption-format='mmm MM/dd' />";
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/calendar/ContainerDataSourceTest.java
index 9cc78269f8..311cb8f6cc 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/calendar/ContainerDataSourceTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.calendar;
+package com.vaadin.v7.tests.server.component.calendar;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -24,16 +24,16 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Container.Indexed;
-import com.vaadin.data.Container.Sortable;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.BeanItemContainer;
-import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.ui.Calendar;
-import com.vaadin.ui.components.calendar.ContainerEventProvider;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.data.Container.Indexed;
+import com.vaadin.v7.data.Container.Sortable;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.components.calendar.ContainerEventProvider;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
 
 public class ContainerDataSourceTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerEventProviderTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/calendar/ContainerEventProviderTest.java
index 401b5861ce..84ab1edaa2 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerEventProviderTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/calendar/ContainerEventProviderTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.calendar;
+package com.vaadin.v7.tests.server.component.calendar;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -22,9 +22,9 @@ import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.util.BeanItemContainer;
-import com.vaadin.ui.components.calendar.ContainerEventProvider;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.components.calendar.ContainerEventProvider;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
 
 /**
  *
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java
index 2e3b8e412e..cd72febc0f 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java
@@ -13,23 +13,23 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.colorpicker;
+package com.vaadin.v7.tests.server.component.colorpicker;
 
 import org.junit.Test;
 
 import com.vaadin.shared.ui.colorpicker.Color;
 import com.vaadin.tests.design.DeclarativeTestBase;
-import com.vaadin.ui.AbstractColorPicker;
-import com.vaadin.ui.AbstractColorPicker.PopupStyle;
-import com.vaadin.ui.ColorPicker;
-import com.vaadin.ui.ColorPickerArea;
+import com.vaadin.v7.ui.AbstractColorPicker;
+import com.vaadin.v7.ui.AbstractColorPicker.PopupStyle;
+import com.vaadin.v7.ui.ColorPicker;
+import com.vaadin.v7.ui.ColorPickerArea;
 
 public class AbstractColorPickerDeclarativeTest
         extends DeclarativeTestBase<AbstractColorPicker> {
 
     @Test
     public void testAllAbstractColorPickerFeatures() {
-        String design = "<vaadin-color-picker color='#fafafa' default-caption-enabled position='100,100'"
+        String design = "<vaadin7-color-picker color='#fafafa' default-caption-enabled position='100,100'"
                 + " popup-style='simple' rgb-visibility='false' hsv-visibility='false'"
                 + " history-visibility=false textfield-visibility=false />";
         ColorPicker colorPicker = new ColorPicker();
@@ -50,7 +50,7 @@ public class AbstractColorPickerDeclarativeTest
 
     @Test
     public void testEmptyColorPicker() {
-        String design = "<vaadin-color-picker />";
+        String design = "<vaadin7-color-picker />";
         ColorPicker colorPicker = new ColorPicker();
         testRead(design, colorPicker);
         testWrite(design, colorPicker);
@@ -58,7 +58,7 @@ public class AbstractColorPickerDeclarativeTest
 
     @Test
     public void testAllAbstractColorPickerAreaFeatures() {
-        String design = "<vaadin-color-picker-area color='#fafafa' default-caption-enabled position='100,100'"
+        String design = "<vaadin7-color-picker-area color='#fafafa' default-caption-enabled position='100,100'"
                 + " popup-style='simple' rgb-visibility='false' hsv-visibility='false'"
                 + " history-visibility=false textfield-visibility=false />";
         AbstractColorPicker colorPicker = new ColorPickerArea();
@@ -79,7 +79,7 @@ public class AbstractColorPickerDeclarativeTest
 
     @Test
     public void testEmptyColorPickerArea() {
-        String design = "<vaadin-color-picker-area />";
+        String design = "<vaadin7-color-picker-area />";
         AbstractColorPicker colorPicker = new ColorPickerArea();
         testRead(design, colorPicker);
         testWrite(design, colorPicker);
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorConversionsTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/colorpicker/ColorConversionsTest.java
index a55ed89691..7865be46da 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorConversionsTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/colorpicker/ColorConversionsTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.colorpicker;
+package com.vaadin.v7.tests.server.component.colorpicker;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxDeclarativeTest.java
index 482267f63d..09dc1378e9 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxDeclarativeTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.combobox;
+package com.vaadin.v7.tests.server.component.combobox;
 
 import org.junit.Test;
 
 import com.vaadin.shared.ui.combobox.FilteringMode;
 import com.vaadin.tests.design.DeclarativeTestBase;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
 
 public class ComboBoxDeclarativeTest extends DeclarativeTestBase<ComboBox> {
 
@@ -38,7 +38,7 @@ public class ComboBoxDeclarativeTest extends DeclarativeTestBase<ComboBox> {
     }
 
     private String getReadOnlyWithOptionsDesign() {
-        return "<vaadin-combo-box text-input-allowed='false'><option>Hello</option><option>World</option></vaadin-combo-box>";
+        return "<vaadin7-combo-box text-input-allowed='false'><option>Hello</option><option>World</option></vaadin7-combo-box>";
     }
 
     @Test
@@ -59,7 +59,7 @@ public class ComboBoxDeclarativeTest extends DeclarativeTestBase<ComboBox> {
 
     @Test
     public void testReadOnlyValue() {
-        String design = "<vaadin-combo-box readonly value='foo'><option selected>foo</option></vaadin-combo-box>";
+        String design = "<vaadin7-combo-box readonly value='foo'><option selected>foo</option></vaadin7-combo-box>";
 
         ComboBox comboBox = new ComboBox();
         comboBox.addItems("foo", "bar");
@@ -69,12 +69,12 @@ public class ComboBoxDeclarativeTest extends DeclarativeTestBase<ComboBox> {
         testRead(design, comboBox);
 
         // Selects items are not written out by default
-        String design2 = "<vaadin-combo-box readonly></vaadin-combo-box>";
+        String design2 = "<vaadin7-combo-box readonly></vaadin7-combo-box>";
         testWrite(design2, comboBox);
     }
 
     private String getBasicDesign() {
-        return "<vaadin-combo-box input-prompt=\"Select something\" filtering-mode=\"off\" scroll-to-selected-item='false'>";
+        return "<vaadin7-combo-box input-prompt=\"Select something\" filtering-mode=\"off\" scroll-to-selected-item='false'>";
     }
 
     private ComboBox getBasicExpected() {
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxStateTest.java
index e8ca64895a..1e0233f76a 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxStateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxStateTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.combobox;
+package com.vaadin.v7.tests.server.component.combobox;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.shared.ui.combobox.ComboBoxState;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
 
 /**
  * Tests for ComboBox state.
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/DateFieldConverterTest.java
index 5b4e8c7352..a5166f9373 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/DateFieldConverterTest.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.tests.server.component.datefield;
+package com.vaadin.v7.tests.server.component.datefield;
 
 import java.util.Date;
 import java.util.Locale;
@@ -22,23 +22,23 @@ import java.util.Locale;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Property;
-import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.shared.ui.datefield.Resolution;
-import com.vaadin.v7.data.util.converter.LegacyConverter;
-import com.vaadin.v7.ui.LegacyDateField;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.data.util.converter.Converter;
+import com.vaadin.v7.ui.DateField;
 
 public class DateFieldConverterTest {
 
     private Property<Long> date;
-    private LegacyDateField datefield;
+    private DateField datefield;
 
     @Before
     public void setUp() {
         date = new ObjectProperty<Long>(0L);
-        datefield = new LegacyDateField();
+        datefield = new DateField();
         datefield.setBuffered(false);
-        datefield.setConverter(new LegacyConverter<Date, Long>() {
+        datefield.setConverter(new Converter<Date, Long>() {
 
             @Override
             public Long convertToModel(Date value,
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java
index 3ac1b6af32..e001a3327f 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.datefield;
+package com.vaadin.v7.tests.server.component.datefield;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -23,23 +23,23 @@ import org.junit.Test;
 
 import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.design.DeclarativeTestBase;
-import com.vaadin.v7.ui.LegacyDateField;
+import com.vaadin.v7.ui.DateField;
 
 /**
- * Tests the declarative support for implementations of {@link LegacyDateField}.
+ * Tests the declarative support for implementations of {@link DateField}.
  *
  * @author Vaadin Ltd
  * @since 7.4
  */
 public class LegacyDateFieldDeclarativeTest
-        extends DeclarativeTestBase<LegacyDateField> {
+        extends DeclarativeTestBase<DateField> {
 
     private String getYearResolutionDesign() {
-        return "<vaadin7-legacy-date-field resolution='year' value='2020'/>";
+        return "<vaadin7-date-field resolution='year' value='2020'/>";
     }
 
-    private LegacyDateField getYearResolutionExpected() {
-        LegacyDateField df = new LegacyDateField();
+    private DateField getYearResolutionExpected() {
+        DateField df = new DateField();
         df.setResolution(Resolution.YEAR);
         df.setValue(new Date(2020 - 1900, 1 - 1, 1));
         return df;
@@ -48,12 +48,12 @@ public class LegacyDateFieldDeclarativeTest
     private String getTimezoneDesign() {
         String timeZone = new SimpleDateFormat("Z").format(new Date());
         return String.format(
-                "<vaadin7-legacy-date-field range-start=\"2014-05-05 00:00:00%1$s\" range-end=\"2014-06-05 00:00:00%1$s\" date-out-of-range-message=\"Please select a sensible date\" date-format=\"yyyy-MM-dd\" lenient show-iso-week-numbers parse-error-message=\"You are doing it wrong\" time-zone=\"GMT+05:00\" value=\"2014-05-15 00:00:00%1$s\"/>",
+                "<vaadin7-date-field range-start=\"2014-05-05 00:00:00%1$s\" range-end=\"2014-06-05 00:00:00%1$s\" date-out-of-range-message=\"Please select a sensible date\" date-format=\"yyyy-MM-dd\" lenient show-iso-week-numbers parse-error-message=\"You are doing it wrong\" time-zone=\"GMT+05:00\" value=\"2014-05-15 00:00:00%1$s\"/>",
                 timeZone);
     }
 
-    private LegacyDateField getTimezoneExpected() {
-        LegacyDateField df = new LegacyDateField();
+    private DateField getTimezoneExpected() {
+        DateField df = new DateField();
 
         df.setRangeStart(new Date(2014 - 1900, 5 - 1, 5));
         df.setRangeEnd(new Date(2014 - 1900, 6 - 1, 5));
@@ -99,9 +99,9 @@ public class LegacyDateFieldDeclarativeTest
     public void testReadOnlyValue() {
         Date date = new Date(2020 - 1900, 1 - 1, 1);
         String timeZone = new SimpleDateFormat("Z").format(date);
-        String design = "<vaadin7-legacy-date-field readonly resolution='year' value='2020-01-01 00:00:00"
+        String design = "<vaadin7-date-field readonly resolution='year' value='2020-01-01 00:00:00"
                 + timeZone + "'/>";
-        LegacyDateField df = new LegacyDateField();
+        DateField df = new DateField();
         df.setResolution(Resolution.YEAR);
         df.setValue(date);
         df.setReadOnly(true);
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyPopupDateFieldDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java
index 0777a0c782..e6316cec3f 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyPopupDateFieldDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.datefield;
+package com.vaadin.v7.tests.server.component.datefield;
 
 import java.util.Date;
 
@@ -21,27 +21,23 @@ import org.junit.Test;
 
 import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.design.DeclarativeTestBase;
-import com.vaadin.v7.ui.LegacyPopupDateField;
+import com.vaadin.v7.ui.PopupDateField;
 
 /**
- * Tests the declarative support for implementations of
- * {@link LegacyPopupDateField}.
+ * Tests the declarative support for implementations of {@link PopupDateField}.
  *
  * @since 7.4
  * @author Vaadin Ltd
  */
-public class LegacyPopupDateFieldDeclarativeTest
-        extends DeclarativeTestBase<LegacyPopupDateField> {
-
-    private static final String TAG_NAME = "com_vaadin_v7_ui-legacy-popup-date-field";
+public class PopupDateFieldDeclarativeTest
+        extends DeclarativeTestBase<PopupDateField> {
 
     private String getBasicDesign() {
-        return "<" + TAG_NAME
-                + " assistive-text='at' text-field-enabled='false' show-iso-week-numbers resolution=\"MINUTE\" range-end=\"2019-01-15\" input-prompt=\"Pick a day\" value=\"2003-02-27 07:15\"></vaadin-popup-date-field>";
+        return "<vaadin7-popup-date-field assistive-text='at' text-field-enabled='false' show-iso-week-numbers resolution=\"MINUTE\" range-end=\"2019-01-15\" input-prompt=\"Pick a day\" value=\"2003-02-27 07:15\"></vaadin7-popup-date-field>";
     }
 
-    private LegacyPopupDateField getBasicExpected() {
-        LegacyPopupDateField pdf = new LegacyPopupDateField();
+    private PopupDateField getBasicExpected() {
+        PopupDateField pdf = new PopupDateField();
         pdf.setShowISOWeekNumbers(true);
         pdf.setResolution(Resolution.MINUTE);
         pdf.setRangeEnd(new Date(2019 - 1900, 1 - 1, 15));
@@ -62,12 +58,4 @@ public class LegacyPopupDateFieldDeclarativeTest
         testRead(getBasicDesign(), getBasicExpected());
     }
 
-    @Override
-    public LegacyPopupDateField testRead(String design,
-            LegacyPopupDateField expected) {
-        return super.testRead(
-                "<html><head><meta charset='UTF-8' name='package-mapping' content='com_vaadin_v7_ui:com.vaadin.v7.ui'></head> "
-                        + design + "</html>",
-                expected);
-    }
 }
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/BeanFieldGroupTest.java
index f5c315b440..5b8dac9002 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/BeanFieldGroupTest.java
@@ -1,18 +1,18 @@
-package com.vaadin.tests.server.component.fieldgroup;
+package com.vaadin.v7.tests.server.component.fieldgroup;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Item;
-import com.vaadin.data.fieldgroup.BeanFieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
-import com.vaadin.data.fieldgroup.PropertyId;
-import com.vaadin.data.util.BeanItem;
-import com.vaadin.ui.RichTextArea;
-import com.vaadin.v7.ui.LegacyField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.fieldgroup.BeanFieldGroup;
+import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
+import com.vaadin.v7.data.fieldgroup.PropertyId;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.RichTextArea;
+import com.vaadin.v7.ui.TextField;
 
 public class BeanFieldGroupTest {
 
@@ -72,10 +72,10 @@ public class BeanFieldGroupTest {
 
     public static class ViewStub {
 
-        LegacyTextField basicField = new LegacyTextField();
+        TextField basicField = new TextField();
 
         @PropertyId("anotherField")
-        LegacyTextField boundWithAnnotation = new LegacyTextField();
+        TextField boundWithAnnotation = new TextField();
     }
 
     @SuppressWarnings("unchecked")
@@ -87,13 +87,13 @@ public class BeanFieldGroupTest {
         BeanFieldGroup<MyBean> bindFields = BeanFieldGroup
                 .bindFieldsUnbuffered(myBean, viewStub);
 
-        LegacyField<String> field = (LegacyField<String>) bindFields
+        Field<String> field = (Field<String>) bindFields
                 .getField("basicField");
         Assert.assertEquals(DEFAULT_FOR_BASIC_FIELD, myBean.basicField);
         field.setValue("Foo");
         Assert.assertEquals("Foo", myBean.basicField);
 
-        field = (LegacyField<String>) bindFields.getField("anotherField");
+        field = (Field<String>) bindFields.getField("anotherField");
         field.setValue("Foo");
         Assert.assertEquals("Foo", myBean.anotherField);
     }
@@ -107,12 +107,12 @@ public class BeanFieldGroupTest {
         BeanFieldGroup<MyBean> bindFields = BeanFieldGroup
                 .bindFieldsBuffered(myBean, viewStub);
 
-        LegacyField<String> basicField = (LegacyField<String>) bindFields
+        Field<String> basicField = (Field<String>) bindFields
                 .getField("basicField");
         basicField.setValue("Foo");
         Assert.assertEquals(DEFAULT_FOR_BASIC_FIELD, myBean.basicField);
 
-        LegacyField<String> anotherField = (LegacyField<String>) bindFields
+        Field<String> anotherField = (Field<String>) bindFields
                 .getField("anotherField");
         anotherField.setValue("Foo");
         Assert.assertNull(myBean.anotherField);
@@ -132,7 +132,7 @@ public class BeanFieldGroupTest {
         BeanFieldGroup<MyBean> bfg = new BeanFieldGroup<MyBean>(MyBean.class);
         bfg.setItemDataSource(bean);
 
-        com.vaadin.v7.ui.LegacyField<?> helloField = bfg
+        com.vaadin.v7.ui.Field<?> helloField = bfg
                 .buildAndBind("Hello string", "nestedBean.hello");
         assertEquals(bean.nestedBean.hello, helloField.getValue().toString());
     }
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java
index a324c02cfc..3e1aa92491 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java
@@ -1,14 +1,14 @@
-package com.vaadin.tests.server.component.fieldgroup;
+package com.vaadin.v7.tests.server.component.fieldgroup;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.data.util.PropertysetItem;
 import com.vaadin.ui.FormLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.fieldgroup.FieldGroup;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.data.util.PropertysetItem;
+import com.vaadin.v7.ui.TextField;
 
 public class CaseInsensitiveBindingTest {
 
@@ -18,7 +18,7 @@ public class CaseInsensitiveBindingTest {
         item.addItemProperty("LastName", new ObjectProperty<String>("Sparrow"));
 
         class MyForm extends FormLayout {
-            LegacyTextField lastName = new LegacyTextField("Last name");
+            TextField lastName = new TextField("Last name");
 
             public MyForm() {
 
@@ -41,7 +41,7 @@ public class CaseInsensitiveBindingTest {
         item.addItemProperty("first_name", new ObjectProperty<String>("Jack"));
 
         class MyForm extends FormLayout {
-            LegacyTextField firstName = new LegacyTextField("First name");
+            TextField firstName = new TextField("First name");
 
             public MyForm() {
                 // Should bind to the first_name property
@@ -65,7 +65,7 @@ public class CaseInsensitiveBindingTest {
         item.addItemProperty("firstName", new ObjectProperty<String>("This"));
 
         class MyForm extends FormLayout {
-            LegacyTextField firstName = new LegacyTextField("First name");
+            TextField firstName = new TextField("First name");
 
             public MyForm() {
                 // should bind to the firstName property, not first_name
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/FieldGroupTest.java
index 43d2bf8a6a..99a2daa547 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/FieldGroupTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.fieldgroup;
+package com.vaadin.v7.tests.server.component.fieldgroup;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -25,14 +25,14 @@ import java.util.Set;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
-import com.vaadin.data.util.AbstractProperty;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.Validator.InvalidValueException;
-import com.vaadin.v7.ui.LegacyField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.fieldgroup.FieldGroup;
+import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
+import com.vaadin.v7.data.util.AbstractProperty;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.TextField;
 
 /**
  *
@@ -46,7 +46,7 @@ public class FieldGroupTest {
     public void setReadOnly_readOnlyAndNoDataSource_fieldIsReadOnly() {
         FieldGroup fieldGroup = new FieldGroup();
 
-        LegacyTextField field = new LegacyTextField();
+        TextField field = new TextField();
         fieldGroup.bind(field, "property");
 
         fieldGroup.setReadOnly(true);
@@ -58,7 +58,7 @@ public class FieldGroupTest {
     public void setReadOnly_writableAndNoDataSource_fieldIsWritable() {
         FieldGroup fieldGroup = new FieldGroup();
 
-        LegacyTextField field = new LegacyTextField();
+        TextField field = new TextField();
         fieldGroup.bind(field, "property");
 
         fieldGroup.setReadOnly(false);
@@ -73,23 +73,23 @@ public class FieldGroupTest {
 
         fieldGroup.setItemDataSource(new TestItem());
 
-        LegacyTextField field1 = new LegacyTextField();
+        TextField field1 = new TextField();
         field1.setRequired(true);
         fieldGroup.bind(field1, "prop1");
 
-        LegacyTextField field2 = new LegacyTextField();
+        TextField field2 = new TextField();
         field2.setRequired(true);
         fieldGroup.bind(field2, "prop2");
 
-        Set<LegacyTextField> set = new HashSet<>(Arrays.asList(field1, field2));
+        Set<TextField> set = new HashSet<>(Arrays.asList(field1, field2));
 
         try {
             fieldGroup.commit();
             Assert.fail("No commit exception is thrown");
         } catch (CommitException exception) {
-            Map<LegacyField<?>, ? extends InvalidValueException> invalidFields = exception
+            Map<Field<?>, ? extends InvalidValueException> invalidFields = exception
                     .getInvalidFields();
-            for (Entry<LegacyField<?>, ? extends InvalidValueException> entry : invalidFields
+            for (Entry<Field<?>, ? extends InvalidValueException> entry : invalidFields
                     .entrySet()) {
                 set.remove(entry.getKey());
             }
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java
index f14b966a2d..8957e04771 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java
@@ -1,19 +1,19 @@
-package com.vaadin.tests.server.component.fieldgroup;
+package com.vaadin.v7.tests.server.component.fieldgroup;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.util.BeanItem;
 import com.vaadin.tests.data.bean.BeanWithReadOnlyField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.fieldgroup.FieldGroup;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.ui.TextField;
 
 public class FieldGroupWithReadOnlyPropertiesTest {
 
-    private LegacyTextField readOnlyField = new LegacyTextField();
-    private LegacyTextField writableField = new LegacyTextField();
+    private TextField readOnlyField = new TextField();
+    private TextField writableField = new TextField();
 
     @Test
     public void bindReadOnlyPropertyToFieldGroup() {
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java
index 0ef30316ac..bd9f206751 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java
@@ -1,15 +1,15 @@
-package com.vaadin.tests.server.component.fieldgroup;
+package com.vaadin.v7.tests.server.component.fieldgroup;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.fieldgroup.PropertyId;
-import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.data.util.PropertysetItem;
 import com.vaadin.ui.FormLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.fieldgroup.FieldGroup;
+import com.vaadin.v7.data.fieldgroup.PropertyId;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.data.util.PropertysetItem;
+import com.vaadin.v7.ui.TextField;
 
 public class FieldNamedDescriptionTest {
 
@@ -24,12 +24,12 @@ public class FieldNamedDescriptionTest {
         // Define a form as a class that extends some layout
         class MyForm extends FormLayout {
             // Member that will bind to the "name" property
-            LegacyTextField name = new LegacyTextField("Name");
+            TextField name = new TextField("Name");
 
             // This member will not bind to the desctiptionProperty as the name
             // description conflicts with something in the binding process
             @PropertyId("description")
-            LegacyTextField description = new LegacyTextField("Description");
+            TextField description = new TextField("Description");
 
             public MyForm() {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridAddRowBuiltinContainerTest.java
index 3bff93c042..f9f7d8e3c8 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridAddRowBuiltinContainerTest.java
@@ -13,22 +13,22 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid;
+package com.vaadin.v7.tests.server.component.grid;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.BeanItem;
-import com.vaadin.data.util.BeanItemContainer;
-import com.vaadin.data.util.MethodProperty.MethodException;
 import com.vaadin.tests.data.bean.Person;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.data.util.MethodProperty.MethodException;
+import com.vaadin.v7.ui.Grid;
 
 public class GridAddRowBuiltinContainerTest {
-    LegacyGrid grid = new LegacyGrid();
+    Grid grid = new Grid();
     Container.Indexed container;
 
     @Before
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridChildrenTest.java
index 5897a1fc2d..7a599f2745 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridChildrenTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid;
+package com.vaadin.v7.tests.server.component.grid;
 
 import java.util.Iterator;
 
@@ -22,15 +22,15 @@ import org.junit.Test;
 
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.FooterCell;
-import com.vaadin.ui.LegacyGrid.HeaderCell;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.FooterCell;
+import com.vaadin.v7.ui.Grid.HeaderCell;
 
 public class GridChildrenTest {
 
     @Test
     public void componentsInMergedHeader() {
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.addColumn("foo");
         grid.addColumn("bar");
         grid.addColumn("baz");
@@ -45,7 +45,7 @@ public class GridChildrenTest {
 
     @Test
     public void componentsInMergedFooter() {
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.addColumn("foo");
         grid.addColumn("bar");
         grid.addColumn("baz");
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridColumnAddingAndRemovingTest.java
index e5c46e3ba2..a9e6b90438 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridColumnAddingAndRemovingTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid;
+package com.vaadin.v7.tests.server.component.grid;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -22,14 +22,14 @@ import static org.junit.Assert.assertNull;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
 
 public class GridColumnAddingAndRemovingTest {
 
-    LegacyGrid grid = new LegacyGrid();
+    Grid grid = new Grid();
     Container.Indexed container;
 
     @Before
@@ -104,7 +104,7 @@ public class GridColumnAddingAndRemovingTest {
                 grid.getColumn("foo"));
         assertNotNull("Grid did should have a column for property bar",
                 grid.getColumn("bar"));
-        for (LegacyGrid.Column column : grid.getColumns()) {
+        for (Grid.Column column : grid.getColumns()) {
             assertNotNull("Grid getColumns returned a null value", column);
         }
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridColumnsTest.java
index 769532b03b..a438bed25c 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridColumnsTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid;
+package com.vaadin.v7.tests.server.component.grid;
 
 import static org.easymock.EasyMock.and;
 import static org.easymock.EasyMock.capture;
@@ -39,20 +39,20 @@ import org.easymock.EasyMock;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.server.KeyMapper;
 import com.vaadin.shared.ui.grid.GridColumnState;
 import com.vaadin.shared.ui.grid.GridState;
 import com.vaadin.shared.util.SharedUtil;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.Column;
-import com.vaadin.ui.LegacyGrid.ColumnResizeEvent;
-import com.vaadin.ui.LegacyGrid.ColumnResizeListener;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.Column;
+import com.vaadin.v7.ui.Grid.ColumnResizeEvent;
+import com.vaadin.v7.ui.Grid.ColumnResizeListener;
+import com.vaadin.v7.ui.TextField;
 
 public class GridColumnsTest {
 
-    private LegacyGrid grid;
+    private Grid grid;
 
     private GridState state;
 
@@ -70,14 +70,14 @@ public class GridColumnsTest {
             ds.addContainerProperty("column" + c, String.class, "");
         }
         ds.addContainerProperty("noSort", Object.class, null);
-        grid = new LegacyGrid(ds);
+        grid = new Grid(ds);
 
-        getStateMethod = LegacyGrid.class.getDeclaredMethod("getState");
+        getStateMethod = Grid.class.getDeclaredMethod("getState");
         getStateMethod.setAccessible(true);
 
         state = (GridState) getStateMethod.invoke(grid);
 
-        columnIdGeneratorField = LegacyGrid.class.getDeclaredField("columnKeys");
+        columnIdGeneratorField = Grid.class.getDeclaredField("columnKeys");
         columnIdGeneratorField.setAccessible(true);
 
         columnIdMapper = (KeyMapper<Object>) columnIdGeneratorField.get(grid);
@@ -282,12 +282,12 @@ public class GridColumnsTest {
     @Test
     public void testPropertyAndColumnEditorFieldsMatch() {
         Column column1 = grid.getColumn("column1");
-        column1.setEditorField(new LegacyTextField());
+        column1.setEditorField(new TextField());
         assertSame(column1.getEditorField(),
                 grid.getColumn("column1").getEditorField());
 
         Column column2 = grid.getColumn("column2");
-        column2.setEditorField(new LegacyTextField());
+        column2.setEditorField(new TextField());
         assertSame(column2.getEditorField(), column2.getEditorField());
     }
 
@@ -333,7 +333,7 @@ public class GridColumnsTest {
 
     @Test
     public void testAddingColumnsWithSetColumns() {
-        LegacyGrid g = new LegacyGrid();
+        Grid g = new Grid();
         g.setColumns("c1", "c2", "c3");
         Iterator<Column> it = g.getColumns().iterator();
         assertEquals(it.next().getPropertyId(), "c1");
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridContainerNotSortableTest.java
index 6bbac2977c..742382ecb1 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridContainerNotSortableTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid;
+package com.vaadin.v7.tests.server.component.grid;
 
 import static org.junit.Assert.assertFalse;
 
@@ -23,11 +23,11 @@ import java.util.Map;
 
 import org.junit.Test;
 
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.AbstractInMemoryContainer;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.Column;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.AbstractInMemoryContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.Column;
 
 public class GridContainerNotSortableTest {
 
@@ -88,12 +88,12 @@ public class GridContainerNotSortableTest {
 
     @Test
     public void testGridWithNotSortableContainer() {
-        new LegacyGrid(notSortableDataSource);
+        new Grid(notSortableDataSource);
     }
 
     @Test(expected = IllegalStateException.class)
     public void testNotSortableGridSetColumnSortable() {
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.setContainerDataSource(notSortableDataSource);
         Column column = grid.getColumn("Foo");
         assertFalse("Column should not be sortable initially.",
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridContainerTest.java
index c865bd8494..4cee00af63 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridContainerTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid;
+package com.vaadin.v7.tests.server.component.grid;
 
 import java.io.IOException;
 import java.io.ObjectOutputStream;
@@ -22,12 +22,12 @@ import java.io.OutputStream;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.DetailsGenerator;
-import com.vaadin.ui.LegacyGrid.RowReference;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.DetailsGenerator;
+import com.vaadin.v7.ui.Grid.RowReference;
 
 public class GridContainerTest {
 
@@ -42,7 +42,7 @@ public class GridContainerTest {
 
     @Test
     public void testDetailsGeneratorDoesNotResetOnContainerChange() {
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         DetailsGenerator detGen = new DetailsGenerator() {
 
             @Override
@@ -83,7 +83,7 @@ public class GridContainerTest {
 
     @Test
     public void setColumnsOrder() {
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         IndexedContainer ic = new IndexedContainer();
         ic.addContainerProperty("foo", String.class, "");
         ic.addContainerProperty("baz", String.class, "");
@@ -98,7 +98,7 @@ public class GridContainerTest {
 
     @Test
     public void addColumnNotInContainer() {
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.setContainerDataSource(new IndexedContainer());
         try {
             grid.addColumn("notInContainer");
@@ -113,7 +113,7 @@ public class GridContainerTest {
 
     @Test
     public void setColumnsForPropertyIdNotInContainer() {
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.setContainerDataSource(new IndexedContainer());
         try {
             grid.setColumns("notInContainer", "notThereEither");
@@ -130,7 +130,7 @@ public class GridContainerTest {
 
     @Test(expected = IllegalStateException.class)
     public void multipleAddColumnsForDefaultContainer() {
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.addColumn("foo");
         grid.addColumn("foo");
     }
@@ -138,7 +138,7 @@ public class GridContainerTest {
     @Test
     public void testSerializeRpcDataProviderWithRowChanges()
             throws IOException {
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         IndexedContainer container = new IndexedContainer();
         grid.setContainerDataSource(container);
         container.addItem();
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridEditorTest.java
index 6fe47b22a0..cc72df39ab 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridEditorTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid;
+package com.vaadin.v7.tests.server.component.grid;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -30,17 +30,17 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.server.MockVaadinSession;
 import com.vaadin.server.VaadinService;
 import com.vaadin.server.VaadinSession;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.v7.ui.LegacyField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.fieldgroup.FieldGroup;
+import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.TextField;
 
 public class GridEditorTest {
 
@@ -53,7 +53,7 @@ public class GridEditorTest {
     // Explicit field for the test session to save it from GC
     private VaadinSession session;
 
-    private final LegacyGrid grid = new LegacyGrid();
+    private final Grid grid = new Grid();
     private Method doEditMethod;
 
     @Before
@@ -77,7 +77,7 @@ public class GridEditorTest {
         session.lock();
 
         // Access to method for actual editing.
-        doEditMethod = LegacyGrid.class.getDeclaredMethod("doEditItem");
+        doEditMethod = Grid.class.getDeclaredMethod("doEditItem");
         doEditMethod.setAccessible(true);
     }
 
@@ -148,7 +148,7 @@ public class GridEditorTest {
     @Test
     public void testSaveEditor() throws Exception {
         startEdit();
-        LegacyTextField field = (LegacyTextField) grid.getColumn(PROPERTY_NAME)
+        TextField field = (TextField) grid.getColumn(PROPERTY_NAME)
                 .getEditorField();
 
         field.setValue("New Name");
@@ -165,7 +165,7 @@ public class GridEditorTest {
     public void testSaveEditorCommitFail() throws Exception {
         startEdit();
 
-        ((LegacyTextField) grid.getColumn(PROPERTY_AGE).getEditorField())
+        ((TextField) grid.getColumn(PROPERTY_AGE).getEditorField())
                 .setValue("Invalid");
         try {
             // Manual fail instead of @Test(expected=...) to check it is
@@ -181,7 +181,7 @@ public class GridEditorTest {
     @Test
     public void testCancelEditor() throws Exception {
         startEdit();
-        LegacyTextField field = (LegacyTextField) grid.getColumn(PROPERTY_NAME)
+        TextField field = (TextField) grid.getColumn(PROPERTY_NAME)
                 .getEditorField();
         field.setValue("New Name");
 
@@ -218,7 +218,7 @@ public class GridEditorTest {
 
     @Test
     public void testCustomBinding() {
-        LegacyTextField textField = new LegacyTextField();
+        TextField textField = new TextField();
         grid.getColumn(PROPERTY_NAME).setEditorField(textField);
 
         startEdit();
@@ -236,7 +236,7 @@ public class GridEditorTest {
     public void testFieldIsNotReadonly() {
         startEdit();
 
-        LegacyField<?> field = grid.getColumn(PROPERTY_NAME).getEditorField();
+        Field<?> field = grid.getColumn(PROPERTY_NAME).getEditorField();
         assertFalse(field.isReadOnly());
     }
 
@@ -245,13 +245,13 @@ public class GridEditorTest {
         startEdit();
 
         grid.getEditorFieldGroup().setReadOnly(true);
-        LegacyField<?> field = grid.getColumn(PROPERTY_NAME).getEditorField();
+        Field<?> field = grid.getColumn(PROPERTY_NAME).getEditorField();
         assertTrue(field.isReadOnly());
     }
 
     @Test
     public void testColumnRemoved() {
-        LegacyField<?> field = grid.getColumn(PROPERTY_NAME).getEditorField();
+        Field<?> field = grid.getColumn(PROPERTY_NAME).getEditorField();
 
         assertSame("field should be attached to ", grid, field.getParent());
 
@@ -262,10 +262,10 @@ public class GridEditorTest {
 
     @Test
     public void testSetFieldAgain() {
-        LegacyTextField field = new LegacyTextField();
+        TextField field = new TextField();
         grid.getColumn(PROPERTY_NAME).setEditorField(field);
 
-        field = new LegacyTextField();
+        field = new TextField();
         grid.getColumn(PROPERTY_NAME).setEditorField(field);
 
         assertSame("new field should be used.", field,
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridExtensionTest.java
index 3bba51ab17..5c1afb2628 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridExtensionTest.java
@@ -13,27 +13,27 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid;
+package com.vaadin.v7.tests.server.component.grid;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.AbstractGridExtension;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.AbstractGridExtension;
 
 public class GridExtensionTest {
 
     public static class DummyGridExtension extends AbstractGridExtension {
 
-        public DummyGridExtension(LegacyGrid grid) {
+        public DummyGridExtension(Grid grid) {
             super(grid);
         }
     }
 
     @Test
     public void testCreateExtension() {
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         DummyGridExtension dummy = new DummyGridExtension(grid);
         assertTrue("DummyGridExtension never made it to Grid",
                 grid.getExtensions().contains(dummy));
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridSelectionTest.java
index 1a2011de73..e3eb01e273 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridSelectionTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid;
+package com.vaadin.v7.tests.server.component.grid;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -24,12 +24,12 @@ import java.util.Collection;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.event.SelectionEvent;
 import com.vaadin.event.SelectionEvent.SelectionListener;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
-import com.vaadin.ui.LegacyGrid.SelectionModel;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.SelectionMode;
+import com.vaadin.v7.ui.Grid.SelectionModel;
 
 public class GridSelectionTest {
 
@@ -64,7 +64,7 @@ public class GridSelectionTest {
         }
     }
 
-    private LegacyGrid grid;
+    private Grid grid;
     private MockSelectionChangeListener mockListener;
 
     private final Object itemId1Present = "itemId1Present";
@@ -90,7 +90,7 @@ public class GridSelectionTest {
         assertFalse("itemId2NotPresent",
                 container.containsId(itemId2NotPresent));
 
-        grid = new LegacyGrid(container);
+        grid = new Grid(container);
 
         mockListener = new MockSelectionChangeListener();
         grid.addSelectionListener(mockListener);
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridStateTest.java
index 9f5f67d8be..2170af060d 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridStateTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid;
+package com.vaadin.v7.tests.server.component.grid;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.shared.ui.grid.GridState;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.ui.Grid;
 
 /**
  * Tests for Grid State.
@@ -29,7 +29,7 @@ public class GridStateTest {
 
     @Test
     public void getPrimaryStyleName_gridHasCustomPrimaryStyleName() {
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         GridState state = new GridState();
         Assert.assertEquals("Unexpected primary style name",
                 state.primaryStyleName, grid.getPrimaryStyleName());
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridStaticSectionTest.java
index 95daf47e25..dc7119042d 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridStaticSectionTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid;
+package com.vaadin.v7.tests.server.component.grid;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -24,11 +24,11 @@ import java.lang.reflect.Method;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Container.Indexed;
-import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.data.Container.Indexed;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
 
-public class GridStaticSectionTest extends LegacyGrid {
+public class GridStaticSectionTest extends Grid {
 
     private Indexed dataSource = new IndexedContainer();
 
@@ -117,10 +117,10 @@ public class GridStaticSectionTest extends LegacyGrid {
     private void sanityCheck() throws Throwable {
         Method sanityCheckHeader;
         try {
-            sanityCheckHeader = LegacyGrid.Header.class
+            sanityCheckHeader = Grid.Header.class
                     .getDeclaredMethod("sanityCheck");
             sanityCheckHeader.setAccessible(true);
-            Method sanityCheckFooter = LegacyGrid.Footer.class
+            Method sanityCheckFooter = Grid.Footer.class
                     .getDeclaredMethod("sanityCheck");
             sanityCheckFooter.setAccessible(true);
             sanityCheckHeader.invoke(getHeader());
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/MultiSelectionModelTest.java
index 54e9b30988..7a658fd31f 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/MultiSelectionModelTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid;
+package com.vaadin.v7.tests.server.component.grid;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -24,13 +24,13 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.event.SelectionEvent;
 import com.vaadin.event.SelectionEvent.SelectionListener;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.MultiSelectionModel;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.MultiSelectionModel;
+import com.vaadin.v7.ui.Grid.SelectionMode;
 
 public class MultiSelectionModelTest {
 
@@ -41,7 +41,7 @@ public class MultiSelectionModelTest {
     private Object itemIdNotPresent = "itemIdNotPresent";
     private Container.Indexed dataSource;
     private MultiSelectionModel model;
-    private LegacyGrid grid;
+    private Grid grid;
 
     private boolean expectingEvent = false;
     private boolean expectingDeselectEvent;
@@ -51,7 +51,7 @@ public class MultiSelectionModelTest {
     @Before
     public void setUp() {
         dataSource = createDataSource();
-        grid = new LegacyGrid(dataSource);
+        grid = new Grid(dataSource);
         grid.setSelectionMode(SelectionMode.MULTI);
         model = (MultiSelectionModel) grid.getSelectionModel();
     }
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/SingleSelectionModelTest.java
index 3183ad9021..d81bf62c02 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/SingleSelectionModelTest.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid;
+package com.vaadin.v7.tests.server.component.grid;
 
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.event.SelectionEvent;
 import com.vaadin.event.SelectionEvent.SelectionListener;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
-import com.vaadin.ui.LegacyGrid.SingleSelectionModel;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.SelectionMode;
+import com.vaadin.v7.ui.Grid.SingleSelectionModel;
 
 public class SingleSelectionModelTest {
 
@@ -36,14 +36,14 @@ public class SingleSelectionModelTest {
     private Object itemIdNotPresent = "itemIdNotPresent";
     private Container.Indexed dataSource;
     private SingleSelectionModel model;
-    private LegacyGrid grid;
+    private Grid grid;
 
     private boolean expectingEvent = false;
 
     @Before
     public void setUp() {
         dataSource = createDataSource();
-        grid = new LegacyGrid(dataSource);
+        grid = new Grid(dataSource);
         grid.setSelectionMode(SelectionMode.SINGLE);
         model = (SingleSelectionModel) grid.getSelectionModel();
     }
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/TestGrid.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/TestGrid.java
index 9b2dde4d24..400c10eb5d 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/TestGrid.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/TestGrid.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid;
+package com.vaadin.v7.tests.server.component.grid;
 
 import java.lang.reflect.Field;
 
 import org.easymock.EasyMock;
 
-import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.server.communication.data.RpcDataProviderExtension;
 import com.vaadin.ui.ConnectorTracker;
-import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.UI;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.server.communication.data.RpcDataProviderExtension;
+import com.vaadin.v7.ui.Grid;
 
 /**
  * A Grid attached to a mock UI with a mock ConnectorTracker.
@@ -31,7 +31,7 @@ import com.vaadin.ui.UI;
  * @since 7.4
  * @author Vaadin Ltd
  */
-public class TestGrid extends LegacyGrid {
+public class TestGrid extends Grid {
 
     public TestGrid() {
         super();
@@ -44,7 +44,7 @@ public class TestGrid extends LegacyGrid {
     }
 
     public RpcDataProviderExtension getDataProvider() throws Exception {
-        Field dseField = LegacyGrid.class.getDeclaredField("datasourceExtension");
+        Field dseField = Grid.class.getDeclaredField("datasourceExtension");
         dseField.setAccessible(true);
         return (RpcDataProviderExtension) dseField.get(this);
     }
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java
index 5a2afed01c..b286c48c1b 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid.declarative;
+package com.vaadin.v7.tests.server.component.grid.declarative;
 
 import org.junit.Test;
 
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.ui.Grid;
 
 public class GridColumnDeclarativeTest extends GridDeclarativeTestBase {
 
     @Test
     public void testSimpleGridColumns() {
-        String design = "<vaadin-legacy-grid><table>"//
+        String design = "<vaadin7-grid><table>"//
                 + "<colgroup>"
                 + "   <col sortable width='100' property-id='Column1'>"
                 + "   <col sortable=false max-width='200' expand='2' property-id='Column2'>"
@@ -32,8 +32,8 @@ public class GridColumnDeclarativeTest extends GridDeclarativeTestBase {
                 + "   <col sortable hidden property-id='Column5'>"
                 + "</colgroup>" //
                 + "<thead />" //
-                + "</table></vaadin-legacy-grid>";
-        LegacyGrid grid = new LegacyGrid();
+                + "</table></vaadin7-grid>";
+        Grid grid = new Grid();
         grid.addColumn("Column1", String.class).setWidth(100);
         grid.addColumn("Column2", String.class).setMaximumWidth(200)
                 .setExpandRatio(2).setSortable(false);
@@ -53,15 +53,15 @@ public class GridColumnDeclarativeTest extends GridDeclarativeTestBase {
 
     @Test
     public void testReadColumnsWithoutPropertyId() {
-        String design = "<vaadin-legacy-grid><table>"//
+        String design = "<vaadin7-grid><table>"//
                 + "<colgroup>"
                 + "   <col sortable=true width='100' property-id='Column1'>"
                 + "   <col sortable=true max-width='200' expand='2'>" // property-id="property-1"
                 + "   <col sortable=true min-width='15' expand='1' property-id='Column3'>"
                 + "   <col sortable=true hidden=true hidable=true hiding-toggle-caption='col 4'>" // property-id="property-3"
                 + "</colgroup>" //
-                + "</table></vaadin-legacy-grid>";
-        LegacyGrid grid = new LegacyGrid();
+                + "</table></vaadin7-grid>";
+        Grid grid = new Grid();
         grid.addColumn("Column1", String.class).setWidth(100);
         grid.addColumn("property-1", String.class).setMaximumWidth(200)
                 .setExpandRatio(2);
@@ -75,12 +75,12 @@ public class GridColumnDeclarativeTest extends GridDeclarativeTestBase {
 
     @Test
     public void testReadEmptyExpand() {
-        String design = "<vaadin-legacy-grid><table>"//
+        String design = "<vaadin7-grid><table>"//
                 + "<colgroup>" + "   <col sortable=true expand />"
                 + "</colgroup>" //
-                + "</table></vaadin-legacy-grid>";
+                + "</table></vaadin7-grid>";
 
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.addColumn("property-0", String.class).setExpandRatio(1);
 
         testRead(design, grid);
@@ -88,13 +88,13 @@ public class GridColumnDeclarativeTest extends GridDeclarativeTestBase {
 
     @Test
     public void testReadColumnWithNoAttributes() {
-        String design = "<vaadin-legacy-grid><table>"//
+        String design = "<vaadin7-grid><table>"//
                 + "<colgroup>" //
                 + "   <col />" //
                 + "</colgroup>" //
-                + "</table></vaadin-legacy-grid>";
+                + "</table></vaadin7-grid>";
 
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.addColumn("property-0", String.class);
 
         testRead(design, grid);
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
index 6d26b40996..df46c6c70a 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid.declarative;
+package com.vaadin.v7.tests.server.component.grid.declarative;
 
 import static org.junit.Assert.assertSame;
 
@@ -21,10 +21,10 @@ import org.junit.Test;
 
 import com.vaadin.shared.ui.grid.HeightMode;
 import com.vaadin.tests.design.DeclarativeTestBase;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.MultiSelectionModel;
-import com.vaadin.ui.LegacyGrid.NoSelectionModel;
-import com.vaadin.ui.LegacyGrid.SingleSelectionModel;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.MultiSelectionModel;
+import com.vaadin.v7.ui.Grid.NoSelectionModel;
+import com.vaadin.v7.ui.Grid.SingleSelectionModel;
 
 /**
  * Tests declarative support for Grid properties.
@@ -32,16 +32,15 @@ import com.vaadin.ui.LegacyGrid.SingleSelectionModel;
  * @since
  * @author Vaadin Ltd
  */
-public class GridDeclarativeAttributeTest
-        extends DeclarativeTestBase<LegacyGrid> {
+public class GridDeclarativeAttributeTest extends DeclarativeTestBase<Grid> {
 
     @Test
     public void testBasicAttributes() {
 
-        String design = "<vaadin-legacy-grid editable rows=20 frozen-columns=-1 "
+        String design = "<vaadin7-grid editable rows=20 frozen-columns=-1 "
                 + "editor-save-caption='Tallenna' editor-cancel-caption='Peruuta' column-reordering-allowed>";
 
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.setEditorEnabled(true);
         grid.setHeightMode(HeightMode.ROW);
         grid.setHeightByRows(20);
@@ -56,10 +55,10 @@ public class GridDeclarativeAttributeTest
 
     @Test
     public void testFrozenColumnsAttributes() {
-        String design = "<vaadin-legacy-grid frozen-columns='2'><table>" //
-                + "<colgroup><col><col><col></colgroup></table></vaadin-legacy-grid>";
+        String design = "<vaadin7-grid frozen-columns='2'><table>" //
+                + "<colgroup><col><col><col></colgroup></table></vaadin7-grid>";
 
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.addColumn("property-0", String.class);
         grid.addColumn("property-1", String.class);
         grid.addColumn("property-2", String.class);
@@ -70,15 +69,15 @@ public class GridDeclarativeAttributeTest
 
     @Test
     public void testSelectionMode() {
-        String design = "<vaadin-legacy-grid selection-mode='none'>";
+        String design = "<vaadin7-grid selection-mode='none'>";
         assertSame(NoSelectionModel.class,
                 read(design).getSelectionModel().getClass());
 
-        design = "<vaadin-legacy-grid selection-mode='single'>";
+        design = "<vaadin7-grid selection-mode='single'>";
         assertSame(SingleSelectionModel.class,
                 read(design).getSelectionModel().getClass());
 
-        design = "<vaadin-legacy-grid selection-mode='multi'>";
+        design = "<vaadin7-grid selection-mode='multi'>";
         assertSame(MultiSelectionModel.class,
                 read(design).getSelectionModel().getClass());
     }
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridDeclarativeTestBase.java
index 59ab5b8343..71a0c7987e 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridDeclarativeTestBase.java
@@ -13,34 +13,34 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid.declarative;
+package com.vaadin.v7.tests.server.component.grid.declarative;
 
 import java.util.List;
 
 import org.junit.Assert;
 
 import com.vaadin.tests.design.DeclarativeTestBase;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.Column;
-import com.vaadin.ui.LegacyGrid.FooterCell;
-import com.vaadin.ui.LegacyGrid.FooterRow;
-import com.vaadin.ui.LegacyGrid.HeaderCell;
-import com.vaadin.ui.LegacyGrid.HeaderRow;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.Column;
+import com.vaadin.v7.ui.Grid.FooterCell;
+import com.vaadin.v7.ui.Grid.FooterRow;
+import com.vaadin.v7.ui.Grid.HeaderCell;
+import com.vaadin.v7.ui.Grid.HeaderRow;
 
-public class GridDeclarativeTestBase extends DeclarativeTestBase<LegacyGrid> {
+public class GridDeclarativeTestBase extends DeclarativeTestBase<Grid> {
 
     @Override
-    public LegacyGrid testRead(String design, LegacyGrid expected) {
+    public Grid testRead(String design, Grid expected) {
         return testRead(design, expected, false);
     }
 
-    public LegacyGrid testRead(String design, LegacyGrid expected, boolean retestWrite) {
+    public Grid testRead(String design, Grid expected, boolean retestWrite) {
         return testRead(design, expected, retestWrite, false);
     }
 
-    public LegacyGrid testRead(String design, LegacyGrid expected, boolean retestWrite,
+    public Grid testRead(String design, Grid expected, boolean retestWrite,
             boolean writeData) {
-        LegacyGrid actual = super.testRead(design, expected);
+        Grid actual = super.testRead(design, expected);
 
         compareGridColumns(expected, actual);
         compareHeaders(expected, actual);
@@ -53,7 +53,7 @@ public class GridDeclarativeTestBase extends DeclarativeTestBase<LegacyGrid> {
         return actual;
     }
 
-    private void compareHeaders(LegacyGrid expected, LegacyGrid actual) {
+    private void compareHeaders(Grid expected, Grid actual) {
         Assert.assertEquals("Different header row count",
                 expected.getHeaderRowCount(), actual.getHeaderRowCount());
         for (int i = 0; i < expected.getHeaderRowCount(); ++i) {
@@ -91,7 +91,7 @@ public class GridDeclarativeTestBase extends DeclarativeTestBase<LegacyGrid> {
         }
     }
 
-    private void compareFooters(LegacyGrid expected, LegacyGrid actual) {
+    private void compareFooters(Grid expected, Grid actual) {
         Assert.assertEquals("Different footer row count",
                 expected.getFooterRowCount(), actual.getFooterRowCount());
         for (int i = 0; i < expected.getFooterRowCount(); ++i) {
@@ -124,7 +124,7 @@ public class GridDeclarativeTestBase extends DeclarativeTestBase<LegacyGrid> {
         }
     }
 
-    private void compareGridColumns(LegacyGrid expected, LegacyGrid actual) {
+    private void compareGridColumns(Grid expected, Grid actual) {
         List<Column> columns = expected.getColumns();
         List<Column> actualColumns = actual.getColumns();
         Assert.assertEquals("Different amount of columns", columns.size(),
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java
index ef536359be..8c7560685c 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid.declarative;
+package com.vaadin.v7.tests.server.component.grid.declarative;
 
 import org.jsoup.nodes.Element;
 import org.jsoup.parser.Tag;
@@ -22,18 +22,18 @@ import org.junit.Test;
 
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.Column;
-import com.vaadin.ui.LegacyGrid.FooterRow;
-import com.vaadin.ui.LegacyGrid.HeaderRow;
 import com.vaadin.ui.declarative.DesignContext;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.Column;
+import com.vaadin.v7.ui.Grid.FooterRow;
+import com.vaadin.v7.ui.Grid.HeaderRow;
 
 public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
 
     @Test
     public void testSingleDefaultHeader() {
         //@formatter:off
-        String design = "<vaadin-legacy-grid><table>"
+        String design = "<vaadin7-grid><table>"
                 + "<colgroup>"
                 + "   <col sortable property-id='Column1'>"
                 + "   <col sortable property-id='Column2'>"
@@ -42,9 +42,9 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
                 + "<thead>"
                 + "   <tr default><th plain-text>Column1<th plain-text>Column2<th plain-text>Column3</tr>"
                 + "</thead>"
-                + "</table></vaadin-legacy-grid>";
+                + "</table></vaadin7-grid>";
         //@formatter:on
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.addColumn("Column1", String.class);
         grid.addColumn("Column2", String.class);
         grid.addColumn("Column3", String.class);
@@ -56,7 +56,7 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
     @Test
     public void testSingleDefaultHTMLHeader() {
         //@formatter:off
-        String design = "<vaadin-legacy-grid><table>"
+        String design = "<vaadin7-grid><table>"
                 + "<colgroup>"
                 + "   <col sortable property-id='Column1'>"
                 + "   <col sortable property-id='Column2'>"
@@ -64,9 +64,9 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
                 + "<thead>"
                 + "   <tr default><th>Column1<th>Column2<th>Column3</tr>"
                 + "</thead>"
-                + "</table></vaadin-legacy-grid>";
+                + "</table></vaadin7-grid>";
         //@formatter:on
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.addColumn("Column1", String.class);
         grid.addColumn("Column2", String.class);
         grid.addColumn("Column3", String.class);
@@ -83,14 +83,14 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
     @Test
     public void testNoHeaderRows() {
         //@formatter:off
-        String design = "<vaadin-legacy-grid><table>"
+        String design = "<vaadin7-grid><table>"
                 + "<colgroup>"
                 + "   <col sortable property-id='Column1'>"
                 + "</colgroup>"
                 + "<thead />"
-                + "</table></vaadin-legacy-grid>";
+                + "</table></vaadin7-grid>";
         //@formatter:on
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.addColumn("Column1", String.class);
         grid.removeHeaderRow(grid.getDefaultHeaderRow());
 
@@ -101,7 +101,7 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
     @Test
     public void testMultipleHeadersWithColSpans() {
         //@formatter:off
-        String design = "<vaadin-legacy-grid><table>"
+        String design = "<vaadin7-grid><table>"
                 + "<colgroup>"
                 + "   <col sortable property-id='Column1'>"
                 + "   <col sortable property-id='Column2'>"
@@ -112,9 +112,9 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
                 + "   <tr default><th>Column1<th>Column2<th>Column3</tr>"
                 + "   <tr><th>Foo<th colspan=2>Bar</tr>"
                 + "</thead>"
-                + "</table></vaadin-legacy-grid>";
+                + "</table></vaadin7-grid>";
         //@formatter:on
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.addColumn("Column1", String.class);
         grid.addColumn("Column2", String.class);
         grid.addColumn("Column3", String.class);
@@ -137,7 +137,7 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
     @Test
     public void testSingleDefaultFooter() {
         //@formatter:off
-        String design = "<vaadin-legacy-grid><table>"
+        String design = "<vaadin7-grid><table>"
                 + "<colgroup>"
                 + "   <col sortable property-id='Column1'>"
                 + "   <col sortable property-id='Column2'>"
@@ -147,9 +147,9 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
                 + "<tfoot>"
                 + "   <tr><td plain-text>Column1<td plain-text>Column2<td plain-text>Column3</tr>"
                 + "</tfoot>"
-                + "</table></vaadin-legacy-grid>";
+                + "</table></vaadin7-grid>";
         //@formatter:on
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.addColumn("Column1", String.class);
         grid.addColumn("Column2", String.class);
         grid.addColumn("Column3", String.class);
@@ -168,19 +168,19 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
     @Test
     public void testSingleDefaultHTMLFooter() {
         //@formatter:off
-        String design = "<vaadin-legacy-grid><table>"
+        String design = "<vaadin7-grid><table>"
                 + "<colgroup>"
                 + "   <col sortable property-id='Column1'>"
                 + "   <col sortable property-id='Column2'>"
                 + "   <col sortable property-id='Column3'>" + "</colgroup>"
                 + "<thead />" // No headers read or written
-                + "<tfoot>" 
-                + "   <tr><td>Column1<td>Column2<td>Column3</tr>" 
-                + "</tfoot>" 
-                + "</table></vaadin-legacy-grid>";
+                + "<tfoot>"
+                + "   <tr><td>Column1<td>Column2<td>Column3</tr>"
+                + "</tfoot>"
+                + "</table></vaadin7-grid>";
         //@formatter:on
 
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.addColumn("Column1", String.class);
         grid.addColumn("Column2", String.class);
         grid.addColumn("Column3", String.class);
@@ -199,7 +199,7 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
     @Test
     public void testMultipleFootersWithColSpans() {
         //@formatter:off
-        String design = "<vaadin-legacy-grid><table>"
+        String design = "<vaadin7-grid><table>"
                 + "<colgroup>"
                 + "   <col sortable property-id='Column1'>"
                 + "   <col sortable property-id='Column2'>"
@@ -208,13 +208,13 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
                 + "<thead />" // No headers read or written.
                 + "<tfoot>"
                 + "   <tr><td colspan=3>Baz</tr>"
-                + "   <tr><td>Column1<td>Column2<td>Column3</tr>" 
-                + "   <tr><td>Foo<td colspan=2>Bar</tr>" 
-                + "</tfoot>" 
-                + "</table></vaadin-legacy-grid>";
+                + "   <tr><td>Column1<td>Column2<td>Column3</tr>"
+                + "   <tr><td>Foo<td colspan=2>Bar</tr>"
+                + "</tfoot>"
+                + "</table></vaadin7-grid>";
         //@formatter:on
 
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.addColumn("Column1", String.class);
         grid.addColumn("Column2", String.class);
         grid.addColumn("Column3", String.class);
@@ -239,19 +239,19 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
     @Test
     public void testComponentInGridHeader() {
         //@formatter:off
-        String design = "<vaadin-legacy-grid><table>"
+        String design = "<vaadin7-grid><table>"
                 + "<colgroup>"
                 + "   <col sortable property-id='Column1'>"
                 + "</colgroup>"
                 + "<thead>"
                 + "<tr default><th><vaadin-label><b>Foo</b></vaadin-label></tr>"
                 + "</thead>"
-                + "</table></vaadin-legacy-grid>";
+                + "</table></vaadin7-grid>";
         //@formatter:on
         Label component = new Label("<b>Foo</b>");
         component.setContentMode(ContentMode.HTML);
 
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.addColumn("Column1", String.class);
         grid.getDefaultHeaderRow().getCell("Column1").setComponent(component);
 
@@ -262,21 +262,21 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
     @Test
     public void testComponentInGridFooter() {
         //@formatter:off
-        String design = "<vaadin-legacy-grid><table>"
+        String design = "<vaadin7-grid><table>"
                 + "<colgroup>"
                 + "   <col sortable property-id='Column1'>"
                 + "</colgroup>"
                 + "<thead />" // No headers read or written
-                + "<tfoot>" 
+                + "<tfoot>"
                 + "<tr><td><vaadin-label><b>Foo</b></vaadin-label></tr>"
-                + "</tfoot>" 
-                + "</table></vaadin-legacy-grid>";
+                + "</tfoot>"
+                + "</table></vaadin7-grid>";
         //@formatter:on
 
         Label component = new Label("<b>Foo</b>");
         component.setContentMode(ContentMode.HTML);
 
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.addColumn("Column1", String.class);
         grid.prependFooterRow().getCell("Column1").setComponent(component);
         grid.removeHeaderRow(grid.getDefaultHeaderRow());
@@ -288,7 +288,7 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
     @Test
     public void testHtmlEntitiesinGridHeaderFooter() {
         //@formatter:off
-        String design = "<vaadin-legacy-grid><table>"
+        String design = "<vaadin7-grid><table>"
                 + "<colgroup>"
                 + "  <col sortable=\"true\" property-id=\"> test\">"
                 + "</colgroup>"
@@ -299,10 +299,10 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
                 + "  <tr><td plain-text=\"true\">&gt; Test</td></tr>"
                 + "</tfoot>"
                 + "<tbody />"
-                + "</table></vaadin-legacy-grid>";
+                + "</table></vaadin7-grid>";
         //@formatter:on
 
-        LegacyGrid grid = read(design);
+        Grid grid = read(design);
         String actualHeader = grid.getHeaderRow(0).getCell("> test").getText();
         String actualFooter = grid.getFooterRow(0).getCell("> test").getText();
         String expected = "> Test";
@@ -319,7 +319,7 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
         Assert.assertEquals(expected, actualHeader);
         Assert.assertEquals(expected, actualFooter);
 
-        grid = new LegacyGrid();
+        grid = new Grid();
         grid.setColumns("test");
         HeaderRow header = grid.addHeaderRowAt(0);
         FooterRow footer = grid.addFooterRowAt(0);
@@ -329,7 +329,7 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
         header.getCell("test").setText("&amp; Test");
         footer.getCell("test").setText("&amp; Test");
 
-        Element root = new Element(Tag.valueOf("vaadin-legacy-grid"), "");
+        Element root = new Element(Tag.valueOf("vaadin7-grid"), "");
         grid.writeDesign(root, new DesignContext());
 
         Assert.assertEquals("&amp;amp; Test",
@@ -344,7 +344,7 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
         header.getCell("test").setHtml("&amp; Test");
         footer.getCell("test").setHtml("&amp; Test");
 
-        root = new Element(Tag.valueOf("vaadin-legacy-grid"), "");
+        root = new Element(Tag.valueOf("vaadin7-grid"), "");
         grid.writeDesign(root, new DesignContext());
 
         Assert.assertEquals("&amp; Test",
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java
index 8bf03e9d5e..63eb1e7a66 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid.declarative;
+package com.vaadin.v7.tests.server.component.grid.declarative;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Container;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.ui.Grid;
 
 public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase {
 
     @Test
     public void testSimpleInlineData() {
-        String design = "<vaadin-legacy-grid><table>"//
+        String design = "<vaadin7-grid><table>"//
                 + "<colgroup>" + "   <col sortable property-id='Col1' />"
                 + "</colgroup>" //
                 + "<thead />" // No headers read or written
@@ -34,9 +34,9 @@ public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase {
                 + "<tr><td>Bar</tr>" //
                 + "<tr><td>Baz</tr>" //
                 + "</tbody>" //
-                + "</table></vaadin-legacy-grid>";
+                + "</table></vaadin7-grid>";
 
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.addColumn("Col1", String.class);
         grid.addRow("Foo");
         grid.addRow("Bar");
@@ -51,7 +51,7 @@ public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase {
 
     @Test
     public void testMultipleColumnsInlineData() {
-        String design = "<vaadin-legacy-grid><table>"//
+        String design = "<vaadin7-grid><table>"//
                 + "<colgroup>" + "   <col sortable property-id='Col1' />"
                 + "   <col sortable property-id='Col2' />"
                 + "   <col sortable property-id='Col3' />" //
@@ -61,9 +61,9 @@ public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase {
                 + "<tr><td>Foo<td>Bar<td>Baz</tr>" //
                 + "<tr><td>My<td>Summer<td>Car</tr>" //
                 + "</tbody>" //
-                + "</table></vaadin-legacy-grid>";
+                + "</table></vaadin7-grid>";
 
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.addColumn("Col1", String.class);
         grid.addColumn("Col2", String.class);
         grid.addColumn("Col3", String.class);
@@ -79,7 +79,7 @@ public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase {
 
     @Test
     public void testMultipleColumnsInlineDataReordered() {
-        String design = "<vaadin-legacy-grid><table>"//
+        String design = "<vaadin7-grid><table>"//
                 + "<colgroup>" + "   <col sortable property-id='Col2' />"
                 + "   <col sortable property-id='Col3' />"
                 + "   <col sortable property-id='Col1' />" //
@@ -89,9 +89,9 @@ public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase {
                 + "<tr><td>Bar<td>Baz<td>Foo</tr>" //
                 + "<tr><td>Summer<td>Car<td>My</tr>" //
                 + "</tbody>" //
-                + "</table></vaadin-legacy-grid>";
+                + "</table></vaadin7-grid>";
 
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.addColumn("Col1", String.class);
         grid.addColumn("Col2", String.class);
         grid.addColumn("Col3", String.class);
@@ -108,14 +108,14 @@ public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase {
 
     @Test
     public void testHtmlEntities() {
-        String design = "<vaadin-legacy-grid><table>"//
+        String design = "<vaadin7-grid><table>"//
                 + "<colgroup>" + "   <col property-id='test' />" + "</colgroup>" //
                 + "<thead />" // No headers read or written
                 + "<tbody>" //
                 + "  <tr><td>&amp;Test</tr></td>" + "</tbody>"
-                + "</table></vaadin-legacy-grid>";
+                + "</table></vaadin7-grid>";
 
-        LegacyGrid read = read(design);
+        Grid read = read(design);
         Container cds = read.getContainerDataSource();
         Assert.assertEquals("&amp;Test",
                 cds.getItem(cds.getItemIds().iterator().next())
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java
index 1a0e0a1102..0c03788348 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java
@@ -13,38 +13,38 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid.declarative;
+package com.vaadin.v7.tests.server.component.grid.declarative;
 
 import org.junit.Test;
 
-import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.declarative.DesignException;
+import com.vaadin.v7.ui.Grid;
 
 public class GridStructureDeclarativeTest extends GridDeclarativeTestBase {
 
     @Test
     public void testReadEmptyGrid() {
-        String design = "<vaadin-legacy-grid />";
-        testRead(design, new LegacyGrid(), false);
+        String design = "<vaadin7-grid />";
+        testRead(design, new Grid(), false);
     }
 
     @Test
     public void testEmptyGrid() {
-        String design = "<vaadin-legacy-grid></vaadin-legacy-grid>";
-        LegacyGrid expected = new LegacyGrid();
+        String design = "<vaadin7-grid></vaadin7-grid>";
+        Grid expected = new Grid();
         testWrite(design, expected);
         testRead(design, expected, true);
     }
 
     @Test(expected = DesignException.class)
     public void testMalformedGrid() {
-        String design = "<vaadin-legacy-grid><vaadin-label /></vaadin-legacy-grid>";
-        testRead(design, new LegacyGrid());
+        String design = "<vaadin7-grid><vaadin-label /></vaadin7-grid>";
+        testRead(design, new Grid());
     }
 
     @Test(expected = DesignException.class)
     public void testGridWithNoColGroup() {
-        String design = "<vaadin-legacy-grid><table><thead><tr><th>Foo</tr></thead></table></vaadin-legacy-grid>";
-        testRead(design, new LegacyGrid());
+        String design = "<vaadin7-grid><table><thead><tr><th>Foo</tr></thead></table></vaadin7-grid>";
+        testRead(design, new Grid());
     }
 }
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/sort/SortTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/sort/SortTest.java
index beb774528f..b0100d46a3 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/sort/SortTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/sort/SortTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid.sort;
+package com.vaadin.v7.tests.server.component.grid.sort;
 
 import java.util.Arrays;
 import java.util.List;
@@ -25,11 +25,11 @@ import org.junit.Test;
 
 import com.vaadin.data.sort.Sort;
 import com.vaadin.data.sort.SortOrder;
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.event.SortEvent;
 import com.vaadin.event.SortEvent.SortListener;
 import com.vaadin.shared.data.sort.SortDirection;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
 
 public class SortTest {
 
@@ -93,7 +93,7 @@ public class SortTest {
 
     private DummySortingIndexedContainer container;
     private RegisteringSortChangeListener listener;
-    private LegacyGrid grid;
+    private Grid grid;
 
     @Before
     public void setUp() {
@@ -102,7 +102,7 @@ public class SortTest {
 
         listener = new RegisteringSortChangeListener();
 
-        grid = new LegacyGrid(container);
+        grid = new Grid(container);
         grid.addSortListener(listener);
     }
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/listselect/ListSelectDeclarativeTest.java
index f0fa4aad55..50993039af 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/listselect/ListSelectDeclarativeTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.listselect;
+package com.vaadin.v7.tests.server.component.listselect;
 
 import org.junit.Test;
 
 import com.vaadin.tests.design.DeclarativeTestBase;
-import com.vaadin.ui.ListSelect;
+import com.vaadin.v7.ui.ListSelect;
 
 public class ListSelectDeclarativeTest extends DeclarativeTestBase<ListSelect> {
 
@@ -31,10 +31,10 @@ public class ListSelectDeclarativeTest extends DeclarativeTestBase<ListSelect> {
     }
 
     private String getWithOptionsDesign() {
-        return "<vaadin-list-select rows=10>\n"
+        return "<vaadin7-list-select rows=10>\n"
                 + "        <option>Male</option>\n"
                 + "        <option>Female</option>\n"
-                + "</vaadin-list-select>\n" + "";
+                + "</vaadin7-list-select>\n" + "";
     }
 
     @Test
@@ -55,7 +55,7 @@ public class ListSelectDeclarativeTest extends DeclarativeTestBase<ListSelect> {
     }
 
     private String getBasicDesign() {
-        return "<vaadin-list-select caption='Hello' />";
+        return "<vaadin7-list-select caption='Hello' />";
     }
 
     @Test
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/listselect/ListSelectStateTest.java
index 595909aa69..8a34077e73 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectStateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/listselect/ListSelectStateTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.listselect;
+package com.vaadin.v7.tests.server.component.listselect;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.shared.ui.select.AbstractSelectState;
-import com.vaadin.ui.ListSelect;
+import com.vaadin.v7.ui.ListSelect;
 
 /**
  * Tests for ListSelect State.
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java
index 853f38c7d3..e284416060 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.nativeselect;
+package com.vaadin.v7.tests.server.component.nativeselect;
 
 import org.junit.Test;
 
 import com.vaadin.tests.design.DeclarativeTestBase;
-import com.vaadin.ui.NativeSelect;
+import com.vaadin.v7.ui.NativeSelect;
 
 /**
  * Test cases for reading the properties of selection components.
@@ -29,7 +29,7 @@ public class NativeSelectDeclarativeTest
         extends DeclarativeTestBase<NativeSelect> {
 
     public String getBasicDesign() {
-        return "<vaadin-native-select><option>foo</option><option>bar</option></vaadin-native-select>";
+        return "<vaadin7-native-select><option>foo</option><option>bar</option></vaadin7-native-select>";
 
     }
 
@@ -52,7 +52,7 @@ public class NativeSelectDeclarativeTest
 
     @Test
     public void testReadOnlyValue() {
-        String design = "<vaadin-native-select readonly><option selected>foo</option><option>bar</option></vaadin-native-select>";
+        String design = "<vaadin7-native-select readonly><option selected>foo</option><option>bar</option></vaadin7-native-select>";
 
         NativeSelect ns = new NativeSelect();
         ns.addItems("foo", "bar");
@@ -62,7 +62,7 @@ public class NativeSelectDeclarativeTest
         testRead(design, ns);
 
         // Selects items are not written out by default
-        String design2 = "<vaadin-native-select readonly></vaadin-native-select>";
+        String design2 = "<vaadin7-native-select readonly></vaadin7-native-select>";
         testWrite(design2, ns);
     }
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/optiongroup/OptionGroupListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/optiongroup/OptionGroupListenersTest.java
index 2c2a8a81fb..e9863ad92a 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/optiongroup/OptionGroupListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/optiongroup/OptionGroupListenersTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.component.optiongroup;
+package com.vaadin.v7.tests.server.component.optiongroup;
 
 import org.junit.Test;
 
@@ -7,7 +7,7 @@ import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
-import com.vaadin.ui.OptionGroup;
+import com.vaadin.v7.ui.OptionGroup;
 
 public class OptionGroupListenersTest extends AbstractListenerMethodsTestBase {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/optiongroup/OptionGroupStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/optiongroup/OptionGroupStateTest.java
index a6d04576bc..f15c3aeb1e 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/optiongroup/OptionGroupStateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/optiongroup/OptionGroupStateTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.optiongroup;
+package com.vaadin.v7.tests.server.component.optiongroup;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.shared.ui.optiongroup.OptionGroupState;
-import com.vaadin.ui.OptionGroup;
+import com.vaadin.v7.ui.OptionGroup;
 
 /**
  * Tests for OptionGroup state.
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java
index eec1781f81..4e0e06fdd3 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.richtextarea;
+package com.vaadin.v7.tests.server.component.richtextarea;
 
 import org.junit.Test;
 
 import com.vaadin.tests.design.DeclarativeTestBase;
-import com.vaadin.ui.RichTextArea;
+import com.vaadin.v7.ui.RichTextArea;
 
 public class RichTextAreaDeclarativeTest
         extends DeclarativeTestBase<RichTextArea> {
 
     private String getBasicDesign() {
-        return "<vaadin-rich-text-area null-representation='' null-setting-allowed>\n"
+        return "<vaadin7-rich-text-area null-representation='' null-setting-allowed>\n"
                 + "\n      <b>Header</b> <br/>Some text\n      "
-                + "</vaadin-rich-text-area>";
+                + "</vaadin7-rich-text-area>";
     }
 
     private RichTextArea getBasicExpected() {
@@ -49,17 +49,17 @@ public class RichTextAreaDeclarativeTest
 
     @Test
     public void testReadEmpty() {
-        testRead("<vaadin-rich-text-area />", new RichTextArea());
+        testRead("<vaadin7-rich-text-area />", new RichTextArea());
     }
 
     @Test
     public void testWriteEmpty() {
-        testWrite("<vaadin-rich-text-area />", new RichTextArea());
+        testWrite("<vaadin7-rich-text-area />", new RichTextArea());
     }
 
     @Test
     public void testReadOnlyValue() {
-        String design = "<vaadin-rich-text-area readonly style-name='v-richtextarea-readonly'>Hello World!</vaadin-text-area>";
+        String design = "<vaadin7-rich-text-area readonly style-name='v-richtextarea-readonly'>Hello World!</vaadin7-text-area>";
         RichTextArea ta = new RichTextArea();
         ta.setValue("Hello World!");
         ta.setReadOnly(true);
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/richtextarea/RichTextAreaStateTest.java
index feb3b2e7b0..56a60de396 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaStateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/richtextarea/RichTextAreaStateTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.richtextarea;
+package com.vaadin.v7.tests.server.component.richtextarea;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.shared.ui.textarea.RichTextAreaState;
-import com.vaadin.ui.RichTextArea;
+import com.vaadin.v7.ui.RichTextArea;
 
 /**
  * Tests for RichTextArea State.
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/select/SelectListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/select/SelectListenersTest.java
index 1b0ff1caff..469407a516 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/select/SelectListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/select/SelectListenersTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.component.select;
+package com.vaadin.v7.tests.server.component.select;
 
 import org.junit.Test;
 
@@ -7,7 +7,7 @@ import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
-import com.vaadin.ui.Select;
+import com.vaadin.v7.ui.Select;
 
 public class SelectListenersTest extends AbstractListenerMethodsTestBase {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/CacheUpdateExceptionCausesTest.java
index 86bb34145f..ebe6d37dec 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/CacheUpdateExceptionCausesTest.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.vaadin.tests.server.component.table;
+package com.vaadin.v7.tests.server.component.table;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.CacheUpdateException;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.CacheUpdateException;
 
 public class CacheUpdateExceptionCausesTest {
     @Test
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/FooterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/FooterTest.java
index 3df2b8fbcb..b961bc57e9 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/FooterTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/FooterTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.component.table;
+package com.vaadin.v7.tests.server.component.table;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -8,10 +8,10 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
 
 /**
  * Test case for testing the footer API
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/MultipleSelectionTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/MultipleSelectionTest.java
index b29357ea6a..bfd8517358 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/MultipleSelectionTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/MultipleSelectionTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.component.table;
+package com.vaadin.v7.tests.server.component.table;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -8,10 +8,10 @@ import java.util.Set;
 
 import org.junit.Test;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.shared.ui.MultiSelectMode;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
 
 public class MultipleSelectionTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableColumnAlignmentsTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableColumnAlignmentsTest.java
index ff4c8336fb..11fd3429db 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableColumnAlignmentsTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableColumnAlignmentsTest.java
@@ -1,11 +1,11 @@
-package com.vaadin.tests.server.component.table;
+package com.vaadin.v7.tests.server.component.table;
 
 import static org.junit.Assert.assertArrayEquals;
 
 import org.junit.Test;
 
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.Align;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.Align;
 
 public class TableColumnAlignmentsTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableContextClickTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableContextClickTest.java
index 3ee8b76d76..162d57c0da 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableContextClickTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableContextClickTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.table;
+package com.vaadin.v7.tests.server.component.table;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -21,7 +21,7 @@ import org.junit.Test;
 import com.vaadin.event.ContextClickEvent;
 import com.vaadin.event.ContextClickEvent.ContextClickListener;
 import com.vaadin.shared.ui.table.TableConstants.Section;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
 
 public class TableContextClickTest extends Table {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableDeclarativeTest.java
index 53f3d3acb8..a58aa0a1ec 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableDeclarativeTest.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.table;
+package com.vaadin.v7.tests.server.component.table;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.server.ExternalResource;
 import com.vaadin.shared.ui.MultiSelectMode;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.Align;
-import com.vaadin.ui.Table.ColumnHeaderMode;
-import com.vaadin.ui.Table.RowHeaderMode;
-import com.vaadin.ui.Table.TableDragMode;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.Align;
+import com.vaadin.v7.ui.Table.ColumnHeaderMode;
+import com.vaadin.v7.ui.Table.RowHeaderMode;
+import com.vaadin.v7.ui.Table.TableDragMode;
 
 /**
  * Test declarative support for {@link Table}.
@@ -162,13 +162,13 @@ public class TableDeclarativeTest extends TableDeclarativeTestBase {
 
     @Test
     public void testHtmlEntities() {
-        String design = "<v-table>" + "<table>" + "  <colgroup>"
+        String design = "<vaadin7-table>" + "<table>" + "  <colgroup>"
                 + "    <col property-id=\"test\"" + "  </colgroup>"
                 + "  <thead>" + "    <tr><th>&amp; Test</th></tr>"
                 + "  </thead>" + "  <tbody>"
                 + "    <tr item-id=\"test\"><td>&amp; Test</tr>" + "  </tbody>"
                 + "  <tfoot>" + "    <tr><td>&amp; Test</td></tr>"
-                + "  </tfoot>" + "</table>" + "</v-table>";
+                + "  </tfoot>" + "</table>" + "</vaadin7-table>";
         Table read = read(design);
 
         Assert.assertEquals("& Test",
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableDeclarativeTestBase.java
index 7a7b13e933..c8b3e8116b 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableDeclarativeTestBase.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.table;
+package com.vaadin.v7.tests.server.component.table;
 
 import static org.junit.Assert.assertTrue;
 
 import com.vaadin.tests.design.DeclarativeTestBase;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
 
 public abstract class TableDeclarativeTestBase
         extends DeclarativeTestBase<Table> {
@@ -36,7 +36,7 @@ public abstract class TableDeclarativeTestBase
     }
 
     protected String getTag() {
-        return "vaadin-table";
+        return "vaadin7-table";
     }
 
     protected void compareBody(Table read, Table expected) {
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableGeneratorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableGeneratorTest.java
index 6fbe5557f8..bb3afe0c5b 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableGeneratorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableGeneratorTest.java
@@ -1,9 +1,9 @@
-package com.vaadin.tests.server.component.table;
+package com.vaadin.v7.tests.server.component.table;
 
 import org.junit.Test;
 
-import com.vaadin.data.Item;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
 
 public class TableGeneratorTest {
     public static Table createTableWithDefaultContainer(int properties,
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableListenersTest.java
index ac6fb171e3..7f76b1c112 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableListenersTest.java
@@ -1,19 +1,19 @@
-package com.vaadin.tests.server.component.table;
+package com.vaadin.v7.tests.server.component.table;
 
 import org.junit.Test;
 
 import com.vaadin.event.ItemClickEvent;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.ColumnReorderEvent;
-import com.vaadin.ui.Table.ColumnReorderListener;
-import com.vaadin.ui.Table.ColumnResizeEvent;
-import com.vaadin.ui.Table.ColumnResizeListener;
-import com.vaadin.ui.Table.FooterClickEvent;
-import com.vaadin.ui.Table.FooterClickListener;
-import com.vaadin.ui.Table.HeaderClickEvent;
-import com.vaadin.ui.Table.HeaderClickListener;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.ColumnReorderEvent;
+import com.vaadin.v7.ui.Table.ColumnReorderListener;
+import com.vaadin.v7.ui.Table.ColumnResizeEvent;
+import com.vaadin.v7.ui.Table.ColumnResizeListener;
+import com.vaadin.v7.ui.Table.FooterClickEvent;
+import com.vaadin.v7.ui.Table.FooterClickListener;
+import com.vaadin.v7.ui.Table.HeaderClickEvent;
+import com.vaadin.v7.ui.Table.HeaderClickListener;
 
 public class TableListenersTest extends AbstractListenerMethodsTestBase {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TablePropertyValueConverterTest.java
index 5a9297014c..45ab28d687 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TablePropertyValueConverterTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.table;
+package com.vaadin.v7.tests.server.component.table;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -30,12 +30,12 @@ import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.ui.Table;
-import com.vaadin.v7.data.util.converter.LegacyConverter;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.data.util.converter.Converter;
+import com.vaadin.v7.ui.Table;
 
 public class TablePropertyValueConverterTest {
     protected TestableTable table;
@@ -84,20 +84,20 @@ public class TablePropertyValueConverterTest {
                 createContainer(new String[] { "col1", "col2", "col3" },
                         new Class[] { String.class, BaseClass.class,
                                 DerivedClass.class }));
-        customTable.setConverter("col1", new LegacyConverter<String, String>() {
+        customTable.setConverter("col1", new Converter<String, String>() {
             private static final long serialVersionUID = 1L;
 
             @Override
             public String convertToModel(String value,
                     Class<? extends String> targetType, Locale locale)
-                    throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+                    throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
                 return "model";
             }
 
             @Override
             public String convertToPresentation(String value,
                     Class<? extends String> targetType, Locale locale)
-                    throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+                    throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
                 return "presentation";
             }
 
@@ -113,14 +113,14 @@ public class TablePropertyValueConverterTest {
 
         });
         customTable.setConverter("col2",
-                new LegacyConverter<String, BaseClass>() {
+                new Converter<String, BaseClass>() {
                     private static final long serialVersionUID = 1L;
 
                     @Override
                     public BaseClass convertToModel(String value,
                             Class<? extends BaseClass> targetType,
                             Locale locale)
-                            throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+                            throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
                         return new BaseClass("model");
                     }
 
@@ -137,19 +137,19 @@ public class TablePropertyValueConverterTest {
                     @Override
                     public String convertToPresentation(BaseClass value,
                             Class<? extends String> targetType, Locale locale)
-                            throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+                            throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
                         return null;
                     }
                 });
         customTable.setConverter("col3",
-                new LegacyConverter<String, DerivedClass>() {
+                new Converter<String, DerivedClass>() {
                     private static final long serialVersionUID = 1L;
 
                     @Override
                     public DerivedClass convertToModel(String value,
                             Class<? extends DerivedClass> targetType,
                             Locale locale)
-                            throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+                            throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
                         return new DerivedClass("derived" + 1001);
                     }
 
@@ -166,7 +166,7 @@ public class TablePropertyValueConverterTest {
                     @Override
                     public String convertToPresentation(DerivedClass value,
                             Class<? extends String> targetType, Locale locale)
-                            throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+                            throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
                         return null;
                     }
                 });
@@ -192,20 +192,20 @@ public class TablePropertyValueConverterTest {
                         new Class[] { int.class, BaseClass.class,
                                 DerivedClass.class }));
         customTable.setConverter("col1",
-                new LegacyConverter<String, Integer>() {
+                new Converter<String, Integer>() {
                     private static final long serialVersionUID = 1L;
 
                     @Override
                     public Integer convertToModel(String value,
                             Class<? extends Integer> targetType, Locale locale)
-                            throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+                            throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
                         return 11;
                     }
 
                     @Override
                     public String convertToPresentation(Integer value,
                             Class<? extends String> targetType, Locale locale)
-                            throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+                            throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
                         return "presentation";
                     }
 
@@ -235,20 +235,20 @@ public class TablePropertyValueConverterTest {
     public void setUp() {
         table = new TestableTable("Test table",
                 createContainer(new String[] { "col1", "col2", "col3" }));
-        table.setConverter("col1", new LegacyConverter<String, String>() {
+        table.setConverter("col1", new Converter<String, String>() {
             private static final long serialVersionUID = 1L;
 
             @Override
             public String convertToModel(String value,
                     Class<? extends String> targetType, Locale locale)
-                    throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+                    throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
                 return "model";
             }
 
             @Override
             public String convertToPresentation(String value,
                     Class<? extends String> targetType, Locale locale)
-                    throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+                    throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
                 return "presentation";
             }
 
@@ -264,20 +264,20 @@ public class TablePropertyValueConverterTest {
 
         });
 
-        table.setConverter("col2", new LegacyConverter<String, String>() {
+        table.setConverter("col2", new Converter<String, String>() {
             private static final long serialVersionUID = 1L;
 
             @Override
             public String convertToModel(String value,
                     Class<? extends String> targetType, Locale locale)
-                    throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+                    throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
                 return "model2";
             }
 
             @Override
             public String convertToPresentation(String value,
                     Class<? extends String> targetType, Locale locale)
-                    throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+                    throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
                 return "presentation2";
             }
 
@@ -352,10 +352,10 @@ public class TablePropertyValueConverterTest {
                 Field f = Table.class
                         .getDeclaredField("propertyValueConverters");
                 f.setAccessible(true);
-                HashMap<Object, LegacyConverter<String, Object>> pvc = (HashMap<Object, LegacyConverter<String, Object>>) f
+                HashMap<Object, Converter<String, Object>> pvc = (HashMap<Object, Converter<String, Object>>) f
                         .get(this);
                 Set<Object> currentConverters = new HashSet<Object>();
-                for (Entry<Object, LegacyConverter<String, Object>> entry : pvc
+                for (Entry<Object, Converter<String, Object>> entry : pvc
                         .entrySet()) {
                     currentConverters.add(entry.getKey());
                 }
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableSelectableTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableSelectableTest.java
index 906827958f..4e12ed84e0 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableSelectableTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableSelectableTest.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.table;
+package com.vaadin.v7.tests.server.component.table;
 
 import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.Table;
 
 /**
  * Tests for 'selectable' property of {@link Table} class.
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableSerializationTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableSerializationTest.java
index 22f2381980..47f19cce9e 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableSerializationTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableSerializationTest.java
@@ -1,9 +1,9 @@
-package com.vaadin.tests.server.component.table;
+package com.vaadin.v7.tests.server.component.table;
 
 import org.apache.commons.lang.SerializationUtils;
 import org.junit.Test;
 
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
 
 public class TableSerializationTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableStateTest.java
index 43b03c41e8..2c993fe03f 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableStateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableStateTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.table;
+package com.vaadin.v7.tests.server.component.table;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.shared.ui.table.TableState;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
 
 /**
  * Tests for Table State.
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableVisibleColumnsTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableVisibleColumnsTest.java
index f9f6e7f979..244afb7dc5 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableVisibleColumnsTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableVisibleColumnsTest.java
@@ -1,10 +1,10 @@
-package com.vaadin.tests.server.component.table;
+package com.vaadin.v7.tests.server.component.table;
 
 import static org.junit.Assert.assertArrayEquals;
 
 import org.junit.Test;
 
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
 
 public class TableVisibleColumnsTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/textarea/TextAreaDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textarea/TextAreaDeclarativeTest.java
index cbfa33320f..5d0e8e80e4 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/textarea/TextAreaDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textarea/TextAreaDeclarativeTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.textarea;
+package com.vaadin.v7.tests.server.component.textarea;
 
 import java.io.IOException;
 
@@ -23,8 +23,8 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.tests.design.DeclarativeTestBase;
-import com.vaadin.ui.TextArea;
 import com.vaadin.ui.declarative.DesignContext;
+import com.vaadin.v7.ui.TextArea;
 
 /**
  * Tests declarative support for implementations of {@link TextArea}.
@@ -36,7 +36,7 @@ public class TextAreaDeclarativeTest extends DeclarativeTestBase<TextArea> {
 
     @Test
     public void testTextArea() {
-        String design = "<vaadin-text-area rows=6 wordwrap=false>Hello World!</vaadin-text-area>";
+        String design = "<vaadin7-text-area rows=6 wordwrap=false>Hello World!</vaadin7-text-area>";
         TextArea ta = new TextArea();
         ta.setRows(6);
         ta.setWordwrap(false);
@@ -47,7 +47,7 @@ public class TextAreaDeclarativeTest extends DeclarativeTestBase<TextArea> {
 
     @Test
     public void testHtmlEntities() throws IOException {
-        String design = "<vaadin-text-area>&amp; Test</vaadin-text-area>";
+        String design = "<vaadin7-text-area>&amp; Test</vaadin7-text-area>";
         TextArea read = read(design);
         Assert.assertEquals("& Test", read.getValue());
 
@@ -62,7 +62,7 @@ public class TextAreaDeclarativeTest extends DeclarativeTestBase<TextArea> {
 
     @Test
     public void testReadOnlyValue() {
-        String design = "<vaadin-text-area readonly rows=6 wordwrap=false>Hello World!</vaadin-text-area>";
+        String design = "<vaadin7-text-area readonly rows=6 wordwrap=false>Hello World!</vaadin7-text-area>";
         TextArea ta = new TextArea();
         ta.setRows(6);
         ta.setWordwrap(false);
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java
index caea12d024..9c5020490d 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java
@@ -1,21 +1,21 @@
-package com.vaadin.tests.server.component.textfield;
+package com.vaadin.v7.tests.server.component.textfield;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.tests.data.converter.ConverterFactoryTest.ConvertTo42;
-import com.vaadin.v7.data.validator.LegacyRangeValidator;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.data.validator.RangeValidator;
+import com.vaadin.v7.ui.TextField;
 
 public class TextFieldWithConverterAndValidatorTest {
 
-    private LegacyTextField field;
+    private TextField field;
     private ObjectProperty<Integer> property;
 
     @Before
     public void setUp() {
-        field = new LegacyTextField();
+        field = new TextField();
         field.setInvalidAllowed(false);
     }
 
@@ -25,7 +25,7 @@ public class TextFieldWithConverterAndValidatorTest {
         field.setConverter(new ConvertTo42());
         field.setPropertyDataSource(property);
 
-        field.addValidator(new LegacyRangeValidator<Integer>("Incorrect value",
+        field.addValidator(new RangeValidator<Integer>("Incorrect value",
                 Integer.class, 42, 42));
 
         // succeeds
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldWithPropertyFormatterTest.java
index 633269a0ab..7c723db760 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatterTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldWithPropertyFormatterTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.component.textfield;
+package com.vaadin.v7.tests.server.component.textfield;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -8,12 +8,12 @@ import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.data.util.PropertyFormatter;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.data.util.PropertyFormatter;
+import com.vaadin.v7.ui.TextField;
 
 public class TextFieldWithPropertyFormatterTest {
 
@@ -21,7 +21,7 @@ public class TextFieldWithPropertyFormatterTest {
     private static final String PARSED_VALUE = "BAR";
     private static final String FORMATTED_VALUE = "FOOBAR";
     private static final String ORIGINAL_VALUE = "Original";
-    private LegacyTextField field;
+    private TextField field;
     private PropertyFormatter<String> formatter;
     private ObjectProperty<String> property;
     private ValueChangeListener listener;
@@ -31,7 +31,7 @@ public class TextFieldWithPropertyFormatterTest {
     @Before
     public void setUp() {
 
-        field = new LegacyTextField() {
+        field = new TextField() {
             @Override
             public void markAsDirty() {
                 repainted++;
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldWithValidatorTest.java
index 6fc2108b63..bbbe41c24b 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldWithValidatorTest.java
@@ -1,27 +1,27 @@
-package com.vaadin.tests.server.component.textfield;
+package com.vaadin.v7.tests.server.component.textfield;
 
 import static org.junit.Assert.fail;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.v7.data.Validator;
 import com.vaadin.v7.data.Validator.InvalidValueException;
-import com.vaadin.v7.data.validator.LegacyEmailValidator;
-import com.vaadin.v7.data.validator.LegacyRegexpValidator;
-import com.vaadin.v7.data.validator.LegacyStringLengthValidator;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.data.validator.EmailValidator;
+import com.vaadin.v7.data.validator.RegexpValidator;
+import com.vaadin.v7.data.validator.StringLengthValidator;
+import com.vaadin.v7.ui.TextField;
 
 public class TextFieldWithValidatorTest {
 
-    private LegacyTextField field;
+    private TextField field;
     private ObjectProperty<String> property;
 
     @Before
     public void setUp() {
 
-        field = new LegacyTextField();
+        field = new TextField();
         field.setInvalidAllowed(false);
         property = new ObjectProperty<String>("original");
         field.setPropertyDataSource(property);
@@ -29,9 +29,9 @@ public class TextFieldWithValidatorTest {
 
     @Test
     public void testMultipleValidators() {
-        field.addValidator(new LegacyStringLengthValidator(
+        field.addValidator(new StringLengthValidator(
                 "Length not between 1 and 3", 1, 3, false));
-        field.addValidator(new LegacyStringLengthValidator(
+        field.addValidator(new StringLengthValidator(
                 "Length not between 2 and 4", 2, 4, false));
 
         // fails
@@ -54,9 +54,9 @@ public class TextFieldWithValidatorTest {
 
     @Test
     public void testRemoveValidator() {
-        Validator validator1 = new LegacyStringLengthValidator(
+        Validator validator1 = new StringLengthValidator(
                 "Length not between 1 and 3", 1, 3, false);
-        Validator validator2 = new LegacyStringLengthValidator(
+        Validator validator2 = new StringLengthValidator(
                 "Length not between 2 and 4", 2, 4, false);
 
         field.addValidator(validator1);
@@ -78,9 +78,9 @@ public class TextFieldWithValidatorTest {
 
     @Test
     public void testRemoveAllValidators() {
-        Validator validator1 = new LegacyStringLengthValidator(
+        Validator validator1 = new StringLengthValidator(
                 "Length not between 1 and 3", 1, 3, false);
-        Validator validator2 = new LegacyStringLengthValidator(
+        Validator validator2 = new StringLengthValidator(
                 "Length not between 2 and 4", 2, 4, false);
 
         field.addValidator(validator1);
@@ -95,7 +95,7 @@ public class TextFieldWithValidatorTest {
 
     @Test
     public void testEmailValidator() {
-        field.addValidator(new LegacyEmailValidator("Invalid e-mail address"));
+        field.addValidator(new EmailValidator("Invalid e-mail address"));
 
         // not required
 
@@ -152,7 +152,7 @@ public class TextFieldWithValidatorTest {
 
     @Test
     public void testRegexpValidator() {
-        field.addValidator(new LegacyRegexpValidator("pattern", true,
+        field.addValidator(new RegexpValidator("pattern", true,
                 "Validation failed"));
         field.setRequired(false);
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/ListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/ListenersTest.java
index ade24a0df6..3264ba1f03 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/ListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/ListenersTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.component.tree;
+package com.vaadin.v7.tests.server.component.tree;
 
 import static org.junit.Assert.assertEquals;
 
@@ -8,11 +8,11 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.Tree.CollapseEvent;
-import com.vaadin.ui.Tree.CollapseListener;
-import com.vaadin.ui.Tree.ExpandEvent;
-import com.vaadin.ui.Tree.ExpandListener;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.Tree.CollapseEvent;
+import com.vaadin.v7.ui.Tree.CollapseListener;
+import com.vaadin.v7.ui.Tree.ExpandEvent;
+import com.vaadin.v7.ui.Tree.ExpandListener;
 
 public class ListenersTest implements ExpandListener, CollapseListener {
     private int expandCalled;
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeDeclarativeTest.java
index 1e73f953b2..cfb48427bf 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeDeclarativeTest.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.tree;
+package com.vaadin.v7.tests.server.component.tree;
 
 import org.junit.Test;
 
 import com.vaadin.server.ExternalResource;
 import com.vaadin.tests.design.DeclarativeTestBase;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.Tree.TreeDragMode;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.Tree.TreeDragMode;
 
 /**
  * Tests the declarative support for implementations of {@link Tree}.
@@ -32,7 +32,7 @@ public class TreeDeclarativeTest extends DeclarativeTestBase<Tree> {
 
     @Test
     public void testDragMode() {
-        String design = "<vaadin-tree drag-mode='node' />";
+        String design = "<vaadin7-tree drag-mode='node' />";
 
         Tree tree = new Tree();
         tree.setDragMode(TreeDragMode.NODE);
@@ -43,13 +43,13 @@ public class TreeDeclarativeTest extends DeclarativeTestBase<Tree> {
 
     @Test
     public void testEmpty() {
-        testRead("<vaadin-tree />", new Tree());
-        testWrite("<vaadin-tree />", new Tree());
+        testRead("<vaadin7-tree />", new Tree());
+        testWrite("<vaadin7-tree />", new Tree());
     }
 
     @Test
     public void testNodes() {
-        String design = "<vaadin-tree>" //
+        String design = "<vaadin7-tree>" //
                 + "  <node text='Node'/>" //
                 + "  <node text='Parent'>" //
                 + "    <node text='Child'>" //
@@ -57,7 +57,7 @@ public class TreeDeclarativeTest extends DeclarativeTestBase<Tree> {
                 + "    </node>" //
                 + "  </node>" //
                 + "  <node text='With icon' icon='http://example.com/icon.png'/>" //
-                + "</vaadin-tree>";
+                + "</vaadin7-tree>";
 
         Tree tree = new Tree();
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/TreeListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeListenersTest.java
index ec10c4fe39..a7831dc628 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/TreeListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeListenersTest.java
@@ -1,15 +1,15 @@
-package com.vaadin.tests.server.component.tree;
+package com.vaadin.v7.tests.server.component.tree;
 
 import org.junit.Test;
 
 import com.vaadin.event.ItemClickEvent;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.Tree.CollapseEvent;
-import com.vaadin.ui.Tree.CollapseListener;
-import com.vaadin.ui.Tree.ExpandEvent;
-import com.vaadin.ui.Tree.ExpandListener;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.Tree.CollapseEvent;
+import com.vaadin.v7.ui.Tree.CollapseListener;
+import com.vaadin.v7.ui.Tree.ExpandEvent;
+import com.vaadin.v7.ui.Tree.ExpandListener;
 
 public class TreeListenersTest extends AbstractListenerMethodsTestBase {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/TreeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeTest.java
index ed455415ea..04673af2bd 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/TreeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.server.component.tree;
+package com.vaadin.v7.tests.server.component.tree;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -12,11 +12,11 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.util.HierarchicalContainer;
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.shared.ui.tree.TreeState;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Tree;
 
 public class TreeTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/EmptyTreeTableTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/EmptyTreeTableTest.java
index 2a667bea72..dcde70c122 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/EmptyTreeTableTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/EmptyTreeTableTest.java
@@ -1,10 +1,10 @@
-package com.vaadin.tests.server.component.treetable;
+package com.vaadin.v7.tests.server.component.treetable;
 
 import static org.junit.Assert.assertFalse;
 
 import org.junit.Test;
 
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.ui.TreeTable;
 
 public class EmptyTreeTableTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableDeclarativeTest.java
index eb25bcb0aa..302a42a8af 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableDeclarativeTest.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.treetable;
+package com.vaadin.v7.tests.server.component.treetable;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.tests.server.component.table.TableDeclarativeTest;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.TreeTable;
 import com.vaadin.ui.declarative.DesignException;
+import com.vaadin.v7.tests.server.component.table.TableDeclarativeTest;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TreeTable;
 
 /**
  * Test declarative support for {@link TreeTable}.
@@ -33,7 +33,7 @@ public class TreeTableDeclarativeTest extends TableDeclarativeTest {
 
     @Test
     public void testAttributes() {
-        String design = "<vaadin-tree-table animations-enabled>";
+        String design = "<vaadin7-tree-table animations-enabled>";
         TreeTable table = getTable();
         table.setAnimationsEnabled(true);
 
@@ -43,7 +43,7 @@ public class TreeTableDeclarativeTest extends TableDeclarativeTest {
 
     @Test
     public void testHierarchy() {
-        String design = "<vaadin-tree-table>" //
+        String design = "<vaadin7-tree-table>" //
                 + "<table>" //
                 + "<colgroup><col property-id=''></colgroup>" //
                 + "<tbody>" //
@@ -57,7 +57,7 @@ public class TreeTableDeclarativeTest extends TableDeclarativeTest {
                 + "    <tr depth=1 item-id='2.1'><td></tr>" //
                 + "</tbody>" //
                 + "</table>" //
-                + "</vaadin-tree-table>";
+                + "</vaadin7-tree-table>";
 
         TreeTable table = getTable();
         table.addContainerProperty("", String.class, "");
@@ -83,7 +83,7 @@ public class TreeTableDeclarativeTest extends TableDeclarativeTest {
 
     @Test
     public void testCollapsed() {
-        String design = "<vaadin-tree-table>" //
+        String design = "<vaadin7-tree-table>" //
                 + "  <table>" //
                 + "    <colgroup><col property-id=''></colgroup>" //
                 + "    <tbody>" //
@@ -92,7 +92,7 @@ public class TreeTableDeclarativeTest extends TableDeclarativeTest {
                 + "          <tr depth=2 item-id='1.1.1'><td></tr>" //
                 + "    </tbody>" //
                 + "  </table>" //
-                + "</vaadin-tree-table>";
+                + "</vaadin7-tree-table>";
 
         TreeTable table = getTable();
         table.addContainerProperty("", String.class, "");
@@ -116,12 +116,12 @@ public class TreeTableDeclarativeTest extends TableDeclarativeTest {
     }
 
     protected void assertMalformed(String hierarchy) {
-        String design = "<vaadin-tree-table>" //
+        String design = "<vaadin7-tree-table>" //
                 + "  <table>" //
                 + "    <colgroup><col property-id=''></colgroup>" //
                 + "    <tbody>" + hierarchy + "</tbody>" //
                 + "  </table>" //
-                + "</vaadin-tree-table>";
+                + "</vaadin7-tree-table>";
 
         try {
             read(design);
@@ -151,6 +151,6 @@ public class TreeTableDeclarativeTest extends TableDeclarativeTest {
 
     @Override
     protected String getTag() {
-        return "vaadin-tree-table";
+        return "vaadin7-tree-table";
     }
 }
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNullTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableSetContainerNullTest.java
index 9718d24f8c..c8398a6f50 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNullTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableSetContainerNullTest.java
@@ -1,8 +1,8 @@
-package com.vaadin.tests.server.component.treetable;
+package com.vaadin.v7.tests.server.component.treetable;
 
 import org.junit.Test;
 
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.ui.TreeTable;
 
 public class TreeTableSetContainerNullTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableTest.java
index 4706ec1413..a6948256df 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.treetable;
+package com.vaadin.v7.tests.server.component.treetable;
 
 import java.util.EnumSet;
 
@@ -21,8 +21,8 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.shared.ui.treetable.TreeTableState;
-import com.vaadin.ui.Table.RowHeaderMode;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.ui.Table.RowHeaderMode;
+import com.vaadin.v7.ui.TreeTable;
 
 /**
  * Tests for {@link TreeTable}
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java
index 02a2ebfd77..a8ec104265 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.twincolselect;
+package com.vaadin.v7.tests.server.component.twincolselect;
 
 import java.util.Arrays;
 
 import org.junit.Test;
 
 import com.vaadin.tests.design.DeclarativeTestBase;
-import com.vaadin.ui.TwinColSelect;
+import com.vaadin.v7.ui.TwinColSelect;
 
 /**
  * Test cases for reading the properties of selection components.
@@ -31,11 +31,11 @@ public class TwinColSelectDeclarativeTest
         extends DeclarativeTestBase<TwinColSelect> {
 
     public String getBasicDesign() {
-        return "<vaadin-twin-col-select rows=5 right-column-caption='Selected values' left-column-caption='Unselected values'>\n"
+        return "<vaadin7-twin-col-select rows=5 right-column-caption='Selected values' left-column-caption='Unselected values'>\n"
                 + "        <option>First item</option>\n"
                 + "        <option selected>Second item</option>\n"
                 + "        <option selected>Third item</option>\n"
-                + "</vaadin-twin-col-select>";
+                + "</vaadin7-twin-col-select>";
 
     }
 
@@ -63,12 +63,12 @@ public class TwinColSelectDeclarativeTest
 
     @Test
     public void testReadEmpty() {
-        testRead("<vaadin-twin-col-select />", new TwinColSelect());
+        testRead("<vaadin7-twin-col-select />", new TwinColSelect());
     }
 
     @Test
     public void testWriteEmpty() {
-        testWrite("<vaadin-twin-col-select />", new TwinColSelect());
+        testWrite("<vaadin7-twin-col-select />", new TwinColSelect());
     }
 
 }
\ No newline at end of file
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/twincolselect/TwinColSelectStateTest.java
index 9348de63c2..7479d3f8e6 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/twincolselect/TwinColSelectStateTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.twincolselect;
+package com.vaadin.v7.tests.server.component.twincolselect;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.shared.ui.twincolselect.TwinColSelectState;
-import com.vaadin.ui.TwinColSelect;
+import com.vaadin.v7.ui.TwinColSelect;
 
 /**
  * Tests for TwinColSelectState.
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/components/ComboBoxValueChangeTest.java
index 66a4ec2370..51007e0f8e 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/components/ComboBoxValueChangeTest.java
@@ -1,12 +1,13 @@
-package com.vaadin.tests.server.components;
+package com.vaadin.v7.tests.server.components;
 
 import org.junit.Before;
 
 import com.vaadin.server.ServerRpcManager;
 import com.vaadin.server.ServerRpcMethodInvocation;
 import com.vaadin.shared.ui.combobox.ComboBoxServerRpc;
-import com.vaadin.ui.ComboBox;
-import com.vaadin.v7.ui.LegacyAbstractField;
+import com.vaadin.tests.server.components.AbstractFieldValueChangeTestBase;
+import com.vaadin.v7.ui.AbstractField;
+import com.vaadin.v7.ui.ComboBox;
 
 /**
  * Check that the value change listener for a combo box is triggered exactly
@@ -30,7 +31,7 @@ public class ComboBoxValueChangeTest
     }
 
     @Override
-    protected void setValue(LegacyAbstractField<Object> field) {
+    protected void setValue(AbstractField<Object> field) {
         ComboBox combo = (ComboBox) field;
         ServerRpcMethodInvocation invocation = new ServerRpcMethodInvocation(
                 combo.getConnectorId(), ComboBoxServerRpc.class,
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/renderer/ImageRendererTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/renderer/ImageRendererTest.java
index 822a2353ac..e3bfd32111 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/renderer/ImageRendererTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/renderer/ImageRendererTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.renderer;
+package com.vaadin.v7.tests.server.renderer;
 
 import static org.junit.Assert.assertEquals;
 
@@ -28,9 +28,9 @@ import com.vaadin.server.ExternalResource;
 import com.vaadin.server.FileResource;
 import com.vaadin.server.FontAwesome;
 import com.vaadin.server.ThemeResource;
-import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.UI;
-import com.vaadin.ui.renderers.ImageRenderer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.renderers.ImageRenderer;
 
 import elemental.json.JsonObject;
 import elemental.json.JsonValue;
@@ -44,7 +44,7 @@ public class ImageRendererTest {
         UI mockUI = EasyMock.createNiceMock(UI.class);
         EasyMock.replay(mockUI);
 
-        LegacyGrid grid = new LegacyGrid();
+        Grid grid = new Grid();
         grid.setParent(mockUI);
 
         renderer = new ImageRenderer();
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/renderer/RendererTest.java
index 5eec5b6ea8..cb1b1bd918 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/renderer/RendererTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.renderer;
+package com.vaadin.v7.tests.server.renderer;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -25,21 +25,21 @@ import java.util.Locale;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.server.VaadinSession;
-import com.vaadin.tests.server.component.grid.TestGrid;
 import com.vaadin.tests.util.AlwaysLockedVaadinSession;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
-import com.vaadin.ui.LegacyGrid.Column;
-import com.vaadin.ui.renderers.ButtonRenderer;
-import com.vaadin.ui.renderers.DateRenderer;
-import com.vaadin.ui.renderers.HtmlRenderer;
-import com.vaadin.ui.renderers.NumberRenderer;
-import com.vaadin.ui.renderers.TextRenderer;
-import com.vaadin.v7.data.util.converter.LegacyConverter;
-import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.data.util.converter.Converter;
+import com.vaadin.v7.data.util.converter.StringToIntegerConverter;
+import com.vaadin.v7.tests.server.component.grid.TestGrid;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.AbstractRenderer;
+import com.vaadin.v7.ui.Grid.Column;
+import com.vaadin.v7.ui.renderers.ButtonRenderer;
+import com.vaadin.v7.ui.renderers.DateRenderer;
+import com.vaadin.v7.ui.renderers.HtmlRenderer;
+import com.vaadin.v7.ui.renderers.NumberRenderer;
+import com.vaadin.v7.ui.renderers.TextRenderer;
 
 import elemental.json.JsonValue;
 
@@ -66,7 +66,7 @@ public class RendererTest {
     }
 
     private static class TestConverter
-            implements LegacyConverter<String, TestBean> {
+            implements Converter<String, TestBean> {
 
         @Override
         public TestBean convertToModel(String value,
@@ -98,7 +98,7 @@ public class RendererTest {
         }
     }
 
-    private LegacyGrid grid;
+    private Grid grid;
 
     private Column intColumn;
     private Column textColumn;
@@ -151,7 +151,7 @@ public class RendererTest {
     @Test
     public void testDefaultRendererAndConverter() throws Exception {
         assertSame(TextRenderer.class, intColumn.getRenderer().getClass());
-        assertSame(LegacyStringToIntegerConverter.class,
+        assertSame(StringToIntegerConverter.class,
                 intColumn.getConverter().getClass());
 
         assertSame(TextRenderer.class, textColumn.getRenderer().getClass());
@@ -166,7 +166,7 @@ public class RendererTest {
     @Test
     public void testFindCompatibleConverter() throws Exception {
         intColumn.setRenderer(renderer());
-        assertSame(LegacyStringToIntegerConverter.class,
+        assertSame(StringToIntegerConverter.class,
                 intColumn.getConverter().getClass());
 
         textColumn.setRenderer(renderer());
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/validation/BeanValidationTest.java
index a8e6238d4b..990acbab61 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/validation/BeanValidationTest.java
@@ -1,60 +1,60 @@
-package com.vaadin.tests.server.validation;
+package com.vaadin.v7.tests.server.validation;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.fieldgroup.BeanFieldGroup;
 import com.vaadin.tests.data.bean.BeanToValidate;
 import com.vaadin.v7.data.Validator.InvalidValueException;
-import com.vaadin.v7.data.validator.LegacyBeanValidator;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.data.fieldgroup.BeanFieldGroup;
+import com.vaadin.v7.data.validator.BeanValidator;
+import com.vaadin.v7.ui.Field;
 
 public class BeanValidationTest {
     @Test(expected = InvalidValueException.class)
     public void testBeanValidationNull() {
-        LegacyBeanValidator validator = new LegacyBeanValidator(
+        BeanValidator validator = new BeanValidator(
                 BeanToValidate.class, "firstname");
         validator.validate(null);
     }
 
     @Test(expected = InvalidValueException.class)
     public void testBeanValidationStringTooShort() {
-        LegacyBeanValidator validator = new LegacyBeanValidator(
+        BeanValidator validator = new BeanValidator(
                 BeanToValidate.class, "firstname");
         validator.validate("aa");
     }
 
     @Test
     public void testBeanValidationStringOk() {
-        LegacyBeanValidator validator = new LegacyBeanValidator(
+        BeanValidator validator = new BeanValidator(
                 BeanToValidate.class, "firstname");
         validator.validate("aaa");
     }
 
     @Test(expected = InvalidValueException.class)
     public void testBeanValidationIntegerTooSmall() {
-        LegacyBeanValidator validator = new LegacyBeanValidator(
+        BeanValidator validator = new BeanValidator(
                 BeanToValidate.class, "age");
         validator.validate(17);
     }
 
     @Test
     public void testBeanValidationIntegerOk() {
-        LegacyBeanValidator validator = new LegacyBeanValidator(
+        BeanValidator validator = new BeanValidator(
                 BeanToValidate.class, "age");
         validator.validate(18);
     }
 
     @Test(expected = InvalidValueException.class)
     public void testBeanValidationTooManyDigits() {
-        LegacyBeanValidator validator = new LegacyBeanValidator(
+        BeanValidator validator = new BeanValidator(
                 BeanToValidate.class, "decimals");
         validator.validate("1234.567");
     }
 
     @Test
     public void testBeanValidationDigitsOk() {
-        LegacyBeanValidator validator = new LegacyBeanValidator(
+        BeanValidator validator = new BeanValidator(
                 BeanToValidate.class, "decimals");
         validator.validate("123.45");
     }
@@ -62,7 +62,7 @@ public class BeanValidationTest {
     @Test
     public void testBeanValidationException_OneValidationError() {
         InvalidValueException[] causes = null;
-        LegacyBeanValidator validator = new LegacyBeanValidator(
+        BeanValidator validator = new BeanValidator(
                 BeanToValidate.class, "lastname");
         try {
             validator.validate(null);
@@ -76,7 +76,7 @@ public class BeanValidationTest {
     @Test
     public void testBeanValidationsException_TwoValidationErrors() {
         InvalidValueException[] causes = null;
-        LegacyBeanValidator validator = new LegacyBeanValidator(
+        BeanValidator validator = new BeanValidator(
                 BeanToValidate.class, "nickname");
         try {
             validator.validate("A");
@@ -97,7 +97,7 @@ public class BeanValidationTest {
         beanToValidate.setFirstname("a");
         fieldGroup.setItemDataSource(beanToValidate);
 
-        LegacyField<?> nameField = fieldGroup.buildAndBind("firstname");
+        Field<?> nameField = fieldGroup.buildAndBind("firstname");
         Assert.assertEquals(1, nameField.getValidators().size());
 
         try {
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/validation/RangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/validation/RangeValidatorTest.java
index 1d5032e956..98e9c56eae 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/validation/RangeValidatorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/validation/RangeValidatorTest.java
@@ -1,11 +1,11 @@
-package com.vaadin.tests.server.validation;
+package com.vaadin.v7.tests.server.validation;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator;
+import com.vaadin.v7.data.validator.IntegerRangeValidator;
 
 public class RangeValidatorTest {
 
@@ -14,7 +14,7 @@ public class RangeValidatorTest {
     // RangeValidator
     @Test
     public void testMinValueNonInclusive() {
-        LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator(
+        IntegerRangeValidator iv = new IntegerRangeValidator(
                 "Failed", 0, 10);
         iv.setMinValueIncluded(false);
         assertFalse(iv.isValid(0));
@@ -25,7 +25,7 @@ public class RangeValidatorTest {
 
     @Test
     public void testMinMaxValuesInclusive() {
-        LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator(
+        IntegerRangeValidator iv = new IntegerRangeValidator(
                 "Failed", 0, 10);
         assertTrue(iv.isValid(0));
         assertTrue(iv.isValid(1));
@@ -36,7 +36,7 @@ public class RangeValidatorTest {
 
     @Test
     public void testMaxValueNonInclusive() {
-        LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator(
+        IntegerRangeValidator iv = new IntegerRangeValidator(
                 "Failed", 0, 10);
         iv.setMaxValueIncluded(false);
         assertTrue(iv.isValid(0));
@@ -48,7 +48,7 @@ public class RangeValidatorTest {
 
     @Test
     public void testMinMaxValuesNonInclusive() {
-        LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator(
+        IntegerRangeValidator iv = new IntegerRangeValidator(
                 "Failed", 0, 10);
         iv.setMinValueIncluded(false);
         iv.setMaxValueIncluded(false);
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/validation/ReadOnlyValidationTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/validation/ReadOnlyValidationTest.java
new file mode 100644
index 0000000000..c21ce5b190
--- /dev/null
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/validation/ReadOnlyValidationTest.java
@@ -0,0 +1,17 @@
+package com.vaadin.v7.tests.server.validation;
+
+import org.junit.Test;
+
+import com.vaadin.v7.data.validator.IntegerValidator;
+import com.vaadin.v7.ui.TextField;
+
+public class ReadOnlyValidationTest {
+
+    @Test
+    public void testIntegerValidation() {
+        TextField field = new TextField();
+        field.addValidator(new IntegerValidator("Enter a Valid Number"));
+        field.setValue(String.valueOf(10));
+        field.validate();
+    }
+}
diff --git a/compatibility-server/src/test/java/com/vaadin/ui/AbsSelectTest.java b/compatibility-server/src/test/java/com/vaadin/v7/ui/AbsSelectTest.java
index 51556f9e1a..518ee484cc 100644
--- a/compatibility-server/src/test/java/com/vaadin/ui/AbsSelectTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/ui/AbsSelectTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -21,7 +21,7 @@ import java.util.HashSet;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.v7.data.util.ObjectProperty;
 
 public class AbsSelectTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/ui/NativeSelectTest.java b/compatibility-server/src/test/java/com/vaadin/v7/ui/NativeSelectTest.java
index 1a41fc1097..a5ff142490 100644
--- a/compatibility-server/src/test/java/com/vaadin/ui/NativeSelectTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/ui/NativeSelectTest.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.util.Collections;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.shared.ui.select.AbstractSelectState;
+import com.vaadin.v7.data.util.IndexedContainer;
 
 public class NativeSelectTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/ui/RichTextAreaTest.java b/compatibility-server/src/test/java/com/vaadin/v7/ui/RichTextAreaTest.java
index 8b6b2d011e..9d4bb9468e 100644
--- a/compatibility-server/src/test/java/com/vaadin/ui/RichTextAreaTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/ui/RichTextAreaTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.v7.data.util.ObjectProperty;
 
 public class RichTextAreaTest {
     @Test
diff --git a/compatibility-server/src/test/java/com/vaadin/ui/TableTest.java b/compatibility-server/src/test/java/com/vaadin/v7/ui/TableTest.java
index f09313f685..9683c82424 100644
--- a/compatibility-server/src/test/java/com/vaadin/ui/TableTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/ui/TableTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.util.Collection;
 
@@ -21,7 +21,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.util.BeanItemContainerGenerator;
+import com.vaadin.v7.data.util.BeanItemContainerGenerator;
 
 public class TableTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/ui/TextAreaTest.java b/compatibility-server/src/test/java/com/vaadin/v7/ui/TextAreaTest.java
index 07bce554df..23b6f9f593 100644
--- a/compatibility-server/src/test/java/com/vaadin/ui/TextAreaTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/ui/TextAreaTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.v7.data.util.ObjectProperty;
 
 public class TextAreaTest {
     @Test
diff --git a/compatibility-server/src/test/resources/com/vaadin/tests/design/all-components-legacy.html b/compatibility-server/src/test/resources/com/vaadin/v7/tests/design/all-components-legacy.html
index 39aecb6db1..45496c0965 100644
--- a/compatibility-server/src/test/resources/com/vaadin/tests/design/all-components-legacy.html
+++ b/compatibility-server/src/test/resources/com/vaadin/v7/tests/design/all-components-legacy.html
@@ -17,40 +17,40 @@
 	  <!--  vertical layout -->
       <v-vertical-layout spacing margin>
 		<v-button :top>OK</v-button>
-		<v-table size-full :expand=1 />      
+		<vaadin7-table size-full :expand=1 />      
       </v-vertical-layout>
       
 	  <!--  horizontal layout -->
       <v-horizontal-layout spacing margin>
 		<v-button :top>OK</v-button>
-		<v-table size-full :expand=1 />      
+		<vaadin7-table size-full :expand=1 />      
       </v-horizontal-layout>
       
 	  <!--  form layout -->
       <v-form-layout spacing margin>
 		<v-button :top>OK</v-button>
-		<v-table size-full :expand=1 />      
+		<vaadin7-table size-full :expand=1 />      
       </v-form-layout>
 
 	  <!--  css layout -->
       <v-css-layout>
 		<v-button>OK</v-button>
-		<v-table size-full />
+		<vaadin7-table size-full />
       </v-css-layout>
       
       <!--  panel  -->
       <v-panel caption="Hello world" tabindex=2 scroll-left="10" scroll-top="10">
-        <v-table size-full />
+        <vaadin7-table size-full />
       </v-panel>
       
       <!--  abstract field -->
-	  <v-text-field buffered validation-visible=false invalid-committed invalid-allowed=false required required-error="This is a required field" conversion-error="Input {0} cannot be parsed" tabindex=3 readonly />
+	  <vaadin7-text-field buffered validation-visible=false invalid-committed invalid-allowed=false required required-error="This is a required field" conversion-error="Input {0} cannot be parsed" tabindex=3 readonly />
       <!--  abstract text field, text field -->
-      <v-text-field null-representation="" null-setting-allowed maxlength=10 columns=5 input-prompt="Please enter a value" text-change-event-mode="eager" text-change-timeout=2 value="foo" />
+      <vaadin7-text-field null-representation="" null-setting-allowed maxlength=10 columns=5 input-prompt="Please enter a value" text-change-event-mode="eager" text-change-timeout=2 value="foo" />
 	  <!--  password field -->      
-      <v-password-field null-representation="" null-setting-allowed maxlength=10 columns=5 input-prompt="Please enter a value" text-change-event-mode="eager" text-change-timeout=2 value="foo" />
+      <vaadin7-password-field null-representation="" null-setting-allowed maxlength=10 columns=5 input-prompt="Please enter a value" text-change-event-mode="eager" text-change-timeout=2 value="foo" />
       <!--  text area -->
-      <v-text-area rows=5 wordwrap=false >test value</v-text-area>
+      <vaadin7-text-area rows=5 wordwrap=false >test value</vaadin7-text-area>
       <!--  button -->
       <v-button click-shortcut="ctrl-shift-o" disable-on-click tabindex=1 icon="http://vaadin.com/image.png" icon-alt="ok" plain-text>OK</v-button>
       <!--  native button -->
@@ -67,7 +67,7 @@
 			<v-button>In disabled tab - can’t be shown by default</v-button>
 	      </tab>
 		  <tab icon="theme://../runo/icons/16/ok.png" icon-alt="Ok png from Runo - very helpful" description="Click to show a text field" style-name="red" id="uniqueDomId">
-			<v-text-field input-prompt="Icon only in tab" />
+			<vaadin7-text-field input-prompt="Icon only in tab" />
 	      </tab>
 	   </v-tab-sheet>
 
@@ -82,7 +82,7 @@
 			<v-button>In disabled tab - can’t be shown by default</v-button>
 	      </tab>
 		  <tab icon="theme://../runo/icons/16/ok.png" icon-alt="Ok png from Runo - very helpful" description="Click to show a text field" style-name="red" id="uniqueDomId">
-			<v-text-field input-prompt="Icon only in tab" />
+			<vaadin7-text-field input-prompt="Icon only in tab" />
 	      </tab>
 	   </v-accordion>
 
@@ -107,15 +107,15 @@
 	 <v-check-box checked/>	 
 
      <!-- abstract select -->
-     <v-list-select new-items-allowed multi-select
+     <vaadin7-list-select new-items-allowed multi-select
        item-caption-mode="index"
        null-selection-allowed=false>
-     </v-list-select>
+     </vaadin7-list-select>
 
-     <v-combo-box>
+     <vaadin7-combo-box>
        <option icon="http://something/my-icon.png">First value</option>
        <option>Second value</option>
-     </v-combo-box>
+     </vaadin7-combo-box>
 
   </v-vertical-layout>
  </body>
diff --git a/compatibility-server/src/test/resources/com/vaadin/tests/design/all-components.html b/compatibility-server/src/test/resources/com/vaadin/v7/tests/design/all-components.html
index 6507188cd7..45a4e3bc31 100644
--- a/compatibility-server/src/test/resources/com/vaadin/tests/design/all-components.html
+++ b/compatibility-server/src/test/resources/com/vaadin/v7/tests/design/all-components.html
@@ -17,30 +17,30 @@
 	  <!--  vertical layout -->
       <vaadin-vertical-layout spacing margin>
 		<vaadin-button :top>OK</vaadin-button>
-		<vaadin-table size-full :expand=1 />      
+		<vaadin7-table size-full :expand=1 />      
       </vaadin-vertical-layout>
       
 	  <!--  horizontal layout -->
       <vaadin-horizontal-layout spacing margin>
 		<vaadin-button :top>OK</vaadin-button>
-		<vaadin-table size-full :expand=1 />      
+		<vaadin7-table size-full :expand=1 />      
       </vaadin-horizontal-layout>
       
 	  <!--  form layout -->
       <vaadin-form-layout spacing margin>
 		<vaadin-button :top>OK</vaadin-button>
-		<vaadin-table size-full :expand=1 />      
+		<vaadin7-table size-full :expand=1 />      
       </vaadin-form-layout>
 
 	  <!--  css layout -->
       <vaadin-css-layout>
 		<vaadin-button>OK</vaadin-button>
-		<vaadin-table size-full />
+		<vaadin7-table size-full />
       </vaadin-css-layout>
       
       <!--  panel  -->
       <vaadin-panel caption="Hello world" tabindex=2 scroll-left="10" scroll-top="10">
-        <vaadin-table size-full />
+        <vaadin7-table size-full />
       </vaadin-panel>
       
       <!--  abstract field -->
@@ -50,7 +50,7 @@
 	  <!--  password field -->      
       <vaadin-password-field null-representation="" null-setting-allowed maxlength=10 columns=5 input-prompt="Please enter a value" text-change-event-mode="eager" text-change-timeout=2 value="foo" />
       <!--  text area -->
-      <vaadin-text-area rows=5 wordwrap=false >test value</vaadin-text-area>
+      <vaadin7-text-area rows=5 wordwrap=false >test value</vaadin7-text-area>
       <!--  button -->
       <vaadin-button click-shortcut="ctrl-shift-o" disable-on-click tabindex=1 icon="http://vaadin.com/image.png" icon-alt="ok" plain-text>OK</vaadin-button>
       <!--  native button -->
@@ -107,15 +107,15 @@
 	 <vaadin-check-box checked/>	 
 
      <!-- abstract select -->
-     <vaadin-list-select new-items-allowed multi-select
+     <vaadin7-list-select new-items-allowed multi-select
        item-caption-mode="index"
        null-selection-allowed=false>
-     </vaadin-list-select>
+     </vaadin7-list-select>
 
-     <vaadin-combo-box>
+     <vaadin7-combo-box>
        <option icon="http://something/my-icon.png">First value</option>
        <option>Second value</option>
-     </vaadin-combo-box>
+     </vaadin7-combo-box>
 
   </vaadin-vertical-layout>
  </body>
diff --git a/compatibility-server/src/test/resources/com/vaadin/tests/design/testFile-legacy.html b/compatibility-server/src/test/resources/com/vaadin/v7/tests/design/testFile-legacy.html
index 79ae1e9eaf..39861267e6 100644
--- a/compatibility-server/src/test/resources/com/vaadin/tests/design/testFile-legacy.html
+++ b/compatibility-server/src/test/resources/com/vaadin/v7/tests/design/testFile-legacy.html
@@ -13,7 +13,7 @@
     <v-button plain-text width = "150px">Click me</v-button>
    </v-horizontal-layout>
    <v-text-field caption = "Text input"/>
-   <v-text-area caption = "Text area" height="200px" width="300px"/>
+   <v-password-field caption = "Text area" height="200px" width="300px"/>
   </v-vertical-layout>
  </body>
 </html>
\ No newline at end of file