[Rea]: renamed blk-dev -> blkdev, struct buf -> struct buffer