diff --git a/src/main/java/refinedstorage/network/MessageWirelessGridCraftingStart.java b/src/main/java/refinedstorage/network/MessageWirelessGridCraftingStart.java
index da8dff55c..303b93b73 100755
--- a/src/main/java/refinedstorage/network/MessageWirelessGridCraftingStart.java
+++ b/src/main/java/refinedstorage/network/MessageWirelessGridCraftingStart.java
@@ -47,7 +47,7 @@ public class MessageWirelessGridCraftingStart extends MessageHandlerPlayerToServ
     public void handle(MessageWirelessGridCraftingStart message, EntityPlayerMP player) {
         TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.controllerX, message.controllerY, message.controllerZ));
 
-        if (tile instanceof TileController && ((TileController) tile).canRun()) {
+        if (tile instanceof TileController && ((TileController) tile).mayRun()) {
             ((TileController) tile).onCraftingRequested(message.id, message.quantity);
         }
     }
diff --git a/src/main/java/refinedstorage/network/MessageWirelessGridStoragePull.java b/src/main/java/refinedstorage/network/MessageWirelessGridStoragePull.java
index 5d3c62e2b..fdb36535e 100755
--- a/src/main/java/refinedstorage/network/MessageWirelessGridStoragePull.java
+++ b/src/main/java/refinedstorage/network/MessageWirelessGridStoragePull.java
@@ -47,7 +47,7 @@ public class MessageWirelessGridStoragePull extends MessageHandlerPlayerToServer
     public void handle(MessageWirelessGridStoragePull message, EntityPlayerMP player) {
         TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.controllerX, message.controllerY, message.controllerZ));
 
-        if (tile instanceof TileController && ((TileController) tile).canRun()) {
+        if (tile instanceof TileController && ((TileController) tile).mayRun()) {
             ((TileController) tile).handleStoragePull(message.id, message.flags, player);
         }
     }
diff --git a/src/main/java/refinedstorage/network/MessageWirelessGridStoragePush.java b/src/main/java/refinedstorage/network/MessageWirelessGridStoragePush.java
index 40502c63b..1254b2291 100755
--- a/src/main/java/refinedstorage/network/MessageWirelessGridStoragePush.java
+++ b/src/main/java/refinedstorage/network/MessageWirelessGridStoragePush.java
@@ -47,7 +47,7 @@ public class MessageWirelessGridStoragePush extends MessageHandlerPlayerToServer
     public void handle(MessageWirelessGridStoragePush message, EntityPlayerMP player) {
         TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.controllerX, message.controllerY, message.controllerZ));
 
-        if (tile instanceof TileController && ((TileController) tile).canRun()) {
+        if (tile instanceof TileController && ((TileController) tile).mayRun()) {
             ((TileController) tile).handleStoragePush(message.playerSlot, message.one, player);
         }
     }
diff --git a/src/main/java/refinedstorage/storage/DiskStorage.java b/src/main/java/refinedstorage/storage/DiskStorage.java
index f31d3bd42..bc5f6e7f6 100755
--- a/src/main/java/refinedstorage/storage/DiskStorage.java
+++ b/src/main/java/refinedstorage/storage/DiskStorage.java
@@ -20,7 +20,7 @@ public class DiskStorage extends NBTStorage {
     }
 
     @Override
-    public boolean canPush(ItemStack stack) {
-        return ModeConfigUtils.doesNotViolateMode(diskDrive.getInventory(), diskDrive.getModeConfig(), diskDrive.getCompare(), stack) && super.canPush(stack);
+    public boolean mayPush(ItemStack stack) {
+        return ModeConfigUtils.doesNotViolateMode(diskDrive.getInventory(), diskDrive.getModeConfig(), diskDrive.getCompare(), stack) && super.mayPush(stack);
     }
 }
diff --git a/src/main/java/refinedstorage/storage/IStorage.java b/src/main/java/refinedstorage/storage/IStorage.java
index 9d48e340b..48975994f 100755
--- a/src/main/java/refinedstorage/storage/IStorage.java
+++ b/src/main/java/refinedstorage/storage/IStorage.java
@@ -11,7 +11,7 @@ public interface IStorage {
 
     ItemStack take(ItemStack stack, int flags);
 
-    boolean canPush(ItemStack stack);
+    boolean mayPush(ItemStack stack);
 
     int getPriority();
 }
diff --git a/src/main/java/refinedstorage/storage/NBTStorage.java b/src/main/java/refinedstorage/storage/NBTStorage.java
index ad376322b..94b890c87 100755
--- a/src/main/java/refinedstorage/storage/NBTStorage.java
+++ b/src/main/java/refinedstorage/storage/NBTStorage.java
@@ -124,7 +124,7 @@ public abstract class NBTStorage implements IStorage {
     }
 
     @Override
