Bug 267 fixed: correct flavor dict key names