diff --git a/wpilibc/sim/include/Encoder.h b/wpilibc/sim/include/Encoder.h
index 90d6268113..9551a35938 100644
--- a/wpilibc/sim/include/Encoder.h
+++ b/wpilibc/sim/include/Encoder.h
@@ -76,7 +76,7 @@ class Encoder : public SensorBase,
   int FPGAEncoderIndex() const { return 0; }
 
  private:
-  void InitEncoder(int channelA, int channelB, bool _reverseDirection,
+  void InitEncoder(int channelA, int channelB, bool reverseDirection,
                    EncodingType encodingType);
   double DecodingScaleFactor() const;
 
diff --git a/wpilibc/sim/include/simulation/MainNode.h b/wpilibc/sim/include/simulation/MainNode.h
index aecf6b2345..7c2cc41383 100644
--- a/wpilibc/sim/include/simulation/MainNode.h
+++ b/wpilibc/sim/include/simulation/MainNode.h
@@ -25,24 +25,24 @@ class MainNode {
 
   template <typename M>
   static transport::PublisherPtr Advertise(const std::string& topic,
-                                           int _queueLimit = 10,
-                                           bool _latch = false) {
-    return GetInstance()->main->Advertise<M>(topic, _queueLimit, _latch);
+                                           int queueLimit = 10,
+                                           bool latch = false) {
+    return GetInstance()->main->Advertise<M>(topic, queueLimit, latch);
   }
 
   template <typename M, typename T>
   static transport::SubscriberPtr Subscribe(
       const std::string& topic,
       void (T::*fp)(const boost::shared_ptr<M const>&), T* obj,
-      bool _latching = false) {
-    return GetInstance()->main->Subscribe(topic, fp, obj, _latching);
+      bool latching = false) {
+    return GetInstance()->main->Subscribe(topic, fp, obj, latching);
   }
 
   template <typename M>
   static transport::SubscriberPtr Subscribe(
       const std::string& topic, void (*fp)(const boost::shared_ptr<M const>&),
-      bool _latching = false) {
-    return GetInstance()->main->Subscribe(topic, fp, _latching);
+      bool latching = false) {
+    return GetInstance()->main->Subscribe(topic, fp, latching);
   }
 
   transport::NodePtr main;