4 files changed, 12 insertions, 12 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/AbstractGridDnD.java b/uitest/src/main/java/com/vaadin/tests/components/grid/AbstractGridDnD.java
index 1e1c790898..b68866c727 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/AbstractGridDnD.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/AbstractGridDnD.java
@@ -16,14 +16,14 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Layout;
 import com.vaadin.ui.RadioButtonGroup;
 import com.vaadin.ui.components.grid.GridDragSource;
-import com.vaadin.ui.components.grid.GridDragger;
+import com.vaadin.ui.components.grid.GridRowDragger;
 import com.vaadin.ui.components.grid.GridDropTarget;
 
 public abstract class AbstractGridDnD extends AbstractTestUIWithLog {
 
     protected final Layout controls = new HorizontalLayout();
 
-    protected void initializeTestFor(GridDragger<Person> gridDragger) {
+    protected void initializeTestFor(GridRowDragger<Person> gridDragger) {
         initializeTestFor(gridDragger.getGridDragSource().getGrid(),
                 gridDragger.getGridDropTarget().getGrid(),
                 gridDragger.getGridDragSource(),
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDraggerOneGrid.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowDraggerOneGrid.java
index 752d0d07d3..95b79c8eea 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDraggerOneGrid.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowDraggerOneGrid.java
@@ -20,11 +20,11 @@ import com.vaadin.annotations.Widgetset;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.util.Person;
 import com.vaadin.ui.Grid;
-import com.vaadin.ui.components.grid.GridDragger;
+import com.vaadin.ui.components.grid.GridRowDragger;
 
 @Theme("valo")
 @Widgetset("com.vaadin.DefaultWidgetSet")
-public class GridDraggerOneGrid extends AbstractGridDnD {
+public class GridRowDraggerOneGrid extends AbstractGridDnD {
 
     @Override
     protected void setup(VaadinRequest request) {
@@ -32,7 +32,7 @@ public class GridDraggerOneGrid extends AbstractGridDnD {
 
         Grid<Person> grid = createGridAndFillWithData(50);
 
-        GridDragger<Person> gridDragger = new GridDragger<>(grid);
+        GridRowDragger<Person> gridDragger = new GridRowDragger<>(grid);
 
         initializeTestFor(gridDragger);
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDraggerTwoGrids.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowDraggerTwoGrids.java
index 4942dc7810..b0c630a3a8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDraggerTwoGrids.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowDraggerTwoGrids.java
@@ -22,12 +22,12 @@ import com.vaadin.tests.util.Person;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Grid;
 import com.vaadin.ui.components.grid.DropIndexCalculator;
-import com.vaadin.ui.components.grid.GridDragger;
+import com.vaadin.ui.components.grid.GridRowDragger;
 import com.vaadin.ui.components.grid.SourceDataProviderUpdater;
 
 @Theme("valo")
 @Widgetset("com.vaadin.DefaultWidgetSet")
-public class GridDraggerTwoGrids extends AbstractGridDnD {
+public class GridRowDraggerTwoGrids extends AbstractGridDnD {
 
     @Override
     protected void setup(VaadinRequest request) {
@@ -39,7 +39,7 @@ public class GridDraggerTwoGrids extends AbstractGridDnD {
         // Drop target Grid
         Grid<Person> right = createGridAndFillWithData(0);
 
-        GridDragger<Person> gridDragger = new GridDragger<>(left, right);
+        GridRowDragger<Person> gridDragger = new GridRowDragger<>(left, right);
 
         CheckBox addItemsToEnd = new CheckBox("Add Items To End", false);
         addItemsToEnd.addValueChangeListener(
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDraggerTwoGridsBothWays.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowDraggerTwoGridsBothWays.java
index f07ea77930..a4deb4646d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDraggerTwoGridsBothWays.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowDraggerTwoGridsBothWays.java
@@ -23,11 +23,11 @@ import com.vaadin.tests.util.Person;
 import com.vaadin.ui.Grid;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Layout;
-import com.vaadin.ui.components.grid.GridDragger;
+import com.vaadin.ui.components.grid.GridRowDragger;
 
 @Theme("valo")
 @Widgetset("com.vaadin.DefaultWidgetSet")
-public class GridDraggerTwoGridsBothWays extends AbstractGridDnD {
+public class GridRowDraggerTwoGridsBothWays extends AbstractGridDnD {
 
     @Override
     protected void setup(VaadinRequest request) {
@@ -36,8 +36,8 @@ public class GridDraggerTwoGridsBothWays extends AbstractGridDnD {
         Grid<Person> left = createGridAndFillWithData(25);
         Grid<Person> right = createGridAndFillWithData(25);
 
-        GridDragger<Person> leftToRight = new GridDragger<>(left, right);
-        GridDragger<Person> rightToLeft = new GridDragger<>(right, left);
+        GridRowDragger<Person> leftToRight = new GridRowDragger<>(left, right);
+        GridRowDragger<Person> rightToLeft = new GridRowDragger<>(right, left);
 
         leftToRight.getGridDragSource()
                 .addDragStartListener(event -> rightToLeft.getGridDropTarget()