diff --git a/wpilibc/src/test/native/cpp/SolenoidTestCTRE.cpp b/wpilibc/src/test/native/cpp/SolenoidTestCTRE.cpp
index f30a97646ad..887ae868f21 100644
--- a/wpilibc/src/test/native/cpp/SolenoidTestCTRE.cpp
+++ b/wpilibc/src/test/native/cpp/SolenoidTestCTRE.cpp
@@ -15,10 +15,10 @@ TEST(SolenoidCTRETest, ValidInitialization) {
   EXPECT_EQ(2, solenoid.GetChannel());
 
   solenoid.Set(true);
-  EXPECT_TRUE(solenoid.Get());
+  EXPECT_TRUE(solenoid.IsOn());
 
   solenoid.Set(false);
-  EXPECT_FALSE(solenoid.Get());
+  EXPECT_FALSE(solenoid.IsOn());
 }
 
 TEST(SolenoidCTRETest, DoubleInitialization) {
@@ -41,12 +41,12 @@ TEST(SolenoidCTRETest, InvalidChannel) {
 TEST(SolenoidCTRETest, Toggle) {
   Solenoid solenoid{3, frc::PneumaticsModuleType::CTREPCM, 2};
   solenoid.Set(true);
-  EXPECT_TRUE(solenoid.Get());
+  EXPECT_TRUE(solenoid.IsOn());
 
   solenoid.Toggle();
-  EXPECT_FALSE(solenoid.Get());
+  EXPECT_FALSE(solenoid.IsOn());
 
   solenoid.Toggle();
-  EXPECT_TRUE(solenoid.Get());
+  EXPECT_TRUE(solenoid.IsOn());
 }
 }  // namespace frc
diff --git a/wpilibc/src/test/native/cpp/SolenoidTestREV.cpp b/wpilibc/src/test/native/cpp/SolenoidTestREV.cpp
index 3f3dc404b7c..ab62737e384 100644
--- a/wpilibc/src/test/native/cpp/SolenoidTestREV.cpp
+++ b/wpilibc/src/test/native/cpp/SolenoidTestREV.cpp
@@ -15,10 +15,10 @@ TEST(SolenoidREVTest, ValidInitialization) {
   EXPECT_EQ(2, solenoid.GetChannel());
 
   solenoid.Set(true);
-  EXPECT_TRUE(solenoid.Get());
+  EXPECT_TRUE(solenoid.IsOn());
 
   solenoid.Set(false);
-  EXPECT_FALSE(solenoid.Get());
+  EXPECT_FALSE(solenoid.IsOn());
 }
 
 TEST(SolenoidREVTest, DoubleInitialization) {
@@ -41,12 +41,12 @@ TEST(SolenoidREVTest, InvalidChannel) {
 TEST(SolenoidREVTest, Toggle) {
   Solenoid solenoid{3, frc::PneumaticsModuleType::REVPH, 2};
   solenoid.Set(true);
-  EXPECT_TRUE(solenoid.Get());
+  EXPECT_TRUE(solenoid.IsOn());
 
   solenoid.Toggle();
-  EXPECT_FALSE(solenoid.Get());
+  EXPECT_FALSE(solenoid.IsOn());
 
   solenoid.Toggle();
-  EXPECT_TRUE(solenoid.Get());
+  EXPECT_TRUE(solenoid.IsOn());
 }
 }  // namespace frc