More renames.
Merge branch 'master' of git+ssh://github.com/timvideos/timvideos