class name fixes
Revert "class name fixes"

This reverts commit 08e1a75e17917cc95a441bb69c0a15d303a41a37.
dns plugin skeletons