diff --git a/epochStart/metachain/baseRewards_test.go b/epochStart/metachain/baseRewards_test.go
index 8c578337b8a..a7900c2ca29 100644
--- a/epochStart/metachain/baseRewards_test.go
+++ b/epochStart/metachain/baseRewards_test.go
@@ -834,7 +834,7 @@ func TestBaseRewardsCreator_isSystemDelegationSC(t *testing.T) {
 	require.False(t, isDelegationSCAddress)
 
 	// existing user account
-	userAccount, err := state.NewUserAccount([]byte("userAddress"), &hashingMocks.HasherMock{}, &marshal.GogoProtoMarshalizer{})
+	userAccount, err := state.NewUserAccount([]byte("userAddress"), &hashingMocks.HasherMock{}, &testscommon.MarshalizerMock{})
 	require.Nil(t, err)
 
 	userAccount.SetDataTrie(&trieMock.TrieStub{
diff --git a/state/trackableDataTrie.go b/state/trackableDataTrie.go
index ac92aefdc76..93faf7c886f 100644
--- a/state/trackableDataTrie.go
+++ b/state/trackableDataTrie.go
@@ -11,11 +11,11 @@ import (
 
 // TrackableDataTrie wraps a PatriciaMerkelTrie adding modifying data capabilities
 type trackableDataTrie struct {
-	dirtyData   map[string][]byte
-	tr          common.Trie
-	hasher      hashing.Hasher
-	marshalizer marshal.Marshalizer
-	identifier  []byte
+	dirtyData  map[string][]byte
+	tr         common.Trie
+	hasher     hashing.Hasher
+	marshaller marshal.Marshalizer
+	identifier []byte
 }
 
 // NewTrackableDataTrie returns an instance of trackableDataTrie
@@ -28,11 +28,11 @@ func NewTrackableDataTrie(identifier []byte, tr common.Trie, hasher hashing.Hash
 	}
 
 	return &trackableDataTrie{
-		tr:          tr,
-		hasher:      hasher,
-		marshalizer: marshaller,
-		dirtyData:   make(map[string][]byte),
-		identifier:  identifier,
+		tr:         tr,
+		hasher:     hasher,
+		marshaller: marshaller,
+		dirtyData:  make(map[string][]byte),
+		identifier: identifier,
 	}, nil
 }