Standardise and update global group names

This change adds a few missing global groups and
fixes no longer valid message keys.

Change-Id: Id69b28e1c370e1d6e1360e50394906df4f6c36e8