Further glossary project edits

Changes for neutron and swift to use official names.

Also remove the entry "device" that is not really usefull.

Change-Id: I561ed8826340c9c82e2ce477a372c49e5c33db81
Merge "Further glossary project edits"