Bug 16371: Fix QA issues, change terminology