Cleanup the codec API to gives names to things that are strings
Merge branch 'fix-cleanup-codec-api'