Do not use artifactId as field name (#12024)

Change-Id: I914b7a5720e2ca356697cf7ab0d296a958b19f14