support for named choices

previously named choices were introduced with a generic name
but dependencies of those choices were listed with the
given name, causing inconsistencies