diff --git a/mocks/contractserver/contractsmockserver/contractsmockserver.go b/mocks/contractserver/contractsmockserver/contractsmockserver.go
index 4883f4642..a717f6060 100644
--- a/mocks/contractserver/contractsmockserver/contractsmockserver.go
+++ b/mocks/contractserver/contractsmockserver/contractsmockserver.go
@@ -34,8 +34,8 @@ type Settings struct {
 }
 
 // Unmarshal tricks the type system so marshalling YAML will just work when called from the restserver.Settings interface.
-func (s Settings) Unmarshal(in []byte, unmarsheller func(in []byte, out interface{}) (err error)) (restserver.Settings, error) {
-	err := unmarsheller(in, &s)
+func (s Settings) Unmarshal(in []byte, unmarshaller func(in []byte, out interface{}) (err error)) (restserver.Settings, error) {
+	err := unmarshaller(in, &s)
 	return s, err
 }
 
diff --git a/mocks/restserver/application.go b/mocks/restserver/application.go
index 7f41b4bca..e3a72d650 100644
--- a/mocks/restserver/application.go
+++ b/mocks/restserver/application.go
@@ -24,7 +24,7 @@ type Server interface {
 
 // Settings is the minimal interface a settings backend must provide to the Application.
 type Settings interface {
-	Unmarshal(in []byte, unmarsheller func(in []byte, out interface{}) (err error)) (Settings, error)
+	Unmarshal(in []byte, unmarshaller func(in []byte, out interface{}) (err error)) (Settings, error)
 }
 
 // App encapsulates creating and managing the CLI and lifecycle.
diff --git a/mocks/storeserver/storemockserver/storemockserver.go b/mocks/storeserver/storemockserver/storemockserver.go
index b8d7b44a5..247d18b1a 100644
--- a/mocks/storeserver/storemockserver/storemockserver.go
+++ b/mocks/storeserver/storemockserver/storemockserver.go
@@ -98,8 +98,8 @@ type Settings struct {
 }
 
 // Unmarshal tricks the type system so marshalling YAML will just work when called from the restserver.Settings interface.
-func (s Settings) Unmarshal(in []byte, unmarsheller func(in []byte, out interface{}) (err error)) (restserver.Settings, error) {
-	err := unmarsheller(in, &s)
+func (s Settings) Unmarshal(in []byte, unmarshaller func(in []byte, out interface{}) (err error)) (restserver.Settings, error) {
+	err := unmarshaller(in, &s)
 	return s, err
 }