diff --git a/circbuffer.go b/circbuffer.go
index c3ab8b1..d4a3eea 100644
--- a/circbuffer.go
+++ b/circbuffer.go
@@ -1,23 +1,23 @@
 package main
 
-// Buffer implements a circular float64 buffer. It is a fixed size,
+// CircularBuffer implements a circular float64 buffer. It is a fixed size,
 // and new writes overwrite older data, such that for a buffer
 // of size N, for any amount of writes, only the last N values
 // are retained.
-type Buffer struct {
+type CircularBuffer struct {
 	data        []float64
 	size        int64
 	writeCursor int64
 	written     int64
 }
 
-// NewBuffer creates a new buffer of a given size
-func NewBuffer(size int64) *Buffer {
+// NewCircularBuffer creates a new buffer of a given size
+func NewCircularBuffer(size int64) *CircularBuffer {
 	if size <= 0 {
 		panic("Size must be positive")
 	}
 
-	b := &Buffer{
+	b := &CircularBuffer{
 		size: size,
 		data: make([]float64, size),
 	}
@@ -25,7 +25,7 @@ func NewBuffer(size int64) *Buffer {
 }
 
 // Add adds new value to the buffer, overriding old data if necessary.
-func (b *Buffer) Add(value float64) error {
+func (b *CircularBuffer) Add(value float64) error {
 	b.data[b.writeCursor] = value
 	b.writeCursor = ((b.writeCursor + 1) % b.size)
 	b.written++
@@ -33,17 +33,17 @@ func (b *Buffer) Add(value float64) error {
 }
 
 // Size returns the size of the buffer
-func (b *Buffer) Size() int64 {
+func (b *CircularBuffer) Size() int64 {
 	return b.size
 }
 
 // TotalWritten provides the total number of values written
-func (b *Buffer) TotalWritten() int64 {
+func (b *CircularBuffer) TotalWritten() int64 {
 	return b.written
 }
 
 // Data returns ordered data from buffer, from old to new.
-func (b *Buffer) Data() []float64 {
+func (b *CircularBuffer) Data() []float64 {
 	switch {
 	case b.written >= b.size && b.writeCursor == 0:
 		out := make([]float64, b.size)
@@ -62,7 +62,7 @@ func (b *Buffer) Data() []float64 {
 }
 
 // Reset resets the buffer so it has no content.
-func (b *Buffer) Reset() {
+func (b *CircularBuffer) Reset() {
 	b.writeCursor = 0
 	b.written = 0
 }
diff --git a/circbuffer_test.go b/circbuffer_test.go
index 5ade2cc..674553c 100644
--- a/circbuffer_test.go
+++ b/circbuffer_test.go
@@ -2,13 +2,17 @@ package main
 
 import "testing"
 
-func TestCircBuffer(t *testing.T) {
-	buf := NewBuffer(3)
+func TestCircularBuffer(t *testing.T) {
+	buf := NewCircularBuffer(3)
+	got := buf.Data()
+	expected := []float64{}
+	compareData(t, got, expected)
+
 	buf.Add(5.0)
 	buf.Add(10.0)
 
-	got := buf.Data()
-	expected := []float64{5.0, 10.0}
+	got = buf.Data()
+	expected = []float64{5.0, 10.0}
 	compareData(t, got, expected)
 
 	buf.Add(15.0)