-    public boolean canPush(ItemStack stack) {
+    public boolean mayPush(ItemStack stack) {
         return capacity == -1 || (getStored(tag) + stack.stackSize) <= capacity;
     }
 
diff --git a/src/main/java/refinedstorage/storage/StorageBlockStorage.java b/src/main/java/refinedstorage/storage/StorageBlockStorage.java
index 6d2cac653..e4be8f20d 100755
--- a/src/main/java/refinedstorage/storage/StorageBlockStorage.java
+++ b/src/main/java/refinedstorage/storage/StorageBlockStorage.java
@@ -19,7 +19,7 @@ public class StorageBlockStorage extends NBTStorage {
     }
 
     @Override
-    public boolean canPush(ItemStack stack) {
-        return ModeConfigUtils.doesNotViolateMode(storage.getInventory(), storage, storage.getCompare(), stack) && super.canPush(stack);
+    public boolean mayPush(ItemStack stack) {
+        return ModeConfigUtils.doesNotViolateMode(storage.getInventory(), storage, storage.getCompare(), stack) && super.mayPush(stack);
     }
 }
diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java
index cbd7fb515..7b66d3b42 100755
--- a/src/main/java/refinedstorage/tile/TileController.java
+++ b/src/main/java/refinedstorage/tile/TileController.java
@@ -122,7 +122,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
 
             int lastEnergy = energy.getEnergyStored();
 
-            if (canRun()) {
+            if (mayRun()) {
                 if (ticks % 20 == 0) {
                     syncMachines();
                 }
@@ -157,8 +157,8 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
                 disconnectAll();
             }
 
-            if (couldRun != canRun()) {
-                couldRun = canRun();
+            if (couldRun != mayRun()) {
+                couldRun = mayRun();
 
                 worldObj.notifyNeighborsOfStateChange(pos, RefinedStorageBlocks.CONTROLLER);
             }
@@ -174,7 +174,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
                 if (!RefinedStorageUtils.compareStack(consumer.getWirelessGrid(), consumer.getPlayer().getHeldItem(consumer.getHand()))) {
                     consumer.getPlayer().closeScreen(); // This will call onContainerClosed on the Container and remove it from the list
                 } else {
-                    if (canRun()) {
+                    if (mayRun()) {
                         RefinedStorage.NETWORK.sendTo(new MessageWirelessGridItems(this), (EntityPlayerMP) consumer.getPlayer());
                     }
                 }
@@ -365,7 +365,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
 
     public boolean push(ItemStack stack) {
         for (IStorage storage : storages) {
-            if (storage.canPush(stack)) {
+            if (storage.mayPush(stack)) {
                 storage.push(stack);
 
                 syncItems();
@@ -559,7 +559,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
         return true;
     }
 
-    public boolean canRun() {
+    public boolean mayRun() {
         return energy.getEnergyStored() > 0 && energy.getEnergyStored() >= energyUsage && redstoneMode.isEnabled(worldObj, pos);
     }
 
diff --git a/src/main/java/refinedstorage/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java
index 9c089d2ab..6ec24159d 100755
--- a/src/main/java/refinedstorage/tile/TileExternalStorage.java
+++ b/src/main/java/refinedstorage/tile/TileExternalStorage.java
@@ -134,7 +134,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
     }
 
     @Override
-    public boolean canPush(ItemStack stack) {
+    public boolean mayPush(ItemStack stack) {
         if (ModeConfigUtils.doesNotViolateMode(inventory, this, compare, stack)) {
             TileEntity connectedTile = getConnectedTile();
 
diff --git a/src/main/java/refinedstorage/tile/TileMachine.java b/src/main/java/refinedstorage/tile/TileMachine.java
index 976d471fb..35da2942f 100755
--- a/src/main/java/refinedstorage/tile/TileMachine.java
+++ b/src/main/java/refinedstorage/tile/TileMachine.java
@@ -55,8 +55,8 @@ public abstract class TileMachine extends TileBase implements ISynchronizedConta
                 searchController(worldObj);
             }
 
-            if (wasConnected != (isConnected() && mayUpdate()) && maySendConnectivityData()) {
-                wasConnected = isConnected() && mayUpdate();
+            if (wasConnected != isActive() && maySendConnectivityData()) {
+                wasConnected = isActive();
 
                 RefinedStorageUtils.updateBlock(worldObj, pos);
             }
@@ -71,6 +71,10 @@ public abstract class TileMachine extends TileBase implements ISynchronizedConta
         return redstoneMode.isEnabled(worldObj, pos);
     }
 
+    public boolean isActive() {
+        return connected && mayUpdate();
+    }
+
     public void onConnected(World world, TileController controller) {
         if (tryConnect(controller)) {
             world.notifyNeighborsOfStateChange(pos, block);
@@ -78,7 +82,7 @@ public abstract class TileMachine extends TileBase implements ISynchronizedConta
     }
 
     private boolean tryConnect(TileController controller) {
-        if (!controller.canRun()) {
+        if (!controller.mayRun()) {
             return false;
         }
 
@@ -155,7 +159,7 @@ public abstract class TileMachine extends TileBase implements ISynchronizedConta
     public void writeToDescriptionPacketNBT(NBTTagCompound tag) {
         super.writeToDescriptionPacketNBT(tag);
 
-        tag.setBoolean(NBT_DESC_CONNECTED, isConnected() && mayUpdate());
+        tag.setBoolean(NBT_DESC_CONNECTED, isActive());
     }
 
     public void readFromDescriptionPacketNBT(NBTTagCompound tag) {