Message, xml tag and attribute renames.

s/instrumenet/instrument/