diff --git a/AsyncDisplayKit/ASVideoNode.h b/AsyncDisplayKit/ASVideoNode.h
index bca3b3a22c..5008ea3333 100644
--- a/AsyncDisplayKit/ASVideoNode.h
+++ b/AsyncDisplayKit/ASVideoNode.h
@@ -19,7 +19,6 @@ typedef enum {
   ASVideoNodePlayerStatePlaybackLikelyToKeepUpButNotPlaying,
   ASVideoNodePlayerStatePlaying,
   ASVideoNodePlayerStateLoading,
-  ASVideoNodePlayerStatePlaying,
   ASVideoNodePlayerStatePaused,
   ASVideoNodePlayerStateFinished
 } ASVideoNodePlayerState;
diff --git a/AsyncDisplayKit/ASVideoPlayerNode.h b/AsyncDisplayKit/ASVideoPlayerNode.h
index bdbff43157..4a7338e6f9 100644
--- a/AsyncDisplayKit/ASVideoPlayerNode.h
+++ b/AsyncDisplayKit/ASVideoPlayerNode.h
@@ -107,7 +107,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)didTapVideoPlayerNode:(ASVideoPlayerNode *)videoPlayer;
 /**
  * @abstract Delegate method invoked when ASVideoNode playback time is updated.
- * @param videoPlayerNode The video node that was tapped.
+ * @param videoPlayerNode The video player node
  * @param second current playback time.
  */
 - (void)videoPlayerNode:(ASVideoPlayerNode *)videoPlayer didPlayToTime:(CMTime)time;
@@ -119,7 +119,7 @@ NS_ASSUME_NONNULL_BEGIN
  * @param toSate ASVideoNode new state.
  * @discussion This method is called after each state change
  */
-- (void)videoPlayerNode:(ASVideoPlayerNode *)videoPlayer willChangeVideoNodeState:(ASVideoNodePlayerState)state toVideoNodeState:(ASVideoNodePlayerState)toSate;
+- (void)videoPlayerNode:(ASVideoPlayerNode *)videoPlayer willChangeVideoNodeState:(ASVideoNodePlayerState)state toVideoNodeState:(ASVideoNodePlayerState)toState;
 
 /**
  * @abstract Delegate method is invoked when ASVideoNode decides to change state.
diff --git a/AsyncDisplayKit/ASVideoPlayerNode.mm b/AsyncDisplayKit/ASVideoPlayerNode.mm
index 291824010e..021ce66cac 100644
--- a/AsyncDisplayKit/ASVideoPlayerNode.mm
+++ b/AsyncDisplayKit/ASVideoPlayerNode.mm
@@ -368,7 +368,7 @@ static void *ASVideoPlayerNodeContext = &ASVideoPlayerNodeContext;
   return YES;
 }
 
-- (void)videoNode:(ASVideoNode *)videoNode didPlayToSecond:(NSTimeInterval)second
+- (void)videoNode:(ASVideoNode *)videoNode didPlayToTimeInterval:(NSTimeInterval)timeInterval
 {
   //TODO: ask Max about CMTime problem in ASVideoNode Header file
   //as we said yesterday, we must use CMTime in ASVideoNode instead of NSTimeInterval
@@ -382,22 +382,22 @@ static void *ASVideoPlayerNodeContext = &ASVideoPlayerNodeContext;
   }
 
   if (_elapsedTextNode) {
-    [self updateElapsedTimeLabel:second];
+    [self updateElapsedTimeLabel:timeInterval];
   }
 
   if (_scrubberNode) {
-    [(UISlider*)_scrubberNode.view setValue:(second/ CMTimeGetSeconds(_duration) ) animated:NO];
+    [(UISlider*)_scrubberNode.view setValue:( timeInterval / CMTimeGetSeconds(_duration) ) animated:NO];
   }
 }
 
-- (void)videoPlaybackDidFinish:(ASVideoNode *)videoNode
+- (void)videoDidPlayToEnd:(ASVideoNode *)videoNode
 {
   if (_delegateFlags.delegateVideoNodePlaybackDidFinish) {
     [_delegate videoPlayerNodeDidPlayToEnd:self];
   }
 }
 
-- (void)videoNodeWasTapped:(ASVideoNode *)videoNode
+- (void)didTapVideoNode:(ASVideoNode *)videoNode
 {
   if (_delegateFlags.delegateDidTapVideoPlayerNode) {
     [_delegate didTapVideoPlayerNode:self];