Comment 7 for bug 359049

I don't think this change is related to changes in flavours: just change the naming scheme with whatever you have now and use the same naming scheme when adding flavours (option D). I wish we fix this early in the cycle to allow for d-i and cdimage changes afterwards.