Use the following instrument names: violoncello, English horn, contrabassoon, and timpani.

If the application of 25.30B4 results in the separation of a composer’s works between harpsichord or clavichord on the one hand and piano on the other, choose the instrument for which the major portion of the works of a given type was intended and use that instrument name for all works of the type. If the "major" instrument is not apparent, use "keyboard instrument."

See also:

25.30B. Medium of performance