Refactor video out
Rename video in manager