fix unmarshal in gobin; rename