diff --git a/spine-cpp/spine-cpp/include/spine/DeformTimeline.h b/spine-cpp/spine-cpp/include/spine/DeformTimeline.h
index db7fe976b..7319e4b23 100644
--- a/spine-cpp/spine-cpp/include/spine/DeformTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/DeformTimeline.h
@@ -149,7 +149,7 @@ namespace Spine
 //            }
 //            
 //            // Interpolate between the previous frame and the current frame.
-//            int frame = Animation.BinarySearch(frames, time);
+//            int frame = Animation::binarySearch(frames, time);
 //            float[] prevVertices = frameVertices[frame - 1];
 //            float[] nextVertices = frameVertices[frame];
 //            float frameTime = frames[frame];
diff --git a/spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h b/spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h
index cf72ff56b..b05fb161b 100644
--- a/spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h
@@ -84,7 +84,7 @@ namespace Spine
 //            if (time >= frames[frames.Length - 1]) // Time is after last frame.
 //                frame = frames.Length - 1;
 //            else
-//                frame = Animation.BinarySearch(frames, time) - 1;
+//                frame = Animation::binarySearch(frames, time) - 1;
 //            
 //            int[] drawOrderToSetupIndex = drawOrders[frame];
 //            if (drawOrderToSetupIndex == NULL) {
diff --git a/spine-cpp/spine-cpp/include/spine/EventTimeline.h b/spine-cpp/spine-cpp/include/spine/EventTimeline.h
index 72b071fdf..e0c2859bc 100644
--- a/spine-cpp/spine-cpp/include/spine/EventTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/EventTimeline.h
@@ -82,7 +82,7 @@ namespace Spine
 //            if (lastTime < frames[0])
 //                frame = 0;
 //            else {
-//                frame = Animation.BinarySearch(frames, lastTime);
+//                frame = Animation::binarySearch(frames, lastTime);
 //                float frameTime = frames[frame];
 //                while (frame > 0) { // Fire multiple events with the same frame.
 //                    if (frames[frame - 1] != frameTime) break;
diff --git a/spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h b/spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h
index 204efcc6f..69b3a1ac5 100644
--- a/spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h
@@ -100,7 +100,7 @@ namespace Spine
 //            }
 //            
 //            // Interpolate between the previous frame and the current frame.
-//            int frame = Animation.BinarySearch(frames, time, ENTRIES);
+//            int frame = Animation::binarySearch(frames, time, ENTRIES);
 //            float mix = frames[frame + PREV_MIX];
 //            float frameTime = frames[frame];
 //            float percent = GetCurvePercent(frame / ENTRIES - 1, 1 - (time - frameTime) / (frames[frame + PREV_TIME] - frameTime));
diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h b/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h
index 199a26e76..5514ab8f6 100644
--- a/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h
@@ -93,7 +93,7 @@ namespace Spine
 //                translate = frames[frames.Length + PREV_TRANSLATE];
 //            } else {
 //                // Interpolate between the previous frame and the current frame.
-//                int frame = Animation.BinarySearch(frames, time, ENTRIES);
+//                int frame = Animation::binarySearch(frames, time, ENTRIES);
 //                rotate = frames[frame + PREV_ROTATE];
 //                translate = frames[frame + PREV_TRANSLATE];
 //                float frameTime = frames[frame];
diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h b/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h
index 1f85a96eb..91fc2d252 100644
--- a/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h
@@ -89,7 +89,7 @@ namespace Spine
 //                position = frames[frames.Length + PREV_VALUE];
 //            else {
 //                // Interpolate between the previous frame and the current frame.
-//                int frame = Animation.BinarySearch(frames, time, ENTRIES);
+//                int frame = Animation::binarySearch(frames, time, ENTRIES);
 //                position = frames[frame + PREV_VALUE];
 //                float frameTime = frames[frame];
 //                float percent = GetCurvePercent(frame / ENTRIES - 1,
diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h b/spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h
index 210326437..41c6cf8ce 100644
--- a/spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h
@@ -71,7 +71,7 @@ namespace Spine
 //                spacing = frames[frames.Length + PREV_VALUE];
 //            else {
 //                // Interpolate between the previous frame and the current frame.
-//                int frame = Animation.BinarySearch(frames, time, ENTRIES);
+//                int frame = Animation::binarySearch(frames, time, ENTRIES);
 //                spacing = frames[frame + PREV_VALUE];
 //                float frameTime = frames[frame];
 //                float percent = GetCurvePercent(frame / ENTRIES - 1,
diff --git a/spine-cpp/spine-cpp/include/spine/ScaleTimeline.h b/spine-cpp/spine-cpp/include/spine/ScaleTimeline.h
index f369890df..af06c888c 100644
--- a/spine-cpp/spine-cpp/include/spine/ScaleTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/ScaleTimeline.h
@@ -75,7 +75,7 @@ namespace Spine
 //                y = frames[frames.Length + PREV_Y] * bone.data.scaleY;
 //            } else {
 //                // Interpolate between the previous frame and the current frame.
-//                int frame = Animation.BinarySearch(frames, time, ENTRIES);
+//                int frame = Animation::binarySearch(frames, time, ENTRIES);
 //                x = frames[frame + PREV_X];
 //                y = frames[frame + PREV_Y];
 //                float frameTime = frames[frame];
diff --git a/spine-cpp/spine-cpp/include/spine/ShearTimeline.h b/spine-cpp/spine-cpp/include/spine/ShearTimeline.h
index ddf02f09d..585c7ed5a 100644
--- a/spine-cpp/spine-cpp/include/spine/ShearTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/ShearTimeline.h
@@ -74,7 +74,7 @@ namespace Spine
 //                y = frames[frames.Length + PREV_Y];
 //            } else {
 //                // Interpolate between the previous frame and the current frame.
-//                int frame = Animation.BinarySearch(frames, time, ENTRIES);
+//                int frame = Animation::binarySearch(frames, time, ENTRIES);
 //                x = frames[frame + PREV_X];
 //                y = frames[frame + PREV_Y];
 //                float frameTime = frames[frame];
diff --git a/spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h b/spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h
index 4df5190ba..b53d19d76 100644
--- a/spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h
@@ -102,7 +102,7 @@ namespace Spine
 //                shear = frames[i + PREV_SHEAR];
 //            } else {
 //                // Interpolate between the previous frame and the current frame.
-//                int frame = Animation.BinarySearch(frames, time, ENTRIES);
+//                int frame = Animation::binarySearch(frames, time, ENTRIES);
 //                rotate = frames[frame + PREV_ROTATE];
 //                translate = frames[frame + PREV_TRANSLATE];
 //                scale = frames[frame + PREV_SCALE];
diff --git a/spine-cpp/spine-cpp/include/spine/TwoColorTimeline.h b/spine-cpp/spine-cpp/include/spine/TwoColorTimeline.h
index 0943967e5..c855f0586 100644
--- a/spine-cpp/spine-cpp/include/spine/TwoColorTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/TwoColorTimeline.h
@@ -124,7 +124,7 @@ namespace Spine
 //                b2 = frames[i + PREV_B2];
 //            } else {
 //                // Interpolate between the previous frame and the current frame.
-//                int frame = Animation.BinarySearch(frames, time, ENTRIES);
+//                int frame = Animation::binarySearch(frames, time, ENTRIES);
 //                r = frames[frame + PREV_R];
 //                g = frames[frame + PREV_G];
 //                b = frames[frame + PREV_B];