Update Command & application names, Handler names Change-Id: Iafb2fd6ef8a68b07b926064f8542f74469158e0c Signed-off-by: Axel Richard <axel.richard@obeo.fr>

diff --git a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/CherryPickApplicationTest.java b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/CherryPickApplicationTest.java
index 9d47db5..b0da538 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/CherryPickApplicationTest.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/CherryPickApplicationTest.java

@@ -31,7 +31,7 @@
 import org.junit.Test;
 
 /**
- * Test of {@link LogicalCherryPickApplication}.
+ * Test of {@link CherryPickApplication}.
  * 
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
  */
@@ -424,12 +424,12 @@
 
 	@Override
 	protected IApplication buildApp() {
-		return new LogicalCherryPickApplication();
+		return new CherryPickApplication();
 	}
 
 	@Override
-	protected LogicalCherryPickApplication getApp() {
-		return (LogicalCherryPickApplication)super.getApp();
+	protected CherryPickApplication getApp() {
+		return (CherryPickApplication)super.getApp();
 	}
 
 	private void runCommand(Returns expectedReturnCode) throws Exception {

diff --git a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/DiffApplicationTest.java b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/DiffApplicationTest.java
index 1ea357f..7270146 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/DiffApplicationTest.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/DiffApplicationTest.java

@@ -37,7 +37,7 @@
 	 */
 	@Override
 	protected IApplication buildApp() {
-		return new LogicalDiffApplication();
+		return new DiffApplication();
 	}
 
 	/**

diff --git a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/MergeApplicationTest.java b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/MergeApplicationTest.java
index 8d86c59..c320b37 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/MergeApplicationTest.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/MergeApplicationTest.java

@@ -171,7 +171,7 @@
 	 */
 	@Override
 	protected IApplication buildApp() {
-		return new LogicalMergeApplication();
+		return new MergeApplication();
 	}
 
 	/**
@@ -242,8 +242,8 @@
 	 * @see org.eclipse.emf.compare.git.pgm.AbstractApplicationTest#getApp()
 	 */
 	@Override
-	protected LogicalMergeApplication getApp() {
-		return (LogicalMergeApplication)super.getApp();
+	protected MergeApplication getApp() {
+		return (MergeApplication)super.getApp();
 	}
 
 	/**

diff --git a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/RebaseApplicationTest.java b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/RebaseApplicationTest.java
index 63f67a2..aad5616 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/RebaseApplicationTest.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/RebaseApplicationTest.java

@@ -40,7 +40,7 @@
 import org.junit.Test;
 
 /**
- * Test the {@link LogicalCherryPickApplication}.
+ * Test the {@link RebaseApplication}.
  * 
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
  */
@@ -51,7 +51,7 @@
 
 	@Override
 	protected IApplication buildApp() {
-		return new LogicalRebaseApplication();
+		return new RebaseApplication();
 	}
 
 	/**

diff --git a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/CherryPickArgumentsTest.java b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/CherryPickArgumentsTest.java
index 68af15b..973fb66 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/CherryPickArgumentsTest.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/CherryPickArgumentsTest.java

@@ -30,7 +30,7 @@
 import org.junit.Test;
 
 /**
- * Test of {@link LogicalDiffCommand}.
+ * Test of {@link DiffCommand}.
  * 
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
  */
@@ -39,7 +39,7 @@
 
 	@Override
 	protected String getCommandName() {
-		return LogicalCherryPickCommand.LOGICAL_CHERRY_PICK_CMD_NAME;
+		return CherryPickCommand.LOGICAL_CHERRY_PICK_CMD_NAME;
 	}
 
 	@Override

diff --git a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/DiffArgumentsTest.java b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/DiffArgumentsTest.java
index 29006fa..4730e47 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/DiffArgumentsTest.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/DiffArgumentsTest.java

@@ -24,7 +24,7 @@
 import org.junit.Test;
 
 /**
- * Test of {@link LogicalDiffCommand}.
+ * Test of {@link DiffCommand}.
  * 
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
  */
@@ -38,7 +38,7 @@
 	 */
 	@Override
 	protected String getCommandName() {
-		return LogicalDiffCommand.LOGICAL_DIFF_CMD_NAME;
+		return DiffCommand.LOGICAL_DIFF_CMD_NAME;
 	}
 
 	/**
@@ -189,8 +189,8 @@
 	// Object result = getApp().start(context);
 	// assertOutputs("", "");
 	// assertEquals(Returns.COMPLETE, result);
-	// assertTrue(getLogicalCommand() instanceof LogicalDiffCommand);
-	// LogicalDiffCommand diffCmd = (LogicalDiffCommand)getLogicalCommand();
+	// assertTrue(getLogicalCommand() instanceof DiffCommand);
+	// DiffCommand diffCmd = (DiffCommand)getLogicalCommand();
 	// assertNotNull(diffCmd.getPathFilter());
 	// assertNotNull(diffCmd.getCommit());
 	// assertNull(diffCmd.getOptionalCommit());

diff --git a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/DiffIntegrationTest.java b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/DiffIntegrationTest.java
index 6bdb996..a56e1a7 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/DiffIntegrationTest.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/DiffIntegrationTest.java

@@ -63,7 +63,7 @@
 		addAllAndCommit("First commit");
 
 		// No reference
-		getContext().addArg(LogicalDiffCommand.LOGICAL_DIFF_CMD_NAME, newSetupFile.getAbsolutePath(),
+		getContext().addArg(DiffCommand.LOGICAL_DIFF_CMD_NAME, newSetupFile.getAbsolutePath(),
 				"master", "master");
 		Object result = getApp().start(getContext());
 

diff --git a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeArgumentsTest.java b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeArgumentsTest.java
index 007390d..771e26a 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeArgumentsTest.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeArgumentsTest.java

@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.emf.compare.git.pgm.internal.cmd;
 
-import static org.eclipse.emf.compare.git.pgm.internal.cmd.LogicalMergeCommand.LOGICAL_MERGE_CMD_NAME;
+import static org.eclipse.emf.compare.git.pgm.internal.cmd.MergeCommand.LOGICAL_MERGE_CMD_NAME;
 import static org.eclipse.emf.compare.git.pgm.internal.util.EMFCompareGitPGMUtil.EOL;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -27,7 +27,7 @@
 import org.junit.Test;
 
 /**
- * Test of {@link LogicalMergeCommand}.
+ * Test of {@link MergeCommand}.
  * 
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
  */
@@ -236,8 +236,8 @@
 		// Tests referencing a commit using the name of a branch
 		getContext().addArg(getCommandName(), newSetupFile.getAbsolutePath(), "master", "-m");
 		getApp().start(getContext());
-		assertTrue(getLogicalCommand() instanceof LogicalMergeCommand);
-		LogicalMergeCommand mergeCmd = (LogicalMergeCommand)getLogicalCommand();
+		assertTrue(getLogicalCommand() instanceof MergeCommand);
+		MergeCommand mergeCmd = (MergeCommand)getLogicalCommand();
 		assertNotNull(mergeCmd.getCommit());
 		String extectedOutput = "fatal: Option \"-m\" takes an operand in:" + EOL + getExpectedUsage() + EOL;
 		assertOutput(extectedOutput);
@@ -262,10 +262,10 @@
 		getContext().addArg(getCommandName(), newSetupFile.getAbsolutePath(), "master", "-m", "My message",
 				"--help");
 		getApp().start(getContext());
-		assertTrue(getLogicalCommand() instanceof LogicalMergeCommand);
-		LogicalMergeCommand mergeCmd = (LogicalMergeCommand)getLogicalCommand();
+		assertTrue(getLogicalCommand() instanceof MergeCommand);
+		MergeCommand mergeCmd = (MergeCommand)getLogicalCommand();
 		assertNotNull(mergeCmd.getCommit());
-		assertEquals("My message", ((LogicalMergeCommand)getLogicalCommand()).getMessage());
+		assertEquals("My message", ((MergeCommand)getLogicalCommand()).getMessage());
 
 	}
 }

diff --git a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeIntegrationTest.java b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeIntegrationTest.java
index 23d0538..0897f9f 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeIntegrationTest.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeIntegrationTest.java

@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.emf.compare.git.pgm.internal.cmd;
 
-import static org.eclipse.emf.compare.git.pgm.internal.cmd.LogicalMergeCommand.LOGICAL_MERGE_CMD_NAME;
+import static org.eclipse.emf.compare.git.pgm.internal.cmd.MergeCommand.LOGICAL_MERGE_CMD_NAME;
 import static org.eclipse.emf.compare.git.pgm.internal.util.EMFCompareGitPGMUtil.EOL;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -100,8 +100,8 @@
 		assertOutputMessageEnd("Already up to date." + EOL + EOL);
 		assertEmptyErrorMessage();
 		assertEquals(Returns.COMPLETE.code(), result);
-		assertTrue(getLogicalCommand() instanceof LogicalMergeCommand);
-		LogicalMergeCommand mergeCmd = (LogicalMergeCommand)getLogicalCommand();
+		assertTrue(getLogicalCommand() instanceof MergeCommand);
+		MergeCommand mergeCmd = (MergeCommand)getLogicalCommand();
 		assertNotNull(mergeCmd.getCommit());
 	}
 
