Accept both dashed and non dashed uuids in the name field of labellable messages

Merge from development 1.2.2