::qualify some top-level class references

Change-Id: I5ccc5d6585b08ab115776d5ae7731c642ed4e65a