diff --git a/src/main/java/org/jlib/container/storage/InvalidAdditionalCapacityException.java b/src/main/java/org/jlib/container/storage/InvalidAdditionalCapacityException.java
index 9b2a8324..83ceecdb 100644
--- a/src/main/java/org/jlib/container/storage/InvalidAdditionalCapacityException.java
+++ b/src/main/java/org/jlib/container/storage/InvalidAdditionalCapacityException.java
@@ -24,7 +24,7 @@
 import static org.jlib.core.message.MessageUtility.message;
 
 public class InvalidAdditionalCapacityException
-extends LinearIndexStorageException {
+extends InvalidStorageArgumentException {
 
     private static final long serialVersionUID = 8571768940498236393L;
 
diff --git a/src/main/java/org/jlib/container/storage/LinearIndexStorageException.java b/src/main/java/org/jlib/container/storage/InvalidStorageArgumentException.java
similarity index 87%
rename from src/main/java/org/jlib/container/storage/LinearIndexStorageException.java
rename to src/main/java/org/jlib/container/storage/InvalidStorageArgumentException.java
index 506db343..6e32bfa2 100644
--- a/src/main/java/org/jlib/container/storage/LinearIndexStorageException.java
+++ b/src/main/java/org/jlib/container/storage/InvalidStorageArgumentException.java
@@ -30,12 +30,12 @@
  *
  * @author Igor Akkerman
  */
-public abstract class LinearIndexStorageException
+public abstract class InvalidStorageArgumentException
 extends InvalidArgumentException {
 
     private static final long serialVersionUID = - 1514836335986845986L;
 
-    protected LinearIndexStorageException(final LinearIndexStorage<?> linearIndexStorage, final Message message) {
+    protected InvalidStorageArgumentException(final LinearIndexStorage<?> linearIndexStorage, final Message message) {
         super(message.with("storage", linearIndexStorage));
     }
 }
diff --git a/src/main/java/org/jlib/container/storage/InvalidStorageCapacityException.java b/src/main/java/org/jlib/container/storage/InvalidStorageCapacityException.java
index 9ef252df..4ffe9ba3 100644
--- a/src/main/java/org/jlib/container/storage/InvalidStorageCapacityException.java
+++ b/src/main/java/org/jlib/container/storage/InvalidStorageCapacityException.java
@@ -21,17 +21,16 @@
 
 package org.jlib.container.storage;
 
-import org.jlib.core.exception.InvalidArgumentException;
-
 import static org.jlib.core.message.MessageUtility.message;
 
 /**
- * {@link InvalidArgumentException} thrown when an invalid capacity of an {@link LinearIndexStorage} is specified.
+ * {@link InvalidStorageArgumentException} thrown when an invalid capacity of an {@link LinearIndexStorage} is
+ * specified.
  *
  * @author Igor Akkerman
  */
 public class InvalidStorageCapacityException
-extends LinearIndexStorageException {
+extends InvalidStorageArgumentException {
 
     private static final long serialVersionUID = - 701812048814999842L;
 
diff --git a/src/main/java/org/jlib/container/storage/InvalidStorageIndexException.java b/src/main/java/org/jlib/container/storage/InvalidStorageIndexException.java
index 3d2025ab..134d51e1 100644
--- a/src/main/java/org/jlib/container/storage/InvalidStorageIndexException.java
+++ b/src/main/java/org/jlib/container/storage/InvalidStorageIndexException.java
@@ -24,7 +24,7 @@
 import org.jlib.core.message.Message;
 
 public class InvalidStorageIndexException
-extends LinearIndexStorageException {
+extends InvalidStorageArgumentException {
 
     private static final long serialVersionUID = 2164701656211361191L;
 
diff --git a/src/main/java/org/jlib/container/storage/capacity/InvalidCapacityException.java b/src/main/java/org/jlib/container/storage/capacity/InvalidCapacityException.java
index 9326663b..8db94795 100644
--- a/src/main/java/org/jlib/container/storage/capacity/InvalidCapacityException.java
+++ b/src/main/java/org/jlib/container/storage/capacity/InvalidCapacityException.java
@@ -22,12 +22,12 @@
 package org.jlib.container.storage.capacity;
 
 import org.jlib.container.storage.LinearIndexStorage;
-import org.jlib.container.storage.LinearIndexStorageException;
+import org.jlib.container.storage.InvalidStorageArgumentException;
 
 import static org.jlib.core.message.MessageUtility.message;
 
 public class InvalidCapacityException
-extends LinearIndexStorageException {
+extends InvalidStorageArgumentException {
 
     private static final long serialVersionUID = 2379753107475444861L;