Revert "Merge pull request #7032 from flosse/change-option-names"

This reverts commit c265aafb, reversing
changes made to c9bbf222.

Breaks evaluation, see https://github.com/NixOS/nixpkgs/pull/7032#issuecomment-87641471