Bug 907330 - standardize confirmation message IDs