more selector name fixes
Merge pull request #1060 from eschaefer/master

more selector name fixes