Switch to "exported" nomenclature