Should we sort out the name of the budget drivers once and for all? I would suggest: "budget-av" -> "dvb-cinergypci-budget" "budget" -> "dvb-ttpci-budget" "budget-ci" -> "dvb-ttpci-budget-ci" "budget-patch" -> "dvb-ttpci-budget-patch"