Update for new naming convetion

`unwrap` -> `into_inner` for buffer-wrapping things