QR code fix and naming fix