@@ -132,8 +132,8 @@
 		assertOutputMessageEnd("Already up to date." + EOL + EOL);
 		assertEmptyErrorMessage();
 		assertEquals(Returns.COMPLETE.code(), result);
-		assertTrue(getLogicalCommand() instanceof LogicalMergeCommand);
-		LogicalMergeCommand mergeCmd = (LogicalMergeCommand)getLogicalCommand();
+		assertTrue(getLogicalCommand() instanceof MergeCommand);
+		MergeCommand mergeCmd = (MergeCommand)getLogicalCommand();
 		assertNotNull(mergeCmd.getCommit());
 	}
 
@@ -162,8 +162,8 @@
 		assertOutputMessageEnd("Already up to date." + EOL + EOL);
 		assertEmptyErrorMessage();
 		assertEquals(Returns.COMPLETE.code(), result);
-		assertTrue(getLogicalCommand() instanceof LogicalMergeCommand);
-		LogicalMergeCommand mergeCmd = (LogicalMergeCommand)getLogicalCommand();
+		assertTrue(getLogicalCommand() instanceof MergeCommand);
+		MergeCommand mergeCmd = (MergeCommand)getLogicalCommand();
 		assertNotNull(mergeCmd.getCommit());
 	}
 
@@ -193,8 +193,8 @@
 		assertOutputMessageEnd("Already up to date." + EOL + EOL);
 		assertEmptyErrorMessage();
 		assertEquals(Returns.COMPLETE.code(), result);
