diff --git a/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigation.java b/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigation.java
index a84664f2a0..b68fb44320 100644
--- a/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigation.java
+++ b/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigation.java
@@ -130,10 +130,10 @@ public static SpreadsheetViewportNavigation extendUpRow() {
     }
 
     /**
-     * {@see SpreadsheetViewportNavigationDownPixel}
+     * {@see SpreadsheetViewportNavigationPixelMoveDown}
      */
     public static SpreadsheetViewportNavigation downPixel(final int value) {
-        return SpreadsheetViewportNavigationDownPixel.with(value);
+        return SpreadsheetViewportNavigationPixelMoveDown.with(value);
     }
 
     /**
@@ -151,10 +151,10 @@ public static SpreadsheetViewportNavigation leftColumn() {
     }
 
     /**
-     * {@see SpreadsheetViewportNavigationLeftPixel}
+     * {@see SpreadsheetViewportNavigationPixelMoveLeft}
      */
     public static SpreadsheetViewportNavigation leftPixel(final int value) {
-        return SpreadsheetViewportNavigationLeftPixel.with(value);
+        return SpreadsheetViewportNavigationPixelMoveLeft.with(value);
     }
 
     /**
@@ -165,17 +165,17 @@ public static SpreadsheetViewportNavigation rightColumn() {
     }
 
     /**
-     * {@see SpreadsheetViewportNavigationRightPixel}
+     * {@see SpreadsheetViewportNavigationPixelMoveRight}
      */
     public static SpreadsheetViewportNavigation rightPixel(final int value) {
-        return SpreadsheetViewportNavigationRightPixel.with(value);
+        return SpreadsheetViewportNavigationPixelMoveRight.with(value);
     }
 
     /**
-     * {@see SpreadsheetViewportNavigationUpPixel}
+     * {@see SpreadsheetViewportNavigationPixelMoveUp}
      */
     public static SpreadsheetViewportNavigation upPixel(final int value) {
-        return SpreadsheetViewportNavigationUpPixel.with(value);
+        return SpreadsheetViewportNavigationPixelMoveUp.with(value);
     }
 
     /**
diff --git a/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationNonExtendPixel.java b/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMove.java
similarity index 90%
rename from src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationNonExtendPixel.java
rename to src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMove.java
index b34eba01d9..12a3f8e194 100644
--- a/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationNonExtendPixel.java
+++ b/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMove.java
@@ -19,9 +19,9 @@
 
 import java.util.Optional;
 
-abstract class SpreadsheetViewportNavigationNonExtendPixel extends SpreadsheetViewportNavigationPixel {
+abstract class SpreadsheetViewportNavigationPixelMove extends SpreadsheetViewportNavigationPixel {
 
-    SpreadsheetViewportNavigationNonExtendPixel(final int value) {
+    SpreadsheetViewportNavigationPixelMove(final int value) {
         super(value);
     }
 
diff --git a/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationDownPixel.java b/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveDown.java
similarity index 85%
rename from src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationDownPixel.java
rename to src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveDown.java
index 79510aac63..00debade7e 100644
--- a/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationDownPixel.java
+++ b/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveDown.java
@@ -24,13 +24,13 @@
 
 import java.util.Optional;
 
-final class SpreadsheetViewportNavigationDownPixel extends SpreadsheetViewportNavigationNonExtendPixel {
+final class SpreadsheetViewportNavigationPixelMoveDown extends SpreadsheetViewportNavigationPixelMove {
 
-    static SpreadsheetViewportNavigationDownPixel with(final int value) {
-        return new SpreadsheetViewportNavigationDownPixel(value);
+    static SpreadsheetViewportNavigationPixelMoveDown with(final int value) {
+        return new SpreadsheetViewportNavigationPixelMoveDown(value);
     }
 
-    private SpreadsheetViewportNavigationDownPixel(final int value) {
+    private SpreadsheetViewportNavigationPixelMoveDown(final int value) {
         super(value);
     }
 
diff --git a/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationLeftPixel.java b/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveLeft.java
similarity index 85%
rename from src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationLeftPixel.java
rename to src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveLeft.java
index 3c094f177e..50f1149b49 100644
--- a/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationLeftPixel.java
+++ b/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveLeft.java
@@ -23,13 +23,13 @@
 
 import java.util.Optional;
 
-final class SpreadsheetViewportNavigationLeftPixel extends SpreadsheetViewportNavigationNonExtendPixel {
+final class SpreadsheetViewportNavigationPixelMoveLeft extends SpreadsheetViewportNavigationPixelMove {
 
-    static SpreadsheetViewportNavigationLeftPixel with(final int value) {
-        return new SpreadsheetViewportNavigationLeftPixel(value);
+    static SpreadsheetViewportNavigationPixelMoveLeft with(final int value) {
+        return new SpreadsheetViewportNavigationPixelMoveLeft(value);
     }
 
-    private SpreadsheetViewportNavigationLeftPixel(final int value) {
+    private SpreadsheetViewportNavigationPixelMoveLeft(final int value) {
         super(value);
     }
 
diff --git a/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationRightPixel.java b/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveRight.java
similarity index 85%
rename from src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationRightPixel.java
rename to src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveRight.java
index 54d1bf9f51..ae0c332510 100644
--- a/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationRightPixel.java
+++ b/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveRight.java
@@ -24,13 +24,13 @@
 
 import java.util.Optional;
 
-final class SpreadsheetViewportNavigationRightPixel extends SpreadsheetViewportNavigationNonExtendPixel {
+final class SpreadsheetViewportNavigationPixelMoveRight extends SpreadsheetViewportNavigationPixelMove {
 
-    static SpreadsheetViewportNavigationRightPixel with(final int value) {
-        return new SpreadsheetViewportNavigationRightPixel(value);
+    static SpreadsheetViewportNavigationPixelMoveRight with(final int value) {
+        return new SpreadsheetViewportNavigationPixelMoveRight(value);
     }
 
-    private SpreadsheetViewportNavigationRightPixel(final int value) {
+    private SpreadsheetViewportNavigationPixelMoveRight(final int value) {
         super(value);
     }
 
diff --git a/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationUpPixel.java b/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveUp.java
similarity index 85%
rename from src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationUpPixel.java
rename to src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveUp.java
index c777fd104a..6d9d0870b7 100644
--- a/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationUpPixel.java
+++ b/src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveUp.java
@@ -24,13 +24,13 @@
 
 import java.util.Optional;
 
-final class SpreadsheetViewportNavigationUpPixel extends SpreadsheetViewportNavigationNonExtendPixel {
+final class SpreadsheetViewportNavigationPixelMoveUp extends SpreadsheetViewportNavigationPixelMove {
 
-    static SpreadsheetViewportNavigationUpPixel with(final int value) {
-        return new SpreadsheetViewportNavigationUpPixel(value);
+    static SpreadsheetViewportNavigationPixelMoveUp with(final int value) {
+        return new SpreadsheetViewportNavigationPixelMoveUp(value);
     }
 
-    private SpreadsheetViewportNavigationUpPixel(final int value) {
+    private SpreadsheetViewportNavigationPixelMoveUp(final int value) {
         super(value);
     }
 
diff --git a/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationDownPixelTest.java b/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveDownTest.java
similarity index 90%
rename from src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationDownPixelTest.java
rename to src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveDownTest.java
index 726f1c8acc..f1b086ed1b 100644
--- a/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationDownPixelTest.java
+++ b/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveDownTest.java
@@ -39,7 +39,7 @@
 
 import java.util.Optional;
 
-public final class SpreadsheetViewportNavigationDownPixelTest extends SpreadsheetViewportNavigationPixelTestCase<SpreadsheetViewportNavigationDownPixel> {
+public final class SpreadsheetViewportNavigationPixelMoveDownTest extends SpreadsheetViewportNavigationPixelTestCase<SpreadsheetViewportNavigationPixelMoveDown> {
 
     @Test
     public void testUpdateHome() {
@@ -126,14 +126,14 @@ public void testIsExtend() {
     }
 
     @Override
-    SpreadsheetViewportNavigationDownPixel createSpreadsheetViewportNavigation() {
-        return SpreadsheetViewportNavigationDownPixel.with(
+    SpreadsheetViewportNavigationPixelMoveDown createSpreadsheetViewportNavigation() {
+        return SpreadsheetViewportNavigationPixelMoveDown.with(
             2 * ROW_HEIGHT - 1
         );
     }
 
     @Override
-    public Class<SpreadsheetViewportNavigationDownPixel> type() {
-        return SpreadsheetViewportNavigationDownPixel.class;
+    public Class<SpreadsheetViewportNavigationPixelMoveDown> type() {
+        return SpreadsheetViewportNavigationPixelMoveDown.class;
     }
 }
diff --git a/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationLeftPixelTest.java b/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveLeftTest.java
similarity index 88%
rename from src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationLeftPixelTest.java
rename to src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveLeftTest.java
index 0466e0153a..e81548e026 100644
--- a/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationLeftPixelTest.java
+++ b/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveLeftTest.java
@@ -22,7 +22,7 @@
 
 import java.util.Optional;
 
-public final class SpreadsheetViewportNavigationLeftPixelTest extends SpreadsheetViewportNavigationPixelTestCase<SpreadsheetViewportNavigationLeftPixel> {
+public final class SpreadsheetViewportNavigationPixelMoveLeftTest extends SpreadsheetViewportNavigationPixelTestCase<SpreadsheetViewportNavigationPixelMoveLeft> {
 
     @Test
     public void testUpdateHome() {
@@ -115,12 +115,12 @@ public void testIsExtend() {
     }
 
     @Override
-    SpreadsheetViewportNavigationLeftPixel createSpreadsheetViewportNavigation() {
-        return SpreadsheetViewportNavigationLeftPixel.with(2 * COLUMN_WIDTH - 1);
+    SpreadsheetViewportNavigationPixelMoveLeft createSpreadsheetViewportNavigation() {
+        return SpreadsheetViewportNavigationPixelMoveLeft.with(2 * COLUMN_WIDTH - 1);
     }
 
     @Override
-    public Class<SpreadsheetViewportNavigationLeftPixel> type() {
-        return SpreadsheetViewportNavigationLeftPixel.class;
+    public Class<SpreadsheetViewportNavigationPixelMoveLeft> type() {
+        return SpreadsheetViewportNavigationPixelMoveLeft.class;
     }
 }
diff --git a/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationRightPixelTest.java b/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveRightTest.java
similarity index 88%
rename from src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationRightPixelTest.java
rename to src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveRightTest.java
index 3a56613e0c..753088ce20 100644
--- a/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationRightPixelTest.java
+++ b/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveRightTest.java
@@ -22,7 +22,7 @@
 
 import java.util.Optional;
 
-public final class SpreadsheetViewportNavigationRightPixelTest extends SpreadsheetViewportNavigationPixelTestCase<SpreadsheetViewportNavigationRightPixel> {
+public final class SpreadsheetViewportNavigationPixelMoveRightTest extends SpreadsheetViewportNavigationPixelTestCase<SpreadsheetViewportNavigationPixelMoveRight> {
 
     @Test
     public void testUpdateHome() {
@@ -114,12 +114,12 @@ public void testIsExtend() {
     }
 
     @Override
-    SpreadsheetViewportNavigationRightPixel createSpreadsheetViewportNavigation() {
-        return SpreadsheetViewportNavigationRightPixel.with(2 * COLUMN_WIDTH - 1);
+    SpreadsheetViewportNavigationPixelMoveRight createSpreadsheetViewportNavigation() {
+        return SpreadsheetViewportNavigationPixelMoveRight.with(2 * COLUMN_WIDTH - 1);
     }
 
     @Override
-    public Class<SpreadsheetViewportNavigationRightPixel> type() {
-        return SpreadsheetViewportNavigationRightPixel.class;
+    public Class<SpreadsheetViewportNavigationPixelMoveRight> type() {
+        return SpreadsheetViewportNavigationPixelMoveRight.class;
     }
 }
diff --git a/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationNonExtendPixelTest.java b/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveTest.java
similarity index 69%
rename from src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationNonExtendPixelTest.java
rename to src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveTest.java
index 4453238a6b..ec8ad4e8c6 100644
--- a/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationNonExtendPixelTest.java
+++ b/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveTest.java
@@ -18,9 +18,9 @@
 
 package walkingkooka.spreadsheet.viewport;
 
-public final class SpreadsheetViewportNavigationNonExtendPixelTest extends SpreadsheetViewportNavigationTestCase<SpreadsheetViewportNavigationNonExtendPixel> {
+public final class SpreadsheetViewportNavigationPixelMoveTest extends SpreadsheetViewportNavigationTestCase<SpreadsheetViewportNavigationPixelMove> {
     @Override
-    public Class<SpreadsheetViewportNavigationNonExtendPixel> type() {
-        return SpreadsheetViewportNavigationNonExtendPixel.class;
+    public Class<SpreadsheetViewportNavigationPixelMove> type() {
+        return SpreadsheetViewportNavigationPixelMove.class;
     }
 }
diff --git a/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationUpPixelTest.java b/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveUpTest.java
similarity index 90%
rename from src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationUpPixelTest.java
rename to src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveUpTest.java
index 42c61492c2..a2835c96f4 100644
--- a/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationUpPixelTest.java
+++ b/src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportNavigationPixelMoveUpTest.java
@@ -39,7 +39,7 @@
 
 import java.util.Optional;
 
-public final class SpreadsheetViewportNavigationUpPixelTest extends SpreadsheetViewportNavigationPixelTestCase<SpreadsheetViewportNavigationUpPixel> {
+public final class SpreadsheetViewportNavigationPixelMoveUpTest extends SpreadsheetViewportNavigationPixelTestCase<SpreadsheetViewportNavigationPixelMoveUp> {
 
     @Test
     public void testUpdateHome() {
@@ -131,12 +131,12 @@ public void testIsExtend() {
     }
 
     @Override
-    SpreadsheetViewportNavigationUpPixel createSpreadsheetViewportNavigation() {
-        return SpreadsheetViewportNavigationUpPixel.with(2 * ROW_HEIGHT - 1);
+    SpreadsheetViewportNavigationPixelMoveUp createSpreadsheetViewportNavigation() {
+        return SpreadsheetViewportNavigationPixelMoveUp.with(2 * ROW_HEIGHT - 1);
     }
 
     @Override
-    public Class<SpreadsheetViewportNavigationUpPixel> type() {
-        return SpreadsheetViewportNavigationUpPixel.class;
+    public Class<SpreadsheetViewportNavigationPixelMoveUp> type() {
+        return SpreadsheetViewportNavigationPixelMoveUp.class;
     }
 }