Use the right name and add the glossterm.

Change-Id: I3112f93e55a2f594c4aa52bb3c6166d4a74eab16
Closes-Bug: 1342940
Merge "Use the right name and add the glossterm."