-		assertTrue(getLogicalCommand() instanceof LogicalMergeCommand);
-		LogicalMergeCommand mergeCmd = (LogicalMergeCommand)getLogicalCommand();
+		assertTrue(getLogicalCommand() instanceof MergeCommand);
+		MergeCommand mergeCmd = (MergeCommand)getLogicalCommand();
 		assertNotNull(mergeCmd.getCommit());
 		assertEquals("My message", mergeCmd.getMessage());
 

diff --git a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeToolArgumentsTest.java b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeToolArgumentsTest.java
index 8bbc4f6..23cd333 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeToolArgumentsTest.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeToolArgumentsTest.java

@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.emf.compare.git.pgm.internal.cmd;
 
-import static org.eclipse.emf.compare.git.pgm.internal.cmd.LogicalMergeToolCommand.LOGICAL_MERGE_TOOL_CMD_NAME;
+import static org.eclipse.emf.compare.git.pgm.internal.cmd.MergeToolCommand.LOGICAL_MERGE_TOOL_CMD_NAME;
 import static org.eclipse.emf.compare.git.pgm.internal.util.EMFCompareGitPGMUtil.EOL;
 import static org.junit.Assert.assertEquals;
 

diff --git a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeToolIntegrationTest.java b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeToolIntegrationTest.java
index 7e4ad2f..81cf32d 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeToolIntegrationTest.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeToolIntegrationTest.java

@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.emf.compare.git.pgm.internal.cmd;
 
-import static org.eclipse.emf.compare.git.pgm.internal.cmd.LogicalMergeToolCommand.LOGICAL_MERGE_TOOL_CMD_NAME;
+import static org.eclipse.emf.compare.git.pgm.internal.cmd.MergeToolCommand.LOGICAL_MERGE_TOOL_CMD_NAME;
 import static org.eclipse.emf.compare.git.pgm.internal.util.EMFCompareGitPGMUtil.EOL;
 import static org.junit.Assert.assertEquals;
 

diff --git a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/RebaseArgumentsTest.java b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/RebaseArgumentsTest.java
index adff63c..9616b73 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/RebaseArgumentsTest.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/RebaseArgumentsTest.java

@@ -40,7 +40,7 @@
 
 	@Override
 	protected String getCommandName() {
-		return LogicalRebaseCommand.LOGICAL_REBASE_CMD_NAME;
+		return RebaseCommand.LOGICAL_REBASE_CMD_NAME;
 	}
 
 	@Override

diff --git a/plugins/org.eclipse.emf.compare.git.pgm/plugin.xml b/plugins/org.eclipse.emf.compare.git.pgm/plugin.xml
index b593042..8de184f 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm/plugin.xml
+++ b/plugins/org.eclipse.emf.compare.git.pgm/plugin.xml

@@ -15,7 +15,7 @@
          point="org.eclipse.core.runtime.applications">
       <application>
          <run
-               class="org.eclipse.emf.compare.git.pgm.internal.app.LogicalDiffApplication">
+               class="org.eclipse.emf.compare.git.pgm.internal.app.DiffApplication">
          </run>
       </application>
    </extension>
@@ -24,7 +24,25 @@
          point="org.eclipse.core.runtime.applications">
       <application>
          <run
-               class="org.eclipse.emf.compare.git.pgm.internal.app.LogicalMergeApplication">
+               class="org.eclipse.emf.compare.git.pgm.internal.app.MergeApplication">
+         </run>
+      </application>
+   </extension>
+   <extension
+         id="emf.compare.git.logicalcherry-pick"
+         point="org.eclipse.core.runtime.applications">
+      <application>
+         <run
+               class="org.eclipse.emf.compare.git.pgm.internal.app.CherryPickApplication">
+         </run>
+      </application>
+   </extension>
+      <extension
+         id="emf.compare.git.logicalrebase"
+         point="org.eclipse.core.runtime.applications">
+      <application>
+         <run
+               class="org.eclipse.emf.compare.git.pgm.internal.app.RebaseApplication">
          </run>
       </application>
    </extension>
@@ -36,22 +54,4 @@
             name="EMF Compare Git PGM">
       </product>
    </extension>
-   <extension
-         id="emf.compare.git.logicalcherry-pick"
-         point="org.eclipse.core.runtime.applications">
-      <application>
-         <run
-               class="org.eclipse.emf.compare.git.pgm.internal.app.LogicalCherryPickApplication">
-         </run>
-      </application>
-   </extension>
-      <extension
-         id="emf.compare.git.logicalrebase"
-         point="org.eclipse.core.runtime.applications">
-      <application>
-         <run
-               class="org.eclipse.emf.compare.git.pgm.internal.app.LogicalRebaseApplication">
-         </run>
-      </application>
-   </extension>
 </plugin>

