diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/InterruptHandlerFunction.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/InterruptHandlerFunction.java
index 747c1e8f5f..215c3c5ab6 100644
--- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/InterruptHandlerFunction.java
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/InterruptHandlerFunction.java
@@ -18,7 +18,7 @@ import edu.wpi.first.wpilibj.hal.InterruptJNI.InterruptJNIHandlerFunction;
  * @param <T> The type of the parameter that should be returned to the the
  *  method {@link #interruptFired(int, Object)}
  */
-public abstract class InterruptHandlerFunction<T>{
+public abstract class InterruptHandlerFunction<T> {
 	/**
 	 * The entry point for the interrupt. When the interrupt fires the
 	 * {@link #apply(int, Object)} method is called.
@@ -26,7 +26,7 @@ public abstract class InterruptHandlerFunction<T>{
 	 * pass a generic object to the interrupt fired method.
 	 * @author Jonathan Leitschuh
 	 */
-	private class Function implements InterruptJNIHandlerFunction{
+	private class Function implements InterruptJNIHandlerFunction {
 		@SuppressWarnings("unchecked")
 		@Override
 		public void apply(int interruptAssertedMask, Object param) {
@@ -38,10 +38,10 @@ public abstract class InterruptHandlerFunction<T>{
 	/**
 	 * This method is run every time an interrupt is fired.
 	 * @param interruptAssertedMask
-	 * @param param The parameter provided by overriding the {@link #overridableParamater()}
+	 * @param param The parameter provided by overriding the {@link #overridableParameter()}
 	 * method. 
 	 */
-	abstract void interruptFired(int interruptAssertedMask, T param);
+	public abstract void interruptFired(int interruptAssertedMask, T param);
 	
 	
 	/**
@@ -51,7 +51,7 @@ public abstract class InterruptHandlerFunction<T>{
 	 * is run.
 	 * @return The object that should be passed to the interrupt when it runs
 	 */
-	public T overridableParamater(){
+	public T overridableParameter() {
 		return null;
 	}
 }
\ No newline at end of file
diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/InterruptableSensorBase.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/InterruptableSensorBase.java
index af325f79ab..86d3df0e48 100644
--- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/InterruptableSensorBase.java
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/InterruptableSensorBase.java
@@ -100,7 +100,7 @@ public abstract class InterruptableSensorBase extends SensorBase {
 				(byte) (getAnalogTriggerForRouting() ? 1 : 0), status.asIntBuffer());
 		HALUtil.checkStatus(status.asIntBuffer());
 		setUpSourceEdge(true, false);
-		InterruptJNI.attachInterruptHandler(m_interrupt, handler.function, handler.overridableParamater(), status.asIntBuffer());
+		InterruptJNI.attachInterruptHandler(m_interrupt, handler.function, handler.overridableParameter(), status.asIntBuffer());
 		HALUtil.checkStatus(status.asIntBuffer());
 	}
 
diff --git a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/AbstractInterruptTest.java b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/AbstractInterruptTest.java
index ef4e2bfb61..18ea60264f 100644
--- a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/AbstractInterruptTest.java
+++ b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/AbstractInterruptTest.java
@@ -91,7 +91,7 @@ public abstract class AbstractInterruptTest extends AbstractComsSetup {
 		}
 
 		@Override
-		void interruptFired(int interruptAssertedMask, InterruptCounter param) {
+		public void interruptFired(int interruptAssertedMask, InterruptCounter param) {
 			interruptFireTime.set(Utility.getFPGATime());
 			counter.increment();
 			try{
@@ -106,7 +106,7 @@ public abstract class AbstractInterruptTest extends AbstractComsSetup {
 		};
 
 		@Override
-		public InterruptCounter overridableParamater(){
+		public InterruptCounter overridableParameter(){
 			return counter;
 		}
 	};