Improve track names. Fixes #16