Add media object file names.
MediaObject#saveMedia needs refactoring.
Fix API.
Merge pull request #1466 from NatTuck/rename-media

Add media object file names.
Merged with upstream and modified some option names.