[1030889] Refactor keyframe to keyframes