diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/AnalogTrigger.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/AnalogTrigger.java
index 79c23149b4..3fa915ca2b 100644
--- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/AnalogTrigger.java
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/AnalogTrigger.java
@@ -7,16 +7,17 @@
 
 package edu.wpi.first.wpilibj;
 
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
-
+import edu.wpi.first.wpilibj.AnalogTriggerOutput.AnalogTriggerType;
 import edu.wpi.first.wpilibj.communication.FRCNetworkCommunicationsLibrary.tResourceType;
 import edu.wpi.first.wpilibj.communication.UsageReporting;
 import edu.wpi.first.wpilibj.hal.AnalogJNI;
 import edu.wpi.first.wpilibj.hal.HALUtil;
 import edu.wpi.first.wpilibj.util.BoundaryException;
+
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+
 //import com.sun.jna.Pointer;
-import edu.wpi.first.wpilibj.AnalogTriggerOutput.AnalogTriggerType;
 
 /**
  * Class for creating and configuring Analog Triggers
@@ -217,7 +218,7 @@ public class AnalogTrigger {
 	 *            An enum of the type of output object to create.
 	 * @return A pointer to a new AnalogTriggerOutput object.
 	 */
-	AnalogTriggerOutput createOutput(AnalogTriggerType type) {
+	public AnalogTriggerOutput createOutput(AnalogTriggerType type) {
 		return new AnalogTriggerOutput(this, type);
 	}
 }
diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java
index b79c1820f5..3c9a431a61 100644
--- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java
@@ -7,13 +7,13 @@
 
 package edu.wpi.first.wpilibj;
 
-import java.nio.IntBuffer;
-
 import edu.wpi.first.wpilibj.communication.FRCNetworkCommunicationsLibrary.tResourceType;
 import edu.wpi.first.wpilibj.communication.UsageReporting;
 import edu.wpi.first.wpilibj.hal.AnalogJNI;
 import edu.wpi.first.wpilibj.hal.HALUtil;
 
+import java.nio.IntBuffer;
+
 /**
  * Class to represent a specific output from an analog trigger. This class is
  * used to get the current output value and also as a DigitalSource to provide
@@ -128,10 +128,10 @@ public class AnalogTriggerOutput extends DigitalSource {
 	 * @author jonathanleitschuh
 	 */
 	public enum AnalogTriggerType{
-		IN_WINDOW(AnalogJNI.AnalogTriggerType.kInWindow),
-		STATE(AnalogJNI.AnalogTriggerType.kState),
-		RISING_PULSE(AnalogJNI.AnalogTriggerType.kRisingPulse),
-		FALLING_PULSE(AnalogJNI.AnalogTriggerType.kFallingPulse);
+		kInWindow(AnalogJNI.AnalogTriggerType.kInWindow),
+		kState(AnalogJNI.AnalogTriggerType.kState),
+		kRisingPulse(AnalogJNI.AnalogTriggerType.kRisingPulse),
+		kFallingPulse(AnalogJNI.AnalogTriggerType.kFallingPulse);
 		
 		private final int value;
 		
diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Counter.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Counter.java
index ffb895d6cc..6331806e53 100644
--- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Counter.java
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Counter.java
@@ -196,7 +196,7 @@ public class Counter extends SensorBase implements CounterBase,
 			throw new NullPointerException("The Analog Trigger given was null");
 		}
 		initCounter(Mode.kTwoPulse);
-		setUpSource(trigger.createOutput(AnalogTriggerType.STATE));
+		setUpSource(trigger.createOutput(AnalogTriggerType.kState));
 	}
 
 	@Override
diff --git a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/AnalogCrossConnectTest.java b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/AnalogCrossConnectTest.java
index 9ad2ae14c1..89c82f05ea 100644
--- a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/AnalogCrossConnectTest.java
+++ b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/AnalogCrossConnectTest.java
@@ -165,7 +165,7 @@ public class AnalogCrossConnectTest extends AbstractInterruptTest {
 	InterruptableSensorBase giveInterruptableSensorBase() {
 		interruptTrigger = new AnalogTrigger(analogIO.getInput());
 		interruptTrigger.setLimitsVoltage(2.0f, 3.0f);
-		interruptTriggerOutput = new AnalogTriggerOutput(interruptTrigger, AnalogTriggerType.STATE);
+		interruptTriggerOutput = new AnalogTriggerOutput(interruptTrigger, AnalogTriggerType.kState);
 		return interruptTriggerOutput;
 	}