o smallish naming tweaks.