Rename marshall to marshal (typo). Closes #2154