Use more standardized codec/source names

Fixes #999
Small fixes