ARQ-1434 Comply with artifact naming standards