diff --git a/wpilibc/wpilibC++Devices/include/CANJaguar.h b/wpilibc/wpilibC++Devices/include/CANJaguar.h
index 6e8e451045..186d3b408d 100644
--- a/wpilibc/wpilibC++Devices/include/CANJaguar.h
+++ b/wpilibc/wpilibC++Devices/include/CANJaguar.h
@@ -20,7 +20,7 @@
 #include <utility>
 
 /**
- * Luminary Micro Jaguar Speed Control
+ * Luminary Micro / Vex Robotics Jaguar Speed Control
  */
 class CANJaguar : public MotorSafety,
 					public CANSpeedController,
diff --git a/wpilibc/wpilibC++Devices/include/CANTalon.h b/wpilibc/wpilibC++Devices/include/CANTalon.h
index 89b351c1e0..8dbf32d66f 100644
--- a/wpilibc/wpilibC++Devices/include/CANTalon.h
+++ b/wpilibc/wpilibC++Devices/include/CANTalon.h
@@ -13,7 +13,7 @@
 class CanTalonSRX;
 
 /**
- * CTRE Talon SRX Speed Controller
+ * CTRE Talon SRX Speed Controller with CAN Control
  */
 class CANTalon : public MotorSafety,
                  public CANSpeedController,
diff --git a/wpilibc/wpilibC++Devices/include/Jaguar.h b/wpilibc/wpilibC++Devices/include/Jaguar.h
index 51ac4fe8c8..1cb7b69aa5 100644
--- a/wpilibc/wpilibC++Devices/include/Jaguar.h
+++ b/wpilibc/wpilibC++Devices/include/Jaguar.h
@@ -10,7 +10,7 @@
 #include "PIDOutput.h"
 
 /**
- * Luminary Micro Jaguar Speed Control
+ * Luminary Micro / Vex Robotics Jaguar Speed Controller with PWM control
  */
 class Jaguar : public SafePWM, public SpeedController
 {
diff --git a/wpilibc/wpilibC++Devices/include/Talon.h b/wpilibc/wpilibC++Devices/include/Talon.h
index d9fb0ef12d..6e11ccd46e 100644
--- a/wpilibc/wpilibC++Devices/include/Talon.h
+++ b/wpilibc/wpilibC++Devices/include/Talon.h
@@ -10,7 +10,7 @@
 #include "PIDOutput.h"
 
 /**
- * CTRE Talon Speed Controller
+ * Cross the Road Electronics (CTRE) Talon and Talon SR Speed Controller
  */
 class Talon : public SafePWM, public SpeedController
 {
diff --git a/wpilibc/wpilibC++Devices/include/TalonSRX.h b/wpilibc/wpilibC++Devices/include/TalonSRX.h
new file mode 100644
index 0000000000..9437ae861f
--- /dev/null
+++ b/wpilibc/wpilibC++Devices/include/TalonSRX.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) FIRST 2008. All Rights Reserved.							  */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in $(WIND_BASE)/WPILib.  */
+/*----------------------------------------------------------------------------*/
+#pragma once
+
+#include "Talon.h"
+
+/**
+ * Cross the Road Electronics (CTRE) Talon SRX Speed Controller with PWM control
+ * @see CANTalon for CAN control
+ */
+class TalonSRX: public Talon {
+public:
+	explicit TalonSRX(uint32_t channel);
+	virtual ~TalonSRX();
+};
diff --git a/wpilibc/wpilibC++Devices/include/Victor.h b/wpilibc/wpilibC++Devices/include/Victor.h
index fce4139f05..9a83519820 100644
--- a/wpilibc/wpilibC++Devices/include/Victor.h
+++ b/wpilibc/wpilibC++Devices/include/Victor.h
@@ -10,7 +10,10 @@
 #include "PIDOutput.h"
 
 /**
- * IFI Victor Speed Controller
+ * Vex Robotics Victor 888 Speed Controller
+ *
+ * The Vex Robotics Victor 884 Speed Controller can also be used with this
+ * class but may need to be calibrated per the Victor 884 user manual.
  */
 class Victor : public SafePWM, public SpeedController
 {
diff --git a/wpilibc/wpilibC++Devices/include/VictorSP.h b/wpilibc/wpilibC++Devices/include/VictorSP.h
new file mode 100644
index 0000000000..6ae7ca0c0b
--- /dev/null
+++ b/wpilibc/wpilibC++Devices/include/VictorSP.h
@@ -0,0 +1,17 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) FIRST 2008. All Rights Reserved.							  */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in $(WIND_BASE)/WPILib.  */
+/*----------------------------------------------------------------------------*/
+#pragma once
+
+#include "Talon.h"
+
+/**
+ * Vex Robotics Victor SP Speed Controller
+ */
+class VictorSP: public Talon {
+public:
+	explicit VictorSP(uint32_t channel);
+	virtual ~VictorSP();
+};
diff --git a/wpilibc/wpilibC++Devices/include/WPILib.h b/wpilibc/wpilibC++Devices/include/WPILib.h
index db1b00e602..d02720efad 100644
--- a/wpilibc/wpilibC++Devices/include/WPILib.h
+++ b/wpilibc/wpilibC++Devices/include/WPILib.h
@@ -78,10 +78,12 @@
 #include "SPI.h"
 #include "HAL/cpp/Synchronized.hpp"
 #include "Talon.h"
+#include "TalonSRX.h"
 #include "Task.h"
 #include "Timer.h"
 #include "Ultrasonic.h"
 #include "Utility.h"
 #include "Victor.h"
+#include "VictorSP.h"
 // XXX: #include "Vision/AxisCamera.h"
 #include "WPIErrors.h"
diff --git a/wpilibc/wpilibC++Devices/src/TalonSRX.cpp b/wpilibc/wpilibC++Devices/src/TalonSRX.cpp
new file mode 100644
index 0000000000..adda181d1a
--- /dev/null
+++ b/wpilibc/wpilibC++Devices/src/TalonSRX.cpp
@@ -0,0 +1,15 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) FIRST 2008. All Rights Reserved.							  */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in $(WIND_BASE)/WPILib.  */
+/*----------------------------------------------------------------------------*/
+
+#include "TalonSRX.h"
+
+TalonSRX::TalonSRX(uint32_t channel) : Talon(channel) {
+
+}
+
+TalonSRX::~TalonSRX() {
+}
+
diff --git a/wpilibc/wpilibC++Devices/src/VictorSP.cpp b/wpilibc/wpilibC++Devices/src/VictorSP.cpp
new file mode 100644
index 0000000000..c286998665
--- /dev/null
+++ b/wpilibc/wpilibC++Devices/src/VictorSP.cpp
@@ -0,0 +1,15 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) FIRST 2008. All Rights Reserved.							  */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in $(WIND_BASE)/WPILib.  */
+/*----------------------------------------------------------------------------*/
+
+#include "VictorSP.h"
+
+VictorSP::VictorSP(uint32_t channel) : Talon(channel) {
+
+}
+
+VictorSP::~VictorSP() {
+}
+
diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Jaguar.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Jaguar.java
index 666bd5b62f..315161acf6 100644
--- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Jaguar.java
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Jaguar.java
@@ -12,7 +12,8 @@ import edu.wpi.first.wpilibj.communication.UsageReporting;
 import edu.wpi.first.wpilibj.livewindow.LiveWindow;
 
 /**
- * Texas Instruments Jaguar Speed Controller as a PWM device.
+ * Texas Instruments / Vex Robotics Jaguar Speed Controller as a PWM device.
+ * @see CANJaguar CANJaguar for CAN control
  */
 public class Jaguar extends SafePWM implements SpeedController {
 
diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Talon.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Talon.java
index 570331764d..0afa9c698f 100644
--- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Talon.java
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Talon.java
@@ -12,7 +12,7 @@ import edu.wpi.first.wpilibj.communication.UsageReporting;
 import edu.wpi.first.wpilibj.livewindow.LiveWindow;
 
 /**
- * CTRE Talon Speed Controller
+ * Cross the Road Electronics (CTRE) Talon and Talon SR Speed Controller
  */
 public class Talon extends SafePWM implements SpeedController {
 
diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/TalonSRX.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/TalonSRX.java
new file mode 100644
index 0000000000..fb12ddf8f2
--- /dev/null
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/TalonSRX.java
@@ -0,0 +1,23 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) FIRST 2008-2014. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+package edu.wpi.first.wpilibj;
+
+/**
+ * Cross the Road Electronics (CTRE) Talon SRX Speed Controller with PWM control
+ * @see CANTalon CANTalon for CAN control of Talon SRX
+ */
+public class TalonSRX extends Talon {
+    /**
+     * Constructor.
+     *
+     * @param channel The PWM channel that the Talon SRX is attached to.
+     */
+    public TalonSRX(final int channel) {
+        super(channel);
+    }
+}
diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Victor.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Victor.java
index 211308c2e3..4745f2b846 100644
--- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Victor.java
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Victor.java
@@ -12,7 +12,10 @@ import edu.wpi.first.wpilibj.communication.UsageReporting;
 import edu.wpi.first.wpilibj.livewindow.LiveWindow;
 
 /**
- * VEX Robotics Victor Speed Controller
+ * VEX Robotics Victor 888 Speed Controller
+ * 
+ * The Vex Robotics Victor 884 Speed Controller can also be used with this
+ * class but may need to be calibrated per the Victor 884 user manual.
  */
 public class Victor extends SafePWM implements SpeedController {
 
diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/VictorSP.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/VictorSP.java
new file mode 100644
index 0000000000..106a973871
--- /dev/null
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/VictorSP.java
@@ -0,0 +1,24 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) FIRST 2008-2014. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+package edu.wpi.first.wpilibj;
+
+/**
+ * Vex Robotics Victor SP Speed Controller
+ */
+public class VictorSP extends Talon {
+	
+    /**
+     * Constructor.
+     *
+     * @param channel The PWM channel that the VictorSP is attached to.
+     */
+    public VictorSP(final int channel) {
+        super(channel);
+    }
+
+}