Use proper pattern matcher, now we have accurate artifact names