diff --git a/java/libraries/io/src/processing/io/GPIO.java b/java/libraries/io/src/processing/io/GPIO.java
index a0b970955..fc86d2343 100644
--- a/java/libraries/io/src/processing/io/GPIO.java
+++ b/java/libraries/io/src/processing/io/GPIO.java
@@ -451,12 +451,17 @@ public class GPIO {
    *  @return true if the interrupt occured, false if the timeout occured
    *  @webref
    */
-  public static boolean waitForInterrupt(int pin, int mode, int timeout) {
+  public static boolean waitFor(int pin, int mode, int timeout) {
     enableInterrupt(pin, mode);
     return waitForInterrupt(pin, timeout);
   }
 
 
+  public static boolean waitForInterrupt(int pin, int mode, int timeout) {
+    throw new RuntimeException("The waitForInterrupt function has been renamed to waitFor. Please update your sketch accordingly.");
+  }
+
+
   /**
    *  Waits for the value of an input pin to change
    *