Currently, the context key for each instrument name in the component Instruments is the disambiguation comment for this instrument, while the component Instrument Descriptions doesn't have any context key.

It is problematic in the first case as the disambiguation comments aren't as stable as expected for contexts.
It is problematic in the second case as there is no information about which information is matching this description.

1. The disambiguation comments should rather be provided as extracted comments (following "#." in PO(T) files) to instrument (name) messages.
2. Similarly the instrument names should be provided as extracted comments to instrument description messages.