diff --git a/src/main/java/li/cil/oc2/common/bus/device/item/ByteBufferFlashMemoryVMDevice.java b/src/main/java/li/cil/oc2/common/bus/device/item/ByteBufferFlashMemoryVMDevice.java
index 5c19d966..7b7bd6eb 100644
--- a/src/main/java/li/cil/oc2/common/bus/device/item/ByteBufferFlashMemoryVMDevice.java
+++ b/src/main/java/li/cil/oc2/common/bus/device/item/ByteBufferFlashMemoryVMDevice.java
@@ -37,8 +37,8 @@ public final class ByteBufferFlashMemoryVMDevice extends IdentityProxy<ItemStack
 
     ///////////////////////////////////////////////////////////////
 
-    public ByteBufferFlashMemoryVMDevice(final ItemStack value, final int size) {
-        super(value);
+    public ByteBufferFlashMemoryVMDevice(final ItemStack identity, final int size) {
+        super(identity);
         this.size = size;
     }
 
diff --git a/src/main/java/li/cil/oc2/common/bus/device/item/FirmwareFlashMemoryVMDevice.java b/src/main/java/li/cil/oc2/common/bus/device/item/FirmwareFlashMemoryVMDevice.java
index 5710b583..4f0acb6d 100644
--- a/src/main/java/li/cil/oc2/common/bus/device/item/FirmwareFlashMemoryVMDevice.java
+++ b/src/main/java/li/cil/oc2/common/bus/device/item/FirmwareFlashMemoryVMDevice.java
@@ -13,8 +13,8 @@ public final class FirmwareFlashMemoryVMDevice extends IdentityProxy<ItemStack>
 
     ///////////////////////////////////////////////////////////////
 
-    public FirmwareFlashMemoryVMDevice(final ItemStack stack, final Firmware firmware) {
-        super(stack);
+    public FirmwareFlashMemoryVMDevice(final ItemStack identity, final Firmware firmware) {
+        super(identity);
         this.firmware = firmware;
     }
 
diff --git a/src/main/java/li/cil/oc2/common/bus/device/item/HardDriveVMDevice.java b/src/main/java/li/cil/oc2/common/bus/device/item/HardDriveVMDevice.java
index 338c5fcf..a47671c4 100644
--- a/src/main/java/li/cil/oc2/common/bus/device/item/HardDriveVMDevice.java
+++ b/src/main/java/li/cil/oc2/common/bus/device/item/HardDriveVMDevice.java
@@ -13,8 +13,8 @@ public final class HardDriveVMDevice extends AbstractHardDriveVMDevice<ByteBuffe
 
     ///////////////////////////////////////////////////////////////////
 
-    public HardDriveVMDevice(final ItemStack stack, final int size, final boolean readonly) {
-        super(stack);
+    public HardDriveVMDevice(final ItemStack identity, final int size, final boolean readonly) {
+        super(identity);
         this.size = size;
         this.readonly = readonly;
     }
diff --git a/src/main/java/li/cil/oc2/common/bus/device/item/RedstoneInterfaceCardItemDevice.java b/src/main/java/li/cil/oc2/common/bus/device/item/RedstoneInterfaceCardItemDevice.java
index 1a7cd2cf..9e5450bd 100644
--- a/src/main/java/li/cil/oc2/common/bus/device/item/RedstoneInterfaceCardItemDevice.java
+++ b/src/main/java/li/cil/oc2/common/bus/device/item/RedstoneInterfaceCardItemDevice.java
@@ -47,8 +47,8 @@ public final class RedstoneInterfaceCardItemDevice extends IdentityProxy<ItemSta
 
     ///////////////////////////////////////////////////////////////////
 
-    public RedstoneInterfaceCardItemDevice(final ItemStack value, final TileEntity tileEntity) {
-        super(value);
+    public RedstoneInterfaceCardItemDevice(final ItemStack identity, final TileEntity tileEntity) {
+        super(identity);
         this.tileEntity = tileEntity;
         this.device = new ObjectDevice(this, "redstone");
 
diff --git a/src/main/java/li/cil/oc2/common/bus/device/item/SparseHardDriveVMDevice.java b/src/main/java/li/cil/oc2/common/bus/device/item/SparseHardDriveVMDevice.java
index 700ddedb..5e286aba 100644
--- a/src/main/java/li/cil/oc2/common/bus/device/item/SparseHardDriveVMDevice.java
+++ b/src/main/java/li/cil/oc2/common/bus/device/item/SparseHardDriveVMDevice.java
@@ -19,8 +19,8 @@ public final class SparseHardDriveVMDevice extends AbstractHardDriveVMDevice<Spa
 
     ///////////////////////////////////////////////////////////////////
 
-    public SparseHardDriveVMDevice(final ItemStack stack, final BlockDevice base, final boolean readonly) {
-        super(stack);
+    public SparseHardDriveVMDevice(final ItemStack identity, final BlockDevice base, final boolean readonly) {
+        super(identity);
         this.base = base;
         this.readonly = readonly;
     }
diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/block/EnergyStorageBlockDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/block/EnergyStorageBlockDeviceProvider.java
index 92c7fcce..ad8be5b8 100644
--- a/src/main/java/li/cil/oc2/common/bus/device/provider/block/EnergyStorageBlockDeviceProvider.java
+++ b/src/main/java/li/cil/oc2/common/bus/device/provider/block/EnergyStorageBlockDeviceProvider.java
@@ -26,8 +26,8 @@ public final class EnergyStorageBlockDeviceProvider extends AbstractTileEntityCa
     ///////////////////////////////////////////////////////////////////
 
     public static final class EnergyStorageDevice extends IdentityProxy<IEnergyStorage> {
-        public EnergyStorageDevice(final IEnergyStorage energyStorage) {
-            super(energyStorage);
+        public EnergyStorageDevice(final IEnergyStorage identity) {
+            super(identity);
         }
 
         @Callback
diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/block/FluidHandlerBlockDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/block/FluidHandlerBlockDeviceProvider.java
index 186b3b90..425d08a4 100644
--- a/src/main/java/li/cil/oc2/common/bus/device/provider/block/FluidHandlerBlockDeviceProvider.java
+++ b/src/main/java/li/cil/oc2/common/bus/device/provider/block/FluidHandlerBlockDeviceProvider.java
@@ -27,8 +27,8 @@ public final class FluidHandlerBlockDeviceProvider extends AbstractTileEntityCap
     ///////////////////////////////////////////////////////////////////
 
     public static final class FluidHandlerDevice extends IdentityProxy<IFluidHandler> {
-        public FluidHandlerDevice(final IFluidHandler fluidHandler) {
-            super(fluidHandler);
+        public FluidHandlerDevice(final IFluidHandler identity) {
+            super(identity);
         }
 
         @Callback
diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/block/ItemHandlerBlockDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/block/ItemHandlerBlockDeviceProvider.java
index 39da1e86..cacac860 100644
--- a/src/main/java/li/cil/oc2/common/bus/device/provider/block/ItemHandlerBlockDeviceProvider.java
+++ b/src/main/java/li/cil/oc2/common/bus/device/provider/block/ItemHandlerBlockDeviceProvider.java
@@ -27,8 +27,8 @@ public final class ItemHandlerBlockDeviceProvider extends AbstractTileEntityCapa
     ///////////////////////////////////////////////////////////////////
 
     public static final class ItemHandlerDevice extends IdentityProxy<IItemHandler> {
-        public ItemHandlerDevice(final IItemHandler itemHandler) {
-            super(itemHandler);
+        public ItemHandlerDevice(final IItemHandler identity) {
+            super(identity);
         }
 
         @Callback
diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/provider/package-info.java
new file mode 100644
index 00000000..7f699222
--- /dev/null
+++ b/src/main/java/li/cil/oc2/common/bus/device/provider/package-info.java
@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package li.cil.oc2.common.bus.device.provider;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
\ No newline at end of file