diff --git a/common/bufio/buffered_reader.go b/common/bufio/reader.go
similarity index 100%
rename from common/bufio/buffered_reader.go
rename to common/bufio/reader.go
diff --git a/common/bufio/buffered_reader_test.go b/common/bufio/reader_test.go
similarity index 100%
rename from common/bufio/buffered_reader_test.go
rename to common/bufio/reader_test.go
diff --git a/common/bufio/buffered_writer.go b/common/bufio/writer.go
similarity index 100%
rename from common/bufio/buffered_writer.go
rename to common/bufio/writer.go
diff --git a/common/bufio/buffered_writer_test.go b/common/bufio/writer_test.go
similarity index 100%
rename from common/bufio/buffered_writer_test.go
rename to common/bufio/writer_test.go