diff --git a/src/fr/devinsy/sikevadb/SikevaDBLauncher.java b/src/fr/devinsy/sikevadb/SikevaDBLauncher.java
index 4feb1d2..c734f40 100644
--- a/src/fr/devinsy/sikevadb/SikevaDBLauncher.java
+++ b/src/fr/devinsy/sikevadb/SikevaDBLauncher.java
@@ -25,7 +25,7 @@ import org.apache.log4j.PropertyConfigurator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import fr.devinsy.sikevadb.cli.SikevaCLI;
+import fr.devinsy.sikevadb.cli.SikevaDBCLI;
 
 /**
  * This class Siba stands for Simple Backup. This is the main class.
@@ -72,7 +72,7 @@ public final class SikevaDBLauncher
 		}
 		else
 		{
-			SikevaCLI.run(args);
+			SikevaDBCLI.run(args);
 		}
 	}
 }
diff --git a/src/fr/devinsy/sikevadb/cli/SikevaCLI.java b/src/fr/devinsy/sikevadb/cli/SikevaDBCLI.java
similarity index 96%
rename from src/fr/devinsy/sikevadb/cli/SikevaCLI.java
rename to src/fr/devinsy/sikevadb/cli/SikevaDBCLI.java
index 7009474..e21eb87 100644
--- a/src/fr/devinsy/sikevadb/cli/SikevaCLI.java
+++ b/src/fr/devinsy/sikevadb/cli/SikevaDBCLI.java
@@ -36,14 +36,14 @@ import fr.devinsy.util.strings.StringList;
  * 
  * 
  */
-public final class SikevaCLI
+public final class SikevaDBCLI
 {
-	private static Logger logger = LoggerFactory.getLogger(SikevaCLI.class);
+	private static Logger logger = LoggerFactory.getLogger(SikevaDBCLI.class);
 
 	/**
      *
      */
-	private SikevaCLI()
+	private SikevaDBCLI()
 	{
 	}
 
@@ -86,7 +86,7 @@ public final class SikevaCLI
 		}
 
 		// Run.
-		SikevaCLI.run(args);
+		SikevaDBCLI.run(args);
 	}
 
 	/**
diff --git a/src/fr/devinsy/sikevadb/cli/SikevaCLIException.java b/src/fr/devinsy/sikevadb/cli/SikevaDBCLIException.java
similarity index 78%
rename from src/fr/devinsy/sikevadb/cli/SikevaCLIException.java
rename to src/fr/devinsy/sikevadb/cli/SikevaDBCLIException.java
index 5a86281..6705151 100644
--- a/src/fr/devinsy/sikevadb/cli/SikevaCLIException.java
+++ b/src/fr/devinsy/sikevadb/cli/SikevaDBCLIException.java
@@ -18,17 +18,19 @@
  */
 package fr.devinsy.sikevadb.cli;
 
+import fr.devinsy.sikevadb.core.SikevaDBException;
+
 /**
  * 
  */
-public class SikevaCLIException extends Exception
+public class SikevaDBCLIException extends SikevaDBException
 {
 	private static final long serialVersionUID = 2986878456227891377L;
 
 	/**
 	 *
 	 */
-	public SikevaCLIException()
+	public SikevaDBCLIException()
 	{
 		super();
 	}
@@ -37,7 +39,7 @@ public class SikevaCLIException extends Exception
 	 * 
 	 * @param message
 	 */
-	public SikevaCLIException(final String message)
+	public SikevaDBCLIException(final String message)
 	{
 		super(message);
 	}
@@ -47,7 +49,7 @@ public class SikevaCLIException extends Exception
 	 * @param message
 	 * @param cause
 	 */
-	public SikevaCLIException(final String message, final Throwable cause)
+	public SikevaDBCLIException(final String message, final Throwable cause)
 	{
 		super(message, cause);
 	}
@@ -56,7 +58,7 @@ public class SikevaCLIException extends Exception
 	 * 
 	 * @param cause
 	 */
-	public SikevaCLIException(final Throwable cause)
+	public SikevaDBCLIException(final Throwable cause)
 	{
 		super(cause);
 	}