Update artifact names to match documentation

NetBeans uses this property of the pom.xml in the Projects window when
you open the pom.xml as a project, so using a meaningful name greatly
eases navigation.

Change-Id: Ibe61b81e369bc75ed238d5b38911a1528d2f9a15
Merge "Update artifact names to match documentation"