Improving chord parsing and naming