Bug 969492 - Follow-up naming fix. r=lucasr