diff --git a/container/test/mock.go b/container/test/mock.go
index f81144d9..fbbe8fe0 100644
--- a/container/test/mock.go
+++ b/container/test/mock.go
@@ -56,17 +56,17 @@ func (self *MockContainerHandler) GetStats() (*info.ContainerStats, error) {
 }
 
 func (self *MockContainerHandler) ListContainers(listType container.ListType) ([]info.ContainerReference, error) {
-	args := self.Called()
+	args := self.Called(listType)
 	return args.Get(0).([]info.ContainerReference), args.Error(1)
 }
 
 func (self *MockContainerHandler) ListThreads(listType container.ListType) ([]int, error) {
-	args := self.Called()
+	args := self.Called(listType)
 	return args.Get(0).([]int), args.Error(1)
 }
 
 func (self *MockContainerHandler) ListProcesses(listType container.ListType) ([]int, error) {
-	args := self.Called()
+	args := self.Called(listType)
 	return args.Get(0).([]int), args.Error(1)
 }
 
diff --git a/storage/storage.go b/storage/storage.go
index 51f0b9c0..8b264a93 100644
--- a/storage/storage.go
+++ b/storage/storage.go
@@ -31,7 +31,7 @@ type StorageDriver interface {
 	// Returns samples of the container stats. If numSamples < 0, then
 	// the number of returned samples is implementation defined. Otherwise, the driver
 	// should return at most numSamples samples.
-	Samples(containername string, numSamples int) ([]*info.ContainerStatsSample, error)
+	Samples(containerName string, numSamples int) ([]*info.ContainerStatsSample, error)
 
 	// Close will clear the state of the storage driver. The elements
 	// stored in the underlying storage may or may not be deleted depending