Fix incorrect labelling and typos Closes-bug: #1580424 Change-Id: Ic65fed0601f22f38675ed71e2ece113c8434d66c