qa -> master: naming correction