diff --git a/include/cameraserver_cpp.h b/include/cameraserver_cpp.h
index 7f077dd532..7caf5d8373 100644
--- a/include/cameraserver_cpp.h
+++ b/include/cameraserver_cpp.h
@@ -182,9 +182,10 @@ void RemoveSinkListener(CS_Listener handle, CS_Status* status);
 //
 std::vector<USBCameraInfo> EnumerateUSBCameras(CS_Status* status);
 
-void EnumerateSources(llvm::SmallVectorImpl<CS_Source>& handles,
-                      CS_Status* status);
-void EnumerateSinks(llvm::SmallVectorImpl<CS_Sink>& handles, CS_Status* status);
+void EnumerateSourceHandles(llvm::SmallVectorImpl<CS_Source>& handles,
+                            CS_Status* status);
+void EnumerateSinkHandles(llvm::SmallVectorImpl<CS_Sink>& handles,
+                          CS_Status* status);
 
 }  // namespace cs
 
diff --git a/java/lib/CameraServerJNI.cpp b/java/lib/CameraServerJNI.cpp
index a691237f46..2e3c365d63 100644
--- a/java/lib/CameraServerJNI.cpp
+++ b/java/lib/CameraServerJNI.cpp
@@ -763,7 +763,7 @@ JNIEXPORT jintArray JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_enumerateS
 {
   CS_Status status;
   llvm::SmallVector<CS_Source, 16> arr;
-  cs::EnumerateSources(arr, &status);
+  cs::EnumerateSourceHandles(arr, &status);
   if (!CheckStatus(env, status)) return nullptr;
   return MakeJIntArray(env, arr);
 }
@@ -778,7 +778,7 @@ JNIEXPORT jintArray JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_enumerateS
 {
   CS_Status status;
   llvm::SmallVector<CS_Sink, 16> arr;
-  cs::EnumerateSinks(arr, &status);
+  cs::EnumerateSinkHandles(arr, &status);
   if (!CheckStatus(env, status)) return nullptr;
   return MakeJIntArray(env, arr);
 }
diff --git a/src/cameraserver_c.cpp b/src/cameraserver_c.cpp
index b58bea5c91..336c0abdeb 100644
--- a/src/cameraserver_c.cpp
+++ b/src/cameraserver_c.cpp
@@ -350,7 +350,7 @@ void CS_FreeEnumeratedUSBCameras(CS_USBCameraInfo* cameras, int count) {
 
 CS_Source* CS_EnumerateSources(int* count, CS_Status* status) {
   llvm::SmallVector<CS_Source, 32> handles;
-  cs::EnumerateSources(handles, status);
+  cs::EnumerateSourceHandles(handles, status);
   CS_Source* sources =
       static_cast<CS_Source*>(std::malloc(handles.size() * sizeof(CS_Source)));
   *count = handles.size();
@@ -369,7 +369,7 @@ void CS_ReleaseEnumeratedSources(CS_Source* sources, int count) {
 
 CS_Sink* CS_EnumerateSinks(int* count, CS_Status* status) {
   llvm::SmallVector<CS_Sink, 32> handles;
-  cs::EnumerateSinks(handles, status);
+  cs::EnumerateSinkHandles(handles, status);
   CS_Sink* sinks =
       static_cast<CS_Sink*>(std::malloc(handles.size() * sizeof(CS_Sink)));
   *count = handles.size();
diff --git a/src/cameraserver_oo.cpp b/src/cameraserver_oo.cpp
index 89a5997183..2786462da6 100644
--- a/src/cameraserver_oo.cpp
+++ b/src/cameraserver_oo.cpp
@@ -24,7 +24,7 @@ std::vector<VideoSource> VideoSource::EnumerateSources() {
   std::vector<VideoSource> sources;
   llvm::SmallVector<CS_Source, 16> handles;
   CS_Status status = 0;
-  ::cs::EnumerateSources(handles, &status);
+  ::cs::EnumerateSourceHandles(handles, &status);
   sources.reserve(handles.size());
   for (int handle : handles)
     sources.emplace_back(VideoSource{handle});
@@ -35,7 +35,7 @@ std::vector<VideoSink> VideoSink::EnumerateSinks() {
   std::vector<VideoSink> sinks;
   llvm::SmallVector<CS_Sink, 16> handles;
   CS_Status status = 0;
-  ::cs::EnumerateSinks(handles, &status);
+  ::cs::EnumerateSinkHandles(handles, &status);
   sinks.reserve(handles.size());
   for (int handle : handles)
     sinks.emplace_back(VideoSink{handle});