naming corrections
Merge pull request #4 from dwsla/qa

qa -> master: naming correction