Fixed video playback, continue to fix naming.
Revert "Fixed video playback, continue to fix naming."

This reverts commit 6b7c70ba02acaf01af54eb4cd3396b67d59e3634.
Revert "Revert "Fixed video playback, continue to fix naming.""

This reverts commit a0a985b245b6d64e61689060825b24946500a678.