more selector name fixes