Fix code to match payload naming inconsistency