Change name, message numbering to match firebase schema