Use language name, not track key. Fixes #1695. Fixes #1696.