diff --git a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/AbstractLogicalApplication.java b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/AbstractLogicalApplication.java
index c0f4be4..99f01b0 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/AbstractLogicalApplication.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/AbstractLogicalApplication.java

@@ -47,7 +47,7 @@
 import org.eclipse.emf.compare.git.pgm.internal.ProgressPageLog;
 import org.eclipse.emf.compare.git.pgm.internal.args.CmdLineParserRepositoryBuilder;
 import org.eclipse.emf.compare.git.pgm.internal.args.GitDirHandler;
-import org.eclipse.emf.compare.git.pgm.internal.args.SetupFileOptionHandler;
+import org.eclipse.emf.compare.git.pgm.internal.args.SetupFileHandler;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die.DeathType;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die.DiesOn;
@@ -116,7 +116,7 @@
 	/**
 	 * Holds the Oomph model setup file.
 	 */
-	@Argument(index = 1, metaVar = "<setup>", required = true, usage = "Path to the setup file. The setup file is a Oomph model.", handler = SetupFileOptionHandler.class)
+	@Argument(index = 1, metaVar = "<setup>", required = true, usage = "Path to the setup file. The setup file is a Oomph model.", handler = SetupFileHandler.class)
 	protected File setupFile;
 
 	/**

diff --git a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/LogicalCherryPickApplication.java b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/CherryPickApplication.java
similarity index 98%
rename from plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/LogicalCherryPickApplication.java
rename to plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/CherryPickApplication.java
index 9e3e874..1772f3b 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/LogicalCherryPickApplication.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/CherryPickApplication.java

@@ -26,7 +26,7 @@
 import org.eclipse.egit.core.op.CherryPickOperation;
 import org.eclipse.egit.core.op.RebaseOperation;
 import org.eclipse.emf.compare.git.pgm.Returns;
-import org.eclipse.emf.compare.git.pgm.internal.args.RevCommitOptionHandler;
+import org.eclipse.emf.compare.git.pgm.internal.args.RevCommitHandler;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die.DeathType;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die.DiesOn;
@@ -57,7 +57,7 @@
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
  */
 @SuppressWarnings({"restriction", "nls" })
