Fix track naming for real this time...