diff --git a/wpilibc/src/main/native/cpp/simulation/AnalogEncoderSim.cpp b/wpilibc/src/main/native/cpp/simulation/AnalogEncoderSim.cpp
index f5c902d557..5fee73799a 100644
--- a/wpilibc/src/main/native/cpp/simulation/AnalogEncoderSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/AnalogEncoderSim.cpp
@@ -15,10 +15,10 @@
 
 using namespace frc::sim;
 
-AnalogEncoderSim::AnalogEncoderSim(const frc::AnalogEncoder& analogEncoder) {
+AnalogEncoderSim::AnalogEncoderSim(const frc::AnalogEncoder& encoder) {
   wpi::SmallString<128> fullname;
   wpi::raw_svector_ostream os(fullname);
-  os << "AnalogEncoder" << '[' << analogEncoder.GetChannel() << ']';
+  os << "AnalogEncoder" << '[' << encoder.GetChannel() << ']';
   frc::sim::SimDeviceSim deviceSim{fullname.c_str()};
   m_positionSim = deviceSim.GetDouble("Position");
 }
diff --git a/wpilibc/src/main/native/include/frc/simulation/AnalogEncoderSim.h b/wpilibc/src/main/native/include/frc/simulation/AnalogEncoderSim.h
index debc7c821f..aef979a068 100644
--- a/wpilibc/src/main/native/include/frc/simulation/AnalogEncoderSim.h
+++ b/wpilibc/src/main/native/include/frc/simulation/AnalogEncoderSim.h
@@ -26,12 +26,14 @@ class AnalogEncoderSim {
   /**
    * Constructs from an AnalogEncoder object.
    *
-   * @param analogInput AnalogEncoder to simulate
+   * @param encoder AnalogEncoder to simulate
    */
-  explicit AnalogEncoderSim(const AnalogEncoder& analogEncoder);
+  explicit AnalogEncoderSim(const AnalogEncoder& encoder);
 
   /**
    * Set the position using an {@link Rotation2d}.
+   *
+   * @param angle The angle.
    */
   void SetPosition(Rotation2d angle);
 
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogEncoderSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogEncoderSim.java
index a6fb6a9c85..e1b541f2e2 100644
--- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogEncoderSim.java
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogEncoderSim.java
@@ -29,6 +29,8 @@ public class AnalogEncoderSim {
 
   /**
    * Set the position using an {@link Rotation2d}.
+   *
+   * @param angle The angle.
    */
   public void setPosition(Rotation2d angle) {
     setTurns(angle.getDegrees() / 360.0);