Fixed marshal and unmarshal (names had been reversed)