Re-vamp messages due to firmware changes.