diff --git a/include/cameraserver_oo.h b/include/cameraserver_oo.h
index a18768bba3..da94593d55 100644
--- a/include/cameraserver_oo.h
+++ b/include/cameraserver_oo.h
@@ -326,7 +326,7 @@ class CvSink : public VideoSink {
   /// to calling WaitForFrame() followed by GetImage(0, image).
   /// @return Frame time, or 0 on error (call GetError() to obtain the error
   ///         message);
-  uint64_t FrameGrab(cv::Mat* image) const;
+  uint64_t GrabFrame(cv::Mat* image) const;
 
   /// Get error string.  Call this if WaitForFrame() returns 0 to determine
   /// what the error is.
diff --git a/include/cameraserver_oo.inl b/include/cameraserver_oo.inl
index 0d290548bb..7bb384ccbe 100644
--- a/include/cameraserver_oo.inl
+++ b/include/cameraserver_oo.inl
@@ -276,7 +276,7 @@ inline bool CvSink::GetImage(int channel, cv::Mat* image) const {
   return GetSinkImage(m_handle, channel, image, &m_status);
 }
 
-inline uint64_t CvSink::FrameGrab(cv::Mat* image) const {
+inline uint64_t CvSink::GrabFrame(cv::Mat* image) const {
   m_status = 0;
   return GrabSinkFrame(m_handle, image, &m_status);
 }
diff --git a/java/src/edu/wpi/cameraserver/CvSink.java b/java/src/edu/wpi/cameraserver/CvSink.java
index 60b5897280..c414ca7660 100644
--- a/java/src/edu/wpi/cameraserver/CvSink.java
+++ b/java/src/edu/wpi/cameraserver/CvSink.java
@@ -41,7 +41,7 @@ public class CvSink extends VideoSink {
   /// to calling WaitForFrame() followed by GetImage(0, image).
   /// @return Frame time, or 0 on error (call GetError() to obtain the error
   ///         message);
-  //public long frameGrab(CvMat image) {
+  //public long grabFrame(CvMat image) {
   //  return CameraServerJNI.grabSinkFrame(m_handle, image);
   //}