diff --git a/integration/modules/helpers/NullRFHandler.java b/integration/modules/helpers/NullRFHandler.java
index d0249d655..2174c19c5 100644
--- a/integration/modules/helpers/NullRFHandler.java
+++ b/integration/modules/helpers/NullRFHandler.java
@@ -17,12 +17,6 @@ public class NullRFHandler implements IEnergyHandler
 		return 0;
 	}
 
-	@Override
-	public boolean canInterface(ForgeDirection from)
-	{
-		return true;
-	}
-
 	@Override
 	public int getEnergyStored(ForgeDirection from)
 	{
@@ -35,4 +29,15 @@ public class NullRFHandler implements IEnergyHandler
 		return 0;
 	}
 
+	@Deprecated
+	public boolean canInterface(ForgeDirection from)
+	{
+		return true;
+	}
+
+	@Override
+	public boolean canConnectEnergy(ForgeDirection from) {
+		return true;
+	}
+
 }
diff --git a/parts/p2p/PartP2PRFPower.java b/parts/p2p/PartP2PRFPower.java
index bd7922645..2cab3fe62 100644
--- a/parts/p2p/PartP2PRFPower.java
+++ b/parts/p2p/PartP2PRFPower.java
@@ -156,12 +156,6 @@ public class PartP2PRFPower extends PartP2PTunnel<PartP2PRFPower> implements cof
 		return 0;
 	}
 
-	@Override
-	public boolean canInterface(ForgeDirection from)
-	{
-		return true;
-	}
-
 	@Override
 	public int getEnergyStored(ForgeDirection from)
 	{
@@ -249,4 +243,15 @@ public class PartP2PRFPower extends PartP2PTunnel<PartP2PRFPower> implements cof
 		}
 		return myNullHandler;
 	}
+
+	@Deprecated
+	public boolean canInterface(ForgeDirection from)
+	{
+		return true;
+	}
+
+	@Override
+	public boolean canConnectEnergy(ForgeDirection from) {
+		return true;
+	}
 }
diff --git a/tile/powersink/RedstoneFlux.java b/tile/powersink/RedstoneFlux.java
index a2ac0e8fa..5faebb49f 100644
--- a/tile/powersink/RedstoneFlux.java
+++ b/tile/powersink/RedstoneFlux.java
@@ -34,8 +34,13 @@ public abstract class RedstoneFlux extends RotaryCraft implements IEnergyHandler
 		return 0;
 	}
 
-	@Override
+	@Deprecated
 	final public boolean canInterface(ForgeDirection from)
+	{
+		return canConnectEnergy(from);
+	}
+	
+	final public boolean canConnectEnergy(ForgeDirection from)
 	{
 		return internalCanAcceptPower && getPowerSides().contains( from );
 	}