FLOE-194: Selector name changes.