Revert "Use __CLASS__ for option name"

This reverts commit 803a3909605915d4ca20ba9a82e100267024bcca.