COMP: Fix names to match OpenCV 3.0 convention