diff --git a/hal/include/HAL/HAL.hpp b/hal/include/HAL/HAL.hpp
index e76a289f79..f09a5d2483 100644
--- a/hal/include/HAL/HAL.hpp
+++ b/hal/include/HAL/HAL.hpp
@@ -99,7 +99,7 @@ namespace HALUsageReporting
 		kResourceType_ADXRS450,
 		kResourceType_RevSPARK,
 		kResourceType_MindsensorsSD540,
-		kResourceType_DigitalGlitchFilter,
+		kResourceType_DigitalFilter,
 	};
 
 	enum tInstances
diff --git a/hal/lib/Athena/FRC_NetworkCommunication/UsageReporting.h b/hal/lib/Athena/FRC_NetworkCommunication/UsageReporting.h
index e7cf249699..17d5874209 100644
--- a/hal/lib/Athena/FRC_NetworkCommunication/UsageReporting.h
+++ b/hal/lib/Athena/FRC_NetworkCommunication/UsageReporting.h
@@ -77,7 +77,7 @@ namespace nUsageReporting
         kResourceType_ADXRS450,
         kResourceType_RevSPARK,
         kResourceType_MindsensorsSD540,
-        kResourceType_DigitalGlitchFilter,
+        kResourceType_DigitalFilter,
     } tResourceType;
 
     typedef enum
diff --git a/wpilibc/Athena/src/DigitalGlitchFilter.cpp b/wpilibc/Athena/src/DigitalGlitchFilter.cpp
index 25fe4b3a24..56147cbbc5 100644
--- a/wpilibc/Athena/src/DigitalGlitchFilter.cpp
+++ b/wpilibc/Athena/src/DigitalGlitchFilter.cpp
@@ -26,6 +26,8 @@ DigitalGlitchFilter::DigitalGlitchFilter() {
 
   m_channelIndex = std::distance(m_filterAllocated.begin(), index);
   *index = true;
+
+  HALReport(HALUsageReporting::kResourceType_DigitalFilter, m_channelIndex);
 }
 
 DigitalGlitchFilter::~DigitalGlitchFilter() {
@@ -142,9 +144,6 @@ void DigitalGlitchFilter::SetPeriodCycles(uint32_t fpga_cycles) {
   int32_t status = 0;
   setFilterPeriod(m_channelIndex, fpga_cycles, &status);
   wpi_setErrorWithContext(status, getHALErrorMessage(status));
-
-  HALReport(HALUsageReporting::kResourceType_DigitalGlitchFilter,
-            m_channelIndex);
 }
 
 /**
@@ -159,9 +158,6 @@ void DigitalGlitchFilter::SetPeriodNanoSeconds(uint64_t nanoseconds) {
   setFilterPeriod(m_channelIndex, fpga_cycles, &status);
 
   wpi_setErrorWithContext(status, getHALErrorMessage(status));
-
-  HALReport(HALUsageReporting::kResourceType_DigitalGlitchFilter,
-            m_channelIndex);
 }
 
 /**
@@ -175,8 +171,6 @@ uint32_t DigitalGlitchFilter::GetPeriodCycles() {
 
   wpi_setErrorWithContext(status, getHALErrorMessage(status));
 
-  HALReport(HALUsageReporting::kResourceType_DigitalGlitchFilter,
-            m_channelIndex);
   return fpga_cycles;
 }
 
@@ -191,8 +185,6 @@ uint64_t DigitalGlitchFilter::GetPeriodNanoSeconds() {
 
   wpi_setErrorWithContext(status, getHALErrorMessage(status));
 
-  HALReport(HALUsageReporting::kResourceType_DigitalGlitchFilter,
-            m_channelIndex);
   return static_cast<uint64_t>(fpga_cycles) * 1000L /
          static_cast<uint64_t>(kSystemClockTicksPerMicrosecond / 4);
 }
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/DigitalGlitchFilter.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/DigitalGlitchFilter.java
index 582ad1f75a..dc2cd0f60d 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/DigitalGlitchFilter.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/DigitalGlitchFilter.java
@@ -13,6 +13,9 @@ import edu.wpi.first.wpilibj.DigitalSource;
 import edu.wpi.first.wpilibj.Encoder;
 import edu.wpi.first.wpilibj.Counter;
 
+import edu.wpi.first.wpilibj.communication.FRCNetworkCommunicationsLibrary.tResourceType;
+import edu.wpi.first.wpilibj.communication.UsageReporting;
+
 import edu.wpi.first.wpilibj.hal.DigitalGlitchFilterJNI;
 
 /**
@@ -31,6 +34,8 @@ public class DigitalGlitchFilter extends SensorBase {
       if (i != m_filterAllocated.length) {
         m_channelIndex = i;
         m_filterAllocated[i] = true;
+        UsageReporting.report(tResourceType.kResourceType_DigitalFilter,
+                              m_channelIndex, 0);
       }
     }
   }
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/communication/FRCNetworkCommunicationsLibrary.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/communication/FRCNetworkCommunicationsLibrary.java
index 0ab6a3f41c..4a1769e6a2 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/communication/FRCNetworkCommunicationsLibrary.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/communication/FRCNetworkCommunicationsLibrary.java
@@ -403,7 +403,7 @@ public class FRCNetworkCommunicationsLibrary extends JNIWrapper {
      * <i>native declaration :
      * src\main\include\NetworkCommunication\UsageReporting.h:67</i>
      */
-    public static final int kResourceType_DigitalGlitchFilter = 57;
+    public static final int kResourceType_DigitalFilter = 57;
   };
   /**
    * <i>native declaration :