diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java
index 466029b4a..3b96e180e 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java
@@ -182,7 +182,7 @@ public final class RSUtils {
     }
 
     public static AccessType readAccessType(NBTTagCompound tag) {
-        return tag.hasKey(NBT_ACCESS_TYPE) ? getAccessType(tag.getInteger(NBT_ACCESS_TYPE)) : AccessType.EXTRACT_INSERT;
+        return tag.hasKey(NBT_ACCESS_TYPE) ? getAccessType(tag.getInteger(NBT_ACCESS_TYPE)) : AccessType.INSERT_EXTRACT;
     }
 
     public static AccessType getAccessType(int id) {
@@ -192,7 +192,7 @@ public final class RSUtils {
             }
         }
 
-        return AccessType.EXTRACT_INSERT;
+        return AccessType.INSERT_EXTRACT;
     }
 
     public static IItemHandler getItemHandler(TileEntity tile, EnumFacing side) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/AccessType.java b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/AccessType.java
index a22c8b480..f1cf1a5db 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/AccessType.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/AccessType.java
@@ -5,9 +5,9 @@ package com.raoulvdberge.refinedstorage.api.storage;
  */
 public enum AccessType {
     /**
-     * Extract and insert ability.
+     * Insert and extract ability.
      */
-    EXTRACT_INSERT(0),
+    INSERT_EXTRACT(0),
     /**
      * Only extract ability.
      */
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorage.java
index cf149fbb5..6600f2756 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorage.java
@@ -22,6 +22,6 @@ public interface IStorage<T> {
      * @return the access type of this storage
      */
     default AccessType getAccessType() {
-        return AccessType.EXTRACT_INSERT;
+        return AccessType.INSERT_EXTRACT;
     }
 }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
index 4ddf7e802..bc9f18308 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
@@ -520,7 +520,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
         }
 
         int orginalSize = size;
-        AccessType accessType = AccessType.EXTRACT_INSERT;
+        AccessType accessType = AccessType.INSERT_EXTRACT;
         ItemStack remainder = stack;
 
         for (IItemStorage storage : this.itemStorage.getStorages()) {
@@ -620,7 +620,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
         }
 
         int orginalSize = size;
-        AccessType accessType = AccessType.EXTRACT_INSERT;
+        AccessType accessType = AccessType.INSERT_EXTRACT;
         FluidStack remainder = stack;
 
         for (IFluidStorage storage : this.fluidStorage.getStorages()) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java
index 96e3448cf..49f5a0163 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java
@@ -185,7 +185,7 @@ public class TileDiskDrive extends TileNode implements IItemStorageProvider, IFl
     private ItemStorage itemStorages[] = new ItemStorage[8];
     private FluidStorage fluidStorages[] = new FluidStorage[8];
 
-    private AccessType accessType = AccessType.EXTRACT_INSERT;
+    private AccessType accessType = AccessType.INSERT_EXTRACT;
     private int priority = 0;
     private int compare = IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE;
     private int mode = IFilterable.WHITELIST;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidStorage.java
index a1ef1a806..263a1b3c8 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidStorage.java
@@ -81,7 +81,7 @@ public class TileFluidStorage extends TileNode implements IFluidStorageProvider,
 
     private EnumFluidStorageType type;
 
-    private AccessType accessType = AccessType.EXTRACT_INSERT;
+    private AccessType accessType = AccessType.INSERT_EXTRACT;
     private int priority = 0;
     private int compare = IComparer.COMPARE_NBT;
     private int mode = IFilterable.WHITELIST;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorage.java
index 17b1fbd7d..ebc541bca 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorage.java
@@ -82,7 +82,7 @@ public class TileStorage extends TileNode implements IItemStorageProvider, IStor
 
     private EnumItemStorageType type;
 
-    private AccessType accessType = AccessType.EXTRACT_INSERT;
+    private AccessType accessType = AccessType.INSERT_EXTRACT;
     private int priority = 0;
     private int compare = IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE;
     private int mode = IFilterable.WHITELIST;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IAccessType.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IAccessType.java
index 0a2916298..48d30d509 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IAccessType.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IAccessType.java
@@ -9,7 +9,7 @@ import net.minecraft.tileentity.TileEntity;
 
 public interface IAccessType {
     static <T extends TileEntity & IAccessType> TileDataParameter<AccessType> createParameter() {
-        return new TileDataParameter<>(RSSerializers.ACCESS_TYPE_SERIALIZER, AccessType.EXTRACT_INSERT, new ITileDataProducer<AccessType, T>() {
+        return new TileDataParameter<>(RSSerializers.ACCESS_TYPE_SERIALIZER, AccessType.INSERT_EXTRACT, new ITileDataProducer<AccessType, T>() {
             @Override
             public AccessType getValue(T tile) {
                 return tile.getAccessType();
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java
index 26e01eda2..d687d1e31 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java
@@ -13,7 +13,7 @@ import java.util.List;
 public class ItemStorageItemHandler extends ItemStorageExternal {
     private TileExternalStorage externalStorage;
     private IItemHandler handler;
-    private AccessType lockedAccessType = AccessType.EXTRACT_INSERT;
+    private AccessType lockedAccessType = AccessType.INSERT_EXTRACT;
 
     public ItemStorageItemHandler(TileExternalStorage externalStorage, IItemHandler handler) {
         this.externalStorage = externalStorage;
@@ -100,6 +100,6 @@ public class ItemStorageItemHandler extends ItemStorageExternal {
 
     @Override
     public AccessType getAccessType() {
-        return ((lockedAccessType != AccessType.EXTRACT_INSERT) ? lockedAccessType : externalStorage.getAccessType());
+        return ((lockedAccessType != AccessType.INSERT_EXTRACT) ? lockedAccessType : externalStorage.getAccessType());
     }
 }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/TileExternalStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/TileExternalStorage.java
index 902e2a29d..b2c840276 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/TileExternalStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/externalstorage/TileExternalStorage.java
@@ -83,7 +83,7 @@ public class TileExternalStorage extends TileMultipartNode implements IItemStora
     private int compare = IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE;
     private int mode = IFilterable.WHITELIST;
     private int type = IType.ITEMS;
-    private AccessType accessType = AccessType.EXTRACT_INSERT;
+    private AccessType accessType = AccessType.INSERT_EXTRACT;
 
     private List<ItemStorageExternal> itemStorages = new ArrayList<>();
     private List<FluidStorageExternal> fluidStorages = new ArrayList<>();