-public class LogicalCherryPickApplication extends AbstractLogicalApplication {
+public class CherryPickApplication extends AbstractLogicalApplication {
 	/**
 	 * Message to display when there is nothing to commit.
 	 */
@@ -70,7 +70,7 @@
 	/**
 	 * Holds {@link RevCommit}s that need to be merged.
 	 */
-	@Argument(index = 2, required = false, multiValued = true, metaVar = "<commit>", usage = "Commit IDs to cherry pick.", handler = RevCommitOptionHandler.class)
+	@Argument(index = 2, required = false, multiValued = true, metaVar = "<commit>", usage = "Commit IDs to cherry pick.", handler = RevCommitHandler.class)
 	private List<RevCommit> commits;
 
 	/** Continue option. */

diff --git a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/LogicalDiffApplication.java b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/DiffApplication.java
similarity index 96%
rename from plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/LogicalDiffApplication.java
rename to plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/DiffApplication.java
index a9dd721..bd526ae 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/LogicalDiffApplication.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/DiffApplication.java

@@ -30,7 +30,7 @@
 import org.eclipse.emf.compare.EMFCompare;
 import org.eclipse.emf.compare.git.pgm.Returns;
 import org.eclipse.emf.compare.git.pgm.internal.args.PathFilterHandler;
-import org.eclipse.emf.compare.git.pgm.internal.args.RevCommitOptionHandler;
+import org.eclipse.emf.compare.git.pgm.internal.args.RevCommitHandler;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die.DeathType;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die.DiesOn;
@@ -72,18 +72,18 @@
  * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
  */
 @SuppressWarnings({"restriction" })
-public class LogicalDiffApplication extends AbstractLogicalApplication {
+public class DiffApplication extends AbstractLogicalApplication {
 
 	/**
 	 * Holds the reference from which the differences should be displayed.
 	 */
-	@Argument(index = 2, multiValued = false, required = true, metaVar = "<commit>", usage = "Commit ID or branch name.", handler = RevCommitOptionHandler.class)
+	@Argument(index = 2, multiValued = false, required = true, metaVar = "<commit>", usage = "Commit ID or branch name.", handler = RevCommitHandler.class)
 	private RevCommit commit;
 
 	/**
 	 * Optional reference used to view the differences between {@link #commit} and {@link #commitWith}.
 	 */
-	@Argument(index = 3, multiValued = false, required = false, metaVar = "<compareWithCommit>", usage = "Commit ID or branch name. This is to view the changes between <commit> and <compareWithCommit> or HEAD if not specified.", handler = RevCommitOptionHandler.class)
+	@Argument(index = 3, multiValued = false, required = false, metaVar = "<compareWithCommit>", usage = "Commit ID or branch name. This is to view the changes between <commit> and <compareWithCommit> or HEAD if not specified.", handler = RevCommitHandler.class)
 	private RevCommit commitWith;
 
 	/**

diff --git a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/LogicalMergeApplication.java b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/MergeApplication.java
similarity index 97%
rename from plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/LogicalMergeApplication.java
rename to plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/MergeApplication.java
index f785ae9..73ca532 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/LogicalMergeApplication.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/MergeApplication.java

@@ -24,7 +24,7 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.egit.core.op.MergeOperation;
 import org.eclipse.emf.compare.git.pgm.Returns;
-import org.eclipse.emf.compare.git.pgm.internal.args.RevCommitOptionHandler;
+import org.eclipse.emf.compare.git.pgm.internal.args.RevCommitHandler;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die.DeathType;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die.DiesOn;
@@ -61,7 +61,7 @@
  * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
  */
 @SuppressWarnings({"restriction" })
-public class LogicalMergeApplication extends AbstractLogicalApplication {
+public class MergeApplication extends AbstractLogicalApplication {
 
 	/**
 	 * Length of a short commit id.
@@ -71,7 +71,7 @@
 	/**
 	 * Holds a ObjectId that need to be merged.
 	 */
-	@Argument(index = 2, required = true, metaVar = "<commit>", usage = "Commit ID or branch name to merge.", handler = RevCommitOptionHandler.class)
+	@Argument(index = 2, required = true, metaVar = "<commit>", usage = "Commit ID or branch name to merge.", handler = RevCommitHandler.class)
 	private RevCommit commit;
 
 	/**

diff --git a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/LogicalRebaseApplication.java b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/RebaseApplication.java
similarity index 96%
rename from plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/LogicalRebaseApplication.java
rename to plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/RebaseApplication.java
index 2ad05b6..a0ce7a1 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/LogicalRebaseApplication.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/RebaseApplication.java

@@ -10,9 +10,9 @@
  *******************************************************************************/
 package org.eclipse.emf.compare.git.pgm.internal.app;
 
-import static org.eclipse.emf.compare.git.pgm.internal.cmd.LogicalRebaseCommand.ABORT_OPT;
-import static org.eclipse.emf.compare.git.pgm.internal.cmd.LogicalRebaseCommand.CONTINUE_OPT;
-import static org.eclipse.emf.compare.git.pgm.internal.cmd.LogicalRebaseCommand.SKIP_OPT;
+import static org.eclipse.emf.compare.git.pgm.internal.cmd.RebaseCommand.ABORT_OPT;
+import static org.eclipse.emf.compare.git.pgm.internal.cmd.RebaseCommand.CONTINUE_OPT;
+import static org.eclipse.emf.compare.git.pgm.internal.cmd.RebaseCommand.SKIP_OPT;
 import static org.eclipse.emf.compare.git.pgm.internal.util.EMFCompareGitPGMUtil.EOL;
 import static org.eclipse.emf.compare.git.pgm.internal.util.EMFCompareGitPGMUtil.TAB;
 import static org.eclipse.emf.compare.git.pgm.internal.util.EMFCompareGitPGMUtil.waitEgitJobs;
@@ -28,7 +28,7 @@
 import org.eclipse.egit.core.op.BranchOperation;
 import org.eclipse.egit.core.op.RebaseOperation;
 import org.eclipse.emf.compare.git.pgm.Returns;
-import org.eclipse.emf.compare.git.pgm.internal.args.RefOptionHandler;
+import org.eclipse.emf.compare.git.pgm.internal.args.RefHandler;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die.DeathType;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die.DiesOn;
@@ -53,7 +53,7 @@
  * </p>
  * <h4>Synopsis</h4>
  * <p>
- * logicalrebase &lt;setup&gt; [&lt;upstream&gt;] [&lt;branch&gt;] [--abort] [--continue] [--quit]
+ * logicalrebase &lt;setup&gt; [&lt;upstream&gt;] [&lt;branch&gt;] [--abort] [--continue] [--skip]
  * [--show-stack-trace] [--git-dir &lt;gitDirectory&gt;]
  * </p>
  * <h4>Description</h4>
@@ -64,14 +64,14 @@
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
  */
 @SuppressWarnings({"restriction", "nls" })
-public class LogicalRebaseApplication extends AbstractLogicalApplication {
+public class RebaseApplication extends AbstractLogicalApplication {
 
 	/** Reference on top of which commits will be rebased. */
-	@Argument(index = 2, required = false, metaVar = "<upstream>", usage = "Upstream reference on top of which commits will be rebased.", handler = RefOptionHandler.class)
+	@Argument(index = 2, required = false, metaVar = "<upstream>", usage = "Upstream reference on top of which commits will be rebased.", handler = RefHandler.class)
 	private Ref upstream;
 
 	/** Reference to rebase. */
-	@Argument(index = 3, required = false, metaVar = "<branch>", usage = "Branch to rebase.", handler = RefOptionHandler.class)
+	@Argument(index = 3, required = false, metaVar = "<branch>", usage = "Branch to rebase.", handler = RefHandler.class)
 	private Ref toRebase;
 
 	/** Continue options. */

diff --git a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/args/RefOptionHandler.java b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/args/RefHandler.java
similarity index 95%
rename from plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/args/RefOptionHandler.java
rename to plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/args/RefHandler.java
index a3258e1..1de2512 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/args/RefOptionHandler.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/args/RefHandler.java

@@ -36,7 +36,7 @@
  * 
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
  */
-public class RefOptionHandler extends OptionHandler<Ref> {
+public class RefHandler extends OptionHandler<Ref> {
 
 	/**
 	 * Constructor.
@@ -48,7 +48,7 @@
 	 * @param setter
 	 *            {@link OptionHandler#setter}
 	 */
-	public RefOptionHandler(CmdLineParser parser, OptionDef option, Setter<? super Ref> setter) {
+	public RefHandler(CmdLineParser parser, OptionDef option, Setter<? super Ref> setter) {
 		super(parser, option, setter);
 		Preconditions.checkArgument(parser instanceof CmdLineParserRepositoryBuilder);
 	}

diff --git a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/args/RevCommitOptionHandler.java b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/args/RevCommitHandler.java
similarity index 94%
rename from plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/args/RevCommitOptionHandler.java
rename to plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/args/RevCommitHandler.java
index 81aea2d..53c5b3b 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/args/RevCommitOptionHandler.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/args/RevCommitHandler.java

@@ -33,7 +33,7 @@
  *
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
  */
-public class RevCommitOptionHandler extends OptionHandler<RevCommit> {
+public class RevCommitHandler extends OptionHandler<RevCommit> {
 
 	/**
 	 * Constructor.
@@ -45,7 +45,7 @@
 	 * @param setter
 	 *            {@link OptionHandler#setter}
 	 */
-	public RevCommitOptionHandler(CmdLineParser parser, OptionDef option,
+	public RevCommitHandler(CmdLineParser parser, OptionDef option,
 			Setter<? super ObjectId> setter) {
 		super(parser, option, setter);
 		Preconditions.checkArgument(parser instanceof CmdLineParserRepositoryBuilder);

diff --git a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/args/SetupFileOptionHandler.java b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/args/SetupFileHandler.java
similarity index 91%
rename from plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/args/SetupFileOptionHandler.java
rename to plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/args/SetupFileHandler.java
index e2d43ee..220a340 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/args/SetupFileOptionHandler.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/args/SetupFileHandler.java

@@ -27,7 +27,7 @@
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
  */
 // TODO: Load the Oomph configuration here
-public class SetupFileOptionHandler extends FileOptionHandler {
+public class SetupFileHandler extends FileOptionHandler {
 	/**
 	 * Constructor.
 	 * 
@@ -38,7 +38,7 @@
 	 * @param setter
 	 *            {@link org.kohsuke.args4j.spi.OptionHandler.OptionHandler#setter}
 	 */
-	public SetupFileOptionHandler(CmdLineParser parser, OptionDef option, Setter<? super File> setter) {
+	public SetupFileHandler(CmdLineParser parser, OptionDef option, Setter<? super File> setter) {
 		super(parser, option, setter);
 	}
 

diff --git a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/AbstractLogicalCommand.java b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/AbstractLogicalCommand.java
index 4284b1d..e1108fa 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/AbstractLogicalCommand.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/AbstractLogicalCommand.java

@@ -41,7 +41,7 @@
 import org.eclipse.emf.compare.git.pgm.internal.ProgressPageLog;
 import org.eclipse.emf.compare.git.pgm.internal.args.CmdLineParserRepositoryBuilder;
 import org.eclipse.emf.compare.git.pgm.internal.args.GitDirHandler;
-import org.eclipse.emf.compare.git.pgm.internal.args.SetupFileOptionHandler;
+import org.eclipse.emf.compare.git.pgm.internal.args.SetupFileHandler;
 import org.eclipse.emf.compare.git.pgm.internal.args.ValidationStatus;
 import org.eclipse.emf.compare.git.pgm.internal.exception.ArgumentValidationError;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die;
@@ -109,7 +109,7 @@
 	/**
 	 * Holds the Oomph model setup file.
 	 */
-	@Argument(index = 0, metaVar = "<setup>", required = true, usage = "Path to the setup file. The setup file is a Oomph model.", handler = SetupFileOptionHandler.class)
+	@Argument(index = 0, metaVar = "<setup>", required = true, usage = "Path to the setup file. The setup file is a Oomph model.", handler = SetupFileHandler.class)
 	private File setupFile;
 
 	/**

diff --git a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/LogicalCherryPickCommand.java b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/CherryPickCommand.java
similarity index 97%
rename from plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/LogicalCherryPickCommand.java
rename to plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/CherryPickCommand.java
index 4a06293..d7fb237 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/LogicalCherryPickCommand.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/CherryPickCommand.java

@@ -17,7 +17,7 @@
 import java.io.IOException;
 import java.util.List;
 
-import org.eclipse.emf.compare.git.pgm.internal.args.RevCommitOptionHandler;
+import org.eclipse.emf.compare.git.pgm.internal.args.RevCommitHandler;
 import org.eclipse.emf.compare.git.pgm.internal.args.ValidationStatus;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die;
 import org.eclipse.emf.compare.git.pgm.internal.util.LogicalApplicationLauncher;
@@ -48,7 +48,7 @@
  * 
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
  */
-public class LogicalCherryPickCommand extends AbstractLogicalCommand {
+public class CherryPickCommand extends AbstractLogicalCommand {
 
 	/** Command name. */
 	static final String LOGICAL_CHERRY_PICK_CMD_NAME = "logicalcherry-pick"; //$NON-NLS-1$
@@ -69,7 +69,7 @@
 	private static final String TAB = "\t"; //$NON-NLS-1$
 
 	/** Holds the {@link RevCommit}s that need to be merged. */
-	@Argument(index = 1, required = false, multiValued = true, metaVar = "<commit>", usage = "Commit IDs to cherry pick.", handler = RevCommitOptionHandler.class)
+	@Argument(index = 1, required = false, multiValued = true, metaVar = "<commit>", usage = "Commit IDs to cherry pick.", handler = RevCommitHandler.class)
 	private List<RevCommit> commits;
 
 	/** Continue options. */

diff --git a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/CommandFactory.java b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/CommandFactory.java
index b2c627f..bdc5749 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/CommandFactory.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/CommandFactory.java

@@ -33,11 +33,11 @@
 	 */
 	private CommandFactory() {
 		cmds = new HashMap<String, Class<? extends AbstractLogicalCommand>>(3);
-		cmds.put(LogicalMergeCommand.LOGICAL_MERGE_CMD_NAME, LogicalMergeCommand.class);
-		cmds.put(LogicalMergeToolCommand.LOGICAL_MERGE_TOOL_CMD_NAME, LogicalMergeToolCommand.class);
-		cmds.put(LogicalDiffCommand.LOGICAL_DIFF_CMD_NAME, LogicalDiffCommand.class);
-		cmds.put(LogicalCherryPickCommand.LOGICAL_CHERRY_PICK_CMD_NAME, LogicalCherryPickCommand.class);
-		cmds.put(LogicalRebaseCommand.LOGICAL_REBASE_CMD_NAME, LogicalRebaseCommand.class);
+		cmds.put(MergeCommand.LOGICAL_MERGE_CMD_NAME, MergeCommand.class);
+		cmds.put(MergeToolCommand.LOGICAL_MERGE_TOOL_CMD_NAME, MergeToolCommand.class);
+		cmds.put(DiffCommand.LOGICAL_DIFF_CMD_NAME, DiffCommand.class);
+		cmds.put(CherryPickCommand.LOGICAL_CHERRY_PICK_CMD_NAME, CherryPickCommand.class);
+		cmds.put(RebaseCommand.LOGICAL_REBASE_CMD_NAME, RebaseCommand.class);
 	}
 
 	/**

diff --git a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/LogicalDiffCommand.java b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/DiffCommand.java
similarity index 94%
rename from plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/LogicalDiffCommand.java
rename to plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/DiffCommand.java
index dbc95da..dc64fc3 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/LogicalDiffCommand.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/DiffCommand.java

@@ -11,7 +11,7 @@
 package org.eclipse.emf.compare.git.pgm.internal.cmd;
 
 import org.eclipse.emf.compare.git.pgm.internal.args.PathFilterHandler;
-import org.eclipse.emf.compare.git.pgm.internal.args.RevCommitOptionHandler;
+import org.eclipse.emf.compare.git.pgm.internal.args.RevCommitHandler;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die;
 import org.eclipse.emf.compare.git.pgm.internal.util.LogicalApplicationLauncher;
 import org.eclipse.jgit.revwalk.RevCommit;
@@ -39,7 +39,7 @@
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
  */
 @SuppressWarnings("restriction")
-public class LogicalDiffCommand extends AbstractLogicalCommand {
+public class DiffCommand extends AbstractLogicalCommand {
 
 	/**
 	 * Command name.
@@ -52,13 +52,13 @@
 	/**
 	 * Holds the reference from which the differences should be displayed.
 	 */
-	@Argument(index = 1, multiValued = false, required = true, metaVar = "<commit>", usage = "Commit ID or branch name.", handler = RevCommitOptionHandler.class)
+	@Argument(index = 1, multiValued = false, required = true, metaVar = "<commit>", usage = "Commit ID or branch name.", handler = RevCommitHandler.class)
 	private RevCommit commit;
 
 	/**
 	 * Optional reference used to view the differences between {@link #commit} and {@link #commitWith}.
 	 */
-	@Argument(index = 2, multiValued = false, required = false, metaVar = "<compareWithCommit>", usage = "Commit ID or branch name. This is to view the changes between <commit> and <compareWithCommit> or HEAD if not specified.", handler = RevCommitOptionHandler.class)
+	@Argument(index = 2, multiValued = false, required = false, metaVar = "<compareWithCommit>", usage = "Commit ID or branch name. This is to view the changes between <commit> and <compareWithCommit> or HEAD if not specified.", handler = RevCommitHandler.class)
 	private RevCommit commitWith;
 
 	/**

diff --git a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/LogicalMergeCommand.java b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeCommand.java
similarity index 95%
rename from plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/LogicalMergeCommand.java
rename to plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeCommand.java
index 1287bdf..d41e28b 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/LogicalMergeCommand.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeCommand.java

@@ -12,7 +12,7 @@
 
 import static org.eclipse.emf.compare.git.pgm.internal.util.EMFCompareGitPGMUtil.EOL;
 
-import org.eclipse.emf.compare.git.pgm.internal.args.RevCommitOptionHandler;
+import org.eclipse.emf.compare.git.pgm.internal.args.RevCommitHandler;
 import org.eclipse.emf.compare.git.pgm.internal.args.ValidationStatus;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die;
 import org.eclipse.emf.compare.git.pgm.internal.util.LogicalApplicationLauncher;
@@ -40,7 +40,7 @@
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
  */
 @SuppressWarnings("restriction")
-public class LogicalMergeCommand extends AbstractLogicalCommand {
+public class MergeCommand extends AbstractLogicalCommand {
 
 	/**
 	 * Command name.
@@ -53,7 +53,7 @@
 	/**
 	 * Holds a ObjectId that need to be merged.
 	 */
-	@Argument(index = 1, required = true, metaVar = "<commit>", usage = "Commit ID or branch name to merge.", handler = RevCommitOptionHandler.class)
+	@Argument(index = 1, required = true, metaVar = "<commit>", usage = "Commit ID or branch name to merge.", handler = RevCommitHandler.class)
 	private RevCommit commit;
 
 	/**

diff --git a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/LogicalMergeToolCommand.java b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeToolCommand.java
similarity index 97%
rename from plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/LogicalMergeToolCommand.java
rename to plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeToolCommand.java
index 517f9b8..71bc9c8 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/LogicalMergeToolCommand.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeToolCommand.java

@@ -33,7 +33,7 @@
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
  */
 @SuppressWarnings("restriction")
-public class LogicalMergeToolCommand extends AbstractLogicalCommand {
+public class MergeToolCommand extends AbstractLogicalCommand {
 
 	/**
 	 * Command name.

diff --git a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/LogicalRebaseCommand.java b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/RebaseCommand.java
similarity index 96%
rename from plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/LogicalRebaseCommand.java
rename to plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/RebaseCommand.java
index 40db9b3..d27ff88 100644
--- a/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/LogicalRebaseCommand.java
+++ b/plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/RebaseCommand.java

@@ -23,7 +23,7 @@
 import java.util.Set;
 
 import org.eclipse.emf.compare.git.pgm.Returns;
-import org.eclipse.emf.compare.git.pgm.internal.args.RefOptionHandler;
+import org.eclipse.emf.compare.git.pgm.internal.args.RefHandler;
 import org.eclipse.emf.compare.git.pgm.internal.args.ValidationStatus;
 import org.eclipse.emf.compare.git.pgm.internal.exception.Die;
 import org.eclipse.emf.compare.git.pgm.internal.util.LogicalApplicationLauncher;
@@ -56,29 +56,29 @@
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
  */
 @SuppressWarnings("nls")
-public class LogicalRebaseCommand extends AbstractLogicalCommand {
-
-	/** Skip option key. */
-	public static final String SKIP_OPT = "--skip"; //$NON-NLS-1$
-
-	/** Abort option key. */
-	public static final String ABORT_OPT = "--abort"; //$NON-NLS-1$
-
-	/** Continue option key. */
-	public static final String CONTINUE_OPT = "--continue"; //$NON-NLS-1$
+public class RebaseCommand extends AbstractLogicalCommand {
 
 	/** Command name. */
 	static final String LOGICAL_REBASE_CMD_NAME = "logicalrebase"; //$NON-NLS-1$
 
 	/** Id of the logicalrebase application. */
-	static final String LOGICALCHERRYPICK_APP_ID = "emf.compare.git.logicalrebase"; //$NON-NLS-1$
+	static final String LOGICAL_REBASE_APP_ID = "emf.compare.git.logicalrebase"; //$NON-NLS-1$
+
+	/** Continue option key. */
+	public static final String CONTINUE_OPT = "--continue"; //$NON-NLS-1$
+
+	/** Abort option key. */
+	public static final String ABORT_OPT = "--abort"; //$NON-NLS-1$
+
+	/** Skip option key. */
+	public static final String SKIP_OPT = "--skip"; //$NON-NLS-1$
 
 	/** Reference on top of which commits will be rebased. */
-	@Argument(index = 1, required = false, metaVar = "<upstream>", usage = "Upstream reference on top of which commits will be rebased.", handler = RefOptionHandler.class)
+	@Argument(index = 1, required = false, metaVar = "<upstream>", usage = "Upstream reference on top of which commits will be rebased.", handler = RefHandler.class)
 	private Ref upstream;
 
 	/** Reference to rebase. */
-	@Argument(index = 2, required = false, metaVar = "<branch>", usage = "Branch to rebase.", handler = RefOptionHandler.class)
+	@Argument(index = 2, required = false, metaVar = "<branch>", usage = "Branch to rebase.", handler = RefHandler.class)
 	private Ref toRebase;
 
 	/** Continue option. */
@@ -123,7 +123,7 @@
 
 		//@formatter:off
 		LogicalApplicationLauncher appLauncher = new LogicalApplicationLauncher(out())
-				.setApplicationName(LOGICALCHERRYPICK_APP_ID)
+				.setApplicationName(LOGICAL_REBASE_APP_ID)
 				.setEclipsePath(eclipseFile.toString())
 				.setSetupFilePath(setupFileAbsolutePath)
 				.setWorkspaceLocation(workspaceLocation)