Renamed topic message names internally and switched the order of a few fields.