HCSVLAB-838 Fix up annotation properties to show shortened forms