added c-rejection roc, various naming tweaks