Fixed unmarshalling and renaming to align with manual