Fix the artifact ids to be consistent with the larger artifact naming
standards.