diff --git a/README.md b/README.md
index 19c304e04..c175ef2a3 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
-# elrond-go-core
-elrond-go common components and data that can be used in other repositories as well
+# mx-chain-core-go
+
+mx-chain-go common components and data that can be used in other repositories as well
diff --git a/core/accumulator/timeAccumulator.go b/core/accumulator/timeAccumulator.go
index 443ffbf6e..60fb7522b 100644
--- a/core/accumulator/timeAccumulator.go
+++ b/core/accumulator/timeAccumulator.go
@@ -8,8 +8,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/check"
 )
 
 var _ core.Accumulator = (*timeAccumulator)(nil)
diff --git a/core/accumulator/timeAccumulator_test.go b/core/accumulator/timeAccumulator_test.go
index 8d51de047..c6d9244aa 100644
--- a/core/accumulator/timeAccumulator_test.go
+++ b/core/accumulator/timeAccumulator_test.go
@@ -5,10 +5,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/accumulator"
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/core/mock"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/accumulator"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/core/mock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/core/alarm/alarm_test.go b/core/alarm/alarm_test.go
index c2a7f7f03..3354ddf98 100644
--- a/core/alarm/alarm_test.go
+++ b/core/alarm/alarm_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/alarm"
-	"github.com/ElrondNetwork/elrond-go-core/core/atomic"
+	"github.com/multiversx/mx-chain-core-go/core/alarm"
+	"github.com/multiversx/mx-chain-core-go/core/atomic"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/core/appStatusPolling/appStatusPolling.go b/core/appStatusPolling/appStatusPolling.go
index 021737dd6..b688e2e67 100644
--- a/core/appStatusPolling/appStatusPolling.go
+++ b/core/appStatusPolling/appStatusPolling.go
@@ -5,8 +5,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/check"
 )
 
 const minPollingDuration = time.Second
diff --git a/core/appStatusPolling/appStatusPolling_test.go b/core/appStatusPolling/appStatusPolling_test.go
index 0809047b7..e3a0e2137 100644
--- a/core/appStatusPolling/appStatusPolling_test.go
+++ b/core/appStatusPolling/appStatusPolling_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/appStatusPolling"
-	"github.com/ElrondNetwork/elrond-go-core/core/mock"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/appStatusPolling"
+	"github.com/multiversx/mx-chain-core-go/core/mock"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/check/ifNil_test.go b/core/check/ifNil_test.go
index e82fd6661..09cbfeccc 100644
--- a/core/check/ifNil_test.go
+++ b/core/check/ifNil_test.go
@@ -3,7 +3,7 @@ package check_test
 import (
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
+	"github.com/multiversx/mx-chain-core-go/core/check"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/check/ifZero_test.go b/core/check/ifZero_test.go
index 17ed330ac..f7071b368 100644
--- a/core/check/ifZero_test.go
+++ b/core/check/ifZero_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
+	"github.com/multiversx/mx-chain-core-go/core/check"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/closing/safeChanCloser_test.go b/core/closing/safeChanCloser_test.go
index cab34965f..1ee5b56ad 100644
--- a/core/closing/safeChanCloser_test.go
+++ b/core/closing/safeChanCloser_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
+	"github.com/multiversx/mx-chain-core-go/core/check"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/closing/shuffleOutCloser.go b/core/closing/shuffleOutCloser.go
index 71aa55bf0..816b9e95e 100644
--- a/core/closing/shuffleOutCloser.go
+++ b/core/closing/shuffleOutCloser.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/core/random"
-	"github.com/ElrondNetwork/elrond-go-core/data/endProcess"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/core/random"
+	"github.com/multiversx/mx-chain-core-go/data/endProcess"
 )
 
 const minDuration = time.Second
diff --git a/core/closing/shuffleOutCloser_test.go b/core/closing/shuffleOutCloser_test.go
index 29047b94a..df5ae2894 100644
--- a/core/closing/shuffleOutCloser_test.go
+++ b/core/closing/shuffleOutCloser_test.go
@@ -5,10 +5,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/core/mock"
-	"github.com/ElrondNetwork/elrond-go-core/data/endProcess"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/core/mock"
+	"github.com/multiversx/mx-chain-core-go/data/endProcess"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/computers.go b/core/computers.go
index 371560460..687369e51 100644
--- a/core/computers.go
+++ b/core/computers.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/data"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/data"
 )
 
 // MaxInt32 returns the maximum of two given numbers
diff --git a/core/computers_test.go b/core/computers_test.go
index aae41c251..1155cf4b3 100644
--- a/core/computers_test.go
+++ b/core/computers_test.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	dataCore "github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/data/block"
+	"github.com/multiversx/mx-chain-core-go/core"
+	dataCore "github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/core/constants.go b/core/constants.go
index deaeb73fe..d47e28dfc 100644
--- a/core/constants.go
+++ b/core/constants.go
@@ -52,69 +52,69 @@ const BuiltInFunctionSetUserName = "SetUserName"
 // BuiltInFunctionSaveKeyValue is the key for the save key value built-in function
 const BuiltInFunctionSaveKeyValue = "SaveKeyValue"
 
-// BuiltInFunctionESDTTransfer is the key for the elrond standard digital token transfer built-in function
+// BuiltInFunctionESDTTransfer is the key for the electronic standard digital token transfer built-in function
 const BuiltInFunctionESDTTransfer = "ESDTTransfer"
 
-// BuiltInFunctionESDTBurn is the key for the elrond standard digital token burn built-in function
+// BuiltInFunctionESDTBurn is the key for the electronic standard digital token burn built-in function
 const BuiltInFunctionESDTBurn = "ESDTBurn"
 
-// BuiltInFunctionESDTFreeze is the key for the elrond standard digital token freeze built-in function
+// BuiltInFunctionESDTFreeze is the key for the electronic standard digital token freeze built-in function
 const BuiltInFunctionESDTFreeze = "ESDTFreeze"
 
-// BuiltInFunctionESDTUnFreeze is the key for the elrond standard digital token unfreeze built-in function
+// BuiltInFunctionESDTUnFreeze is the key for the electronic standard digital token unfreeze built-in function
 const BuiltInFunctionESDTUnFreeze = "ESDTUnFreeze"
 
-// BuiltInFunctionESDTWipe is the key for the elrond standard digital token wipe built-in function
+// BuiltInFunctionESDTWipe is the key for the electronic standard digital token wipe built-in function
 const BuiltInFunctionESDTWipe = "ESDTWipe"
 
-// BuiltInFunctionESDTPause is the key for the elrond standard digital token pause built-in function
+// BuiltInFunctionESDTPause is the key for the electronic standard digital token pause built-in function
 const BuiltInFunctionESDTPause = "ESDTPause"
 
-// BuiltInFunctionESDTUnPause is the key for the elrond standard digital token unpause built-in function
+// BuiltInFunctionESDTUnPause is the key for the electronic standard digital token unpause built-in function
 const BuiltInFunctionESDTUnPause = "ESDTUnPause"
 
-// BuiltInFunctionSetESDTRole is the key for the elrond standard digital token set built-in function
+// BuiltInFunctionSetESDTRole is the key for the electronic standard digital token set built-in function
 const BuiltInFunctionSetESDTRole = "ESDTSetRole"
 
-// BuiltInFunctionUnSetESDTRole is the key for the elrond standard digital token unset built-in function
+// BuiltInFunctionUnSetESDTRole is the key for the electronic standard digital token unset built-in function
 const BuiltInFunctionUnSetESDTRole = "ESDTUnSetRole"
 
-// BuiltInFunctionESDTSetLimitedTransfer is the key for the elrond standard digital token built-in function which sets the property
+// BuiltInFunctionESDTSetLimitedTransfer is the key for the electronic standard digital token built-in function which sets the property
 // for the token to be transferable only through accounts with transfer roles
 const BuiltInFunctionESDTSetLimitedTransfer = "ESDTSetLimitedTransfer"
 
-// BuiltInFunctionESDTUnSetLimitedTransfer is the key for the elrond standard digital token built-in function which unsets the property
+// BuiltInFunctionESDTUnSetLimitedTransfer is the key for the electronic standard digital token built-in function which unsets the property
 // for the token to be transferable only through accounts with transfer roles
 const BuiltInFunctionESDTUnSetLimitedTransfer = "ESDTUnSetLimitedTransfer"
 
-// BuiltInFunctionESDTLocalMint is the key for the elrond standard digital token local mint built-in function
+// BuiltInFunctionESDTLocalMint is the key for the electronic standard digital token local mint built-in function
 const BuiltInFunctionESDTLocalMint = "ESDTLocalMint"
 
-// BuiltInFunctionESDTLocalBurn is the key for the elrond standard digital token local burn built-in function
+// BuiltInFunctionESDTLocalBurn is the key for the electronic standard digital token local burn built-in function
 const BuiltInFunctionESDTLocalBurn = "ESDTLocalBurn"
 
-// BuiltInFunctionESDTNFTTransfer is the key for the elrond standard digital token NFT transfer built-in function
+// BuiltInFunctionESDTNFTTransfer is the key for the electronic standard digital token NFT transfer built-in function
 const BuiltInFunctionESDTNFTTransfer = "ESDTNFTTransfer"
 
-// BuiltInFunctionESDTNFTCreate is the key for the elrond standard digital token NFT create built-in function
+// BuiltInFunctionESDTNFTCreate is the key for the electronic standard digital token NFT create built-in function
 const BuiltInFunctionESDTNFTCreate = "ESDTNFTCreate"
 
-// BuiltInFunctionESDTNFTAddQuantity is the key for the elrond standard digital token NFT add quantity built-in function
+// BuiltInFunctionESDTNFTAddQuantity is the key for the electronic standard digital token NFT add quantity built-in function
 const BuiltInFunctionESDTNFTAddQuantity = "ESDTNFTAddQuantity"
 
-// BuiltInFunctionESDTNFTCreateRoleTransfer is the key for the elrond standard digital token create role transfer function
+// BuiltInFunctionESDTNFTCreateRoleTransfer is the key for the electronic standard digital token create role transfer function
 const BuiltInFunctionESDTNFTCreateRoleTransfer = "ESDTNFTCreateRoleTransfer"
 
-// BuiltInFunctionESDTNFTBurn is the key for the elrond standard digital token NFT burn built-in function
+// BuiltInFunctionESDTNFTBurn is the key for the electronic standard digital token NFT burn built-in function
 const BuiltInFunctionESDTNFTBurn = "ESDTNFTBurn"
 
-// BuiltInFunctionESDTNFTAddURI is the key for the elrond standard digital token NFT add URI built-in function
+// BuiltInFunctionESDTNFTAddURI is the key for the electronic standard digital token NFT add URI built-in function
 const BuiltInFunctionESDTNFTAddURI = "ESDTNFTAddURI"
 
-// BuiltInFunctionESDTNFTUpdateAttributes is the key for the elrond standard digital token NFT update attributes built-in function
+// BuiltInFunctionESDTNFTUpdateAttributes is the key for the electronic standard digital token NFT update attributes built-in function
 const BuiltInFunctionESDTNFTUpdateAttributes = "ESDTNFTUpdateAttributes"
 
-// BuiltInFunctionMultiESDTNFTTransfer is the key for the elrond standard digital token multi transfer built-in function
+// BuiltInFunctionMultiESDTNFTTransfer is the key for the electronic standard digital token multi transfer built-in function
 const BuiltInFunctionMultiESDTNFTTransfer = "MultiESDTNFTTransfer"
 
 // BuiltInFunctionSetGuardian is the key for setting a guardian built-in function
@@ -175,17 +175,17 @@ const SemiFungibleESDT = "SemiFungibleESDT"
 // MaxRoyalty defines 100% as uint32
 const MaxRoyalty = uint32(10000)
 
-// RelayedTransaction is the key for the elrond meta/gassless/relayed transaction standard
+// RelayedTransaction is the key for the electronic meta/gassless/relayed transaction standard
 const RelayedTransaction = "relayedTx"
 
-// RelayedTransactionV2 is the key for the optimized elrond meta/gassless/relayed transaction standard
+// RelayedTransactionV2 is the key for the optimized electronic meta/gassless/relayed transaction standard
 const RelayedTransactionV2 = "relayedTxV2"
 
 // SCDeployInitFunctionName is the key for the function which is called at smart contract deploy time
 const SCDeployInitFunctionName = "_init"
 
-// ElrondProtectedKeyPrefix is the key prefix which is protected from writing in the trie - only for special builtin functions
-const ElrondProtectedKeyPrefix = "ELROND"
+// ProtectedKeyPrefix is the key prefix which is protected from writing in the trie - only for special builtin functions
+const ProtectedKeyPrefix = "E" + "L" + "R" + "O" + "N" + "D"
 
 // DelegationSystemSCKey is the key under which there is data in case of system delegation smart contracts
 const DelegationSystemSCKey = "delegation"
diff --git a/core/converters.go b/core/converters.go
index 8019248cd..f3e395194 100644
--- a/core/converters.go
+++ b/core/converters.go
@@ -7,9 +7,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/hashing"
-	"github.com/ElrondNetwork/elrond-go-core/marshal"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/hashing"
+	"github.com/multiversx/mx-chain-core-go/marshal"
 )
 
 // ConvertBytes converts the input bytes in a readable string using multipliers (k, M, G)
diff --git a/core/converters_test.go b/core/converters_test.go
index f220e2035..dc0951765 100644
--- a/core/converters_test.go
+++ b/core/converters_test.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/mock"
-	"github.com/ElrondNetwork/elrond-go-core/data/batch"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/mock"
+	"github.com/multiversx/mx-chain-core-go/data/batch"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/counting/concurrentShardedCountsWithSize.go b/core/counting/concurrentShardedCountsWithSize.go
index 4e1907ee6..5ba503064 100644
--- a/core/counting/concurrentShardedCountsWithSize.go
+++ b/core/counting/concurrentShardedCountsWithSize.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
+	"github.com/multiversx/mx-chain-core-go/core"
 )
 
 var _ CountsWithSize = (*ConcurrentShardedCountsWithSize)(nil)
diff --git a/core/counting/concurrentShardedCountsWithSize_test.go b/core/counting/concurrentShardedCountsWithSize_test.go
index 3be0d5cef..31d60895a 100644
--- a/core/counting/concurrentShardedCountsWithSize_test.go
+++ b/core/counting/concurrentShardedCountsWithSize_test.go
@@ -4,7 +4,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
+	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/core/file_test.go b/core/file_test.go
index 29b09a79b..8d80d9627 100644
--- a/core/file_test.go
+++ b/core/file_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
+	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/keyValStorage/keyValStorage.go b/core/keyValStorage/keyValStorage.go
index a66bf5b20..b3cbc49b6 100644
--- a/core/keyValStorage/keyValStorage.go
+++ b/core/keyValStorage/keyValStorage.go
@@ -3,7 +3,7 @@ package keyValStorage
 import (
 	"bytes"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
+	"github.com/multiversx/mx-chain-core-go/core"
 )
 
 // KeyValStorage holds a key and an associated value
diff --git a/core/keyValStorage/keyValStorage_test.go b/core/keyValStorage/keyValStorage_test.go
index de5dd5753..57a4001f8 100644
--- a/core/keyValStorage/keyValStorage_test.go
+++ b/core/keyValStorage/keyValStorage_test.go
@@ -3,8 +3,8 @@ package keyValStorage_test
 import (
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/keyValStorage"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/keyValStorage"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/libLocator/vmLocator_darwin.go b/core/libLocator/vmLocator_darwin.go
index f5eb77f85..8a42ea15c 100644
--- a/core/libLocator/vmLocator_darwin.go
+++ b/core/libLocator/vmLocator_darwin.go
@@ -1,3 +1,4 @@
+//go:build darwin
 // +build darwin
 
 package vm
@@ -13,5 +14,5 @@ func WASMLibLocation() string {
 	if err != nil {
 		return ""
 	}
-	return usr.HomeDir + "/elrond-vm-binaries/" + libName
+	return usr.HomeDir + "/multiversx-vm-binaries/" + libName
 }
diff --git a/core/libLocator/vmLocator_linux.go b/core/libLocator/vmLocator_linux.go
index ca31f8282..36fd5c9c0 100644
--- a/core/libLocator/vmLocator_linux.go
+++ b/core/libLocator/vmLocator_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package vm
@@ -14,5 +15,5 @@ func WASMLibLocation() string {
 	if err != nil {
 		return ""
 	}
-	return usr.HomeDir + "/elrond-vm-binaries/" + libName
+	return usr.HomeDir + "/multiversx-vm-binaries/" + libName
 }
diff --git a/core/libLocator/vmLocator_windows.go b/core/libLocator/vmLocator_windows.go
index 9b44adf2b..a86f6abcc 100644
--- a/core/libLocator/vmLocator_windows.go
+++ b/core/libLocator/vmLocator_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package vm
@@ -13,5 +14,5 @@ func WASMLibLocation() string {
 	if err != nil {
 		return ""
 	}
-	return usr.HomeDir + "\\elrond-vm-binaries\\" + libName
+	return usr.HomeDir + "\\multiversx-vm-binaries\\" + libName
 }
diff --git a/core/loggingFunctions_test.go b/core/loggingFunctions_test.go
index f77ea9b04..6aed20a01 100644
--- a/core/loggingFunctions_test.go
+++ b/core/loggingFunctions_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/mock"
+	"github.com/multiversx/mx-chain-core-go/core/mock"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/core/mock/headerHandlerStub.go b/core/mock/headerHandlerStub.go
index 29d5df68c..fe3198998 100644
--- a/core/mock/headerHandlerStub.go
+++ b/core/mock/headerHandlerStub.go
@@ -3,7 +3,7 @@ package mock
 import (
 	"math/big"
 
-	"github.com/ElrondNetwork/elrond-go-core/data"
+	"github.com/multiversx/mx-chain-core-go/data"
 )
 
 // HeaderHandlerStub -
diff --git a/core/nodetype/nodeTypeProvider.go b/core/nodetype/nodeTypeProvider.go
index ba08dfbff..feb059bc2 100644
--- a/core/nodetype/nodeTypeProvider.go
+++ b/core/nodetype/nodeTypeProvider.go
@@ -3,7 +3,7 @@ package nodetype
 import (
 	"sync"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
+	"github.com/multiversx/mx-chain-core-go/core"
 )
 
 type nodeTypeProvider struct {
diff --git a/core/nodetype/nodeTypeProvider_test.go b/core/nodetype/nodeTypeProvider_test.go
index 371140b4d..1b4251ab7 100644
--- a/core/nodetype/nodeTypeProvider_test.go
+++ b/core/nodetype/nodeTypeProvider_test.go
@@ -4,8 +4,8 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/check"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/core/partitioning/dataSplit.go b/core/partitioning/dataSplit.go
index 911711606..08ef2b678 100644
--- a/core/partitioning/dataSplit.go
+++ b/core/partitioning/dataSplit.go
@@ -1,7 +1,7 @@
 package partitioning
 
 import (
-	"github.com/ElrondNetwork/elrond-go-core/core"
+	"github.com/multiversx/mx-chain-core-go/core"
 )
 
 const minimumMaxPacketNum = 1
diff --git a/core/partitioning/dataSplit_test.go b/core/partitioning/dataSplit_test.go
index ebb555dba..41d09f641 100644
--- a/core/partitioning/dataSplit_test.go
+++ b/core/partitioning/dataSplit_test.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/partitioning"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/partitioning"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/partitioning/simpleDataPacker.go b/core/partitioning/simpleDataPacker.go
index 841c9e415..1c54f7359 100644
--- a/core/partitioning/simpleDataPacker.go
+++ b/core/partitioning/simpleDataPacker.go
@@ -1,9 +1,9 @@
 package partitioning
 
 import (
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/data/batch"
-	"github.com/ElrondNetwork/elrond-go-core/marshal"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/data/batch"
+	"github.com/multiversx/mx-chain-core-go/marshal"
 )
 
 // SimpleDataPacker can split a large slice of byte slices in chunks <= maxPacketSize
diff --git a/core/partitioning/simpleDataPacker_test.go b/core/partitioning/simpleDataPacker_test.go
index dc02e62ee..e57b41718 100644
--- a/core/partitioning/simpleDataPacker_test.go
+++ b/core/partitioning/simpleDataPacker_test.go
@@ -4,9 +4,9 @@ import (
 	"crypto/rand"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/mock"
-	"github.com/ElrondNetwork/elrond-go-core/core/partitioning"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/mock"
+	"github.com/multiversx/mx-chain-core-go/core/partitioning"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/partitioning/sizeDataPacker.go b/core/partitioning/sizeDataPacker.go
index a7e2301ea..10f6781f7 100644
--- a/core/partitioning/sizeDataPacker.go
+++ b/core/partitioning/sizeDataPacker.go
@@ -1,9 +1,9 @@
 package partitioning
 
 import (
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/data/batch"
-	"github.com/ElrondNetwork/elrond-go-core/marshal"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/data/batch"
+	"github.com/multiversx/mx-chain-core-go/marshal"
 )
 
 const minimumMaxPacketSizeInBytes = 1
diff --git a/core/partitioning/sizeDataPacker_test.go b/core/partitioning/sizeDataPacker_test.go
index 4dfbfe0f7..22104c12a 100644
--- a/core/partitioning/sizeDataPacker_test.go
+++ b/core/partitioning/sizeDataPacker_test.go
@@ -6,11 +6,11 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/mock"
-	"github.com/ElrondNetwork/elrond-go-core/core/partitioning"
-	"github.com/ElrondNetwork/elrond-go-core/data/batch"
-	"github.com/ElrondNetwork/elrond-go-core/marshal"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/mock"
+	"github.com/multiversx/mx-chain-core-go/core/partitioning"
+	"github.com/multiversx/mx-chain-core-go/data/batch"
+	"github.com/multiversx/mx-chain-core-go/marshal"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/core/pubkeyConverter/bech32PubkeyConverter.go b/core/pubkeyConverter/bech32PubkeyConverter.go
index 8ae475f5e..3361d007b 100644
--- a/core/pubkeyConverter/bech32PubkeyConverter.go
+++ b/core/pubkeyConverter/bech32PubkeyConverter.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"runtime/debug"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
 	"github.com/btcsuite/btcd/btcutil/bech32"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/check"
 )
 
 type config struct {
diff --git a/core/pubkeyConverter/bech32PubkeyConverter_test.go b/core/pubkeyConverter/bech32PubkeyConverter_test.go
index 5b99b3f7b..cb8f896b5 100644
--- a/core/pubkeyConverter/bech32PubkeyConverter_test.go
+++ b/core/pubkeyConverter/bech32PubkeyConverter_test.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/core/mock"
-	"github.com/ElrondNetwork/elrond-go-core/core/pubkeyConverter"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/core/mock"
+	"github.com/multiversx/mx-chain-core-go/core/pubkeyConverter"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/pubkeyConverter/hexPubkeyConverter_test.go b/core/pubkeyConverter/hexPubkeyConverter_test.go
index 4d3025380..84f1b7c91 100644
--- a/core/pubkeyConverter/hexPubkeyConverter_test.go
+++ b/core/pubkeyConverter/hexPubkeyConverter_test.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/core/pubkeyConverter"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/core/pubkeyConverter"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/random/fisherYates_test.go b/core/random/fisherYates_test.go
index 53a961f80..c881e31cf 100644
--- a/core/random/fisherYates_test.go
+++ b/core/random/fisherYates_test.go
@@ -3,7 +3,7 @@ package random
 import (
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/mock"
+	"github.com/multiversx/mx-chain-core-go/core/mock"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/sharding/multiShardCoordinator.go b/core/sharding/multiShardCoordinator.go
index ce2298ca5..ce4b39540 100644
--- a/core/sharding/multiShardCoordinator.go
+++ b/core/sharding/multiShardCoordinator.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"math"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
+	"github.com/multiversx/mx-chain-core-go/core"
 )
 
 // multiShardCoordinator struct defines the functionality for handling transaction dispatching to
diff --git a/core/sliceUtil/sliceUtil_test.go b/core/sliceUtil/sliceUtil_test.go
index 2e3d3f1ee..107aa21cb 100644
--- a/core/sliceUtil/sliceUtil_test.go
+++ b/core/sliceUtil/sliceUtil_test.go
@@ -3,7 +3,7 @@ package sliceUtil_test
 import (
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/sliceUtil"
+	"github.com/multiversx/mx-chain-core-go/core/sliceUtil"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/stopWatch_test.go b/core/stopWatch_test.go
index 947651cd6..135def969 100644
--- a/core/stopWatch_test.go
+++ b/core/stopWatch_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/mock"
+	"github.com/multiversx/mx-chain-core-go/core/mock"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/throttler/numGoRoutinesThrottler.go b/core/throttler/numGoRoutinesThrottler.go
index 01b4ed782..2286e6cbc 100644
--- a/core/throttler/numGoRoutinesThrottler.go
+++ b/core/throttler/numGoRoutinesThrottler.go
@@ -3,7 +3,7 @@ package throttler
 import (
 	"sync/atomic"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
+	"github.com/multiversx/mx-chain-core-go/core"
 )
 
 // NumGoRoutinesThrottler can limit the number of go routines launched
diff --git a/core/throttler/numGoRoutinesThrottler_test.go b/core/throttler/numGoRoutinesThrottler_test.go
index 996103847..28dc28f20 100644
--- a/core/throttler/numGoRoutinesThrottler_test.go
+++ b/core/throttler/numGoRoutinesThrottler_test.go
@@ -3,9 +3,9 @@ package throttler_test
 import (
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/core/throttler"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/core/throttler"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/transaction/transactionSorter.go b/core/transaction/transactionSorter.go
index e6448aa2e..5f6267cb2 100644
--- a/core/transaction/transactionSorter.go
+++ b/core/transaction/transactionSorter.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"sort"
 
-	"github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/hashing"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/hashing"
 )
 
 // SortTransactionsBySenderAndNonceWithFrontRunningProtection - sorts the transactions by address and randomness source to protect from front running
@@ -34,7 +34,7 @@ func SortTransactionsBySenderAndNonceWithFrontRunningProtection(transactions []d
 	sort.Slice(transactions, sorter)
 }
 
-// TODO remove duplicated function when will use the version of elrond-go which exports transaction order during processing
+// TODO remove duplicated function when will use the version of mx-chain-go which exports transaction order during processing
 
 // SortTransactionsBySenderAndNonceWithFrontRunningProtectionExtendedTransactions - sorts the transactions by address and randomness source to protect from front running
 func SortTransactionsBySenderAndNonceWithFrontRunningProtectionExtendedTransactions(transactions []data.TransactionHandlerWithGasUsedAndFee, hasher hashing.Hasher, randomness []byte) {
diff --git a/core/transaction/transactionSorter_test.go b/core/transaction/transactionSorter_test.go
index 3e88e3837..f690f2269 100644
--- a/core/transaction/transactionSorter_test.go
+++ b/core/transaction/transactionSorter_test.go
@@ -6,10 +6,10 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/mock"
-	"github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/data/outport"
-	"github.com/ElrondNetwork/elrond-go-core/data/transaction"
+	"github.com/multiversx/mx-chain-core-go/core/mock"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/outport"
+	"github.com/multiversx/mx-chain-core-go/data/transaction"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/trimmers_test.go b/core/trimmers_test.go
index 588f7c1da..4064ca105 100644
--- a/core/trimmers_test.go
+++ b/core/trimmers_test.go
@@ -3,7 +3,7 @@ package core_test
 import (
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
+	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/versioning/txVersionChecker.go b/core/versioning/txVersionChecker.go
index 0deec5144..776f49f22 100644
--- a/core/versioning/txVersionChecker.go
+++ b/core/versioning/txVersionChecker.go
@@ -1,8 +1,8 @@
 package versioning
 
 import (
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/data/transaction"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/data/transaction"
 )
 
 // There are different options based on the tx version. If version is the initial version of transaction no options can be used.
diff --git a/core/versioning/txVersionChecker_test.go b/core/versioning/txVersionChecker_test.go
index 3d70494ac..86b3ba7f1 100644
--- a/core/versioning/txVersionChecker_test.go
+++ b/core/versioning/txVersionChecker_test.go
@@ -3,8 +3,8 @@ package versioning
 import (
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/data/transaction"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/data/transaction"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/core/versioning/versionComparator.go b/core/versioning/versionComparator.go
index 98f4a9472..9c0d3b4c0 100644
--- a/core/versioning/versionComparator.go
+++ b/core/versioning/versionComparator.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
+	"github.com/multiversx/mx-chain-core-go/core"
 )
 
 const numComponents = 3
diff --git a/core/versioning/versionComparator_test.go b/core/versioning/versionComparator_test.go
index 48c0d113f..fb84e3d4c 100644
--- a/core/versioning/versionComparator_test.go
+++ b/core/versioning/versionComparator_test.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/check"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/core/watchdog/watchdog.go b/core/watchdog/watchdog.go
index 9b0594339..240732d2c 100644
--- a/core/watchdog/watchdog.go
+++ b/core/watchdog/watchdog.go
@@ -5,9 +5,9 @@ import (
 	"runtime/pprof"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/data/endProcess"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/data/endProcess"
 )
 
 type watchdog struct {
diff --git a/core/watchdog/watchdog_test.go b/core/watchdog/watchdog_test.go
index 5a519ca9a..c87de8a40 100644
--- a/core/watchdog/watchdog_test.go
+++ b/core/watchdog/watchdog_test.go
@@ -4,10 +4,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/core/mock"
-	"github.com/ElrondNetwork/elrond-go-core/core/watchdog"
-	"github.com/ElrondNetwork/elrond-go-core/data/endProcess"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/core/mock"
+	"github.com/multiversx/mx-chain-core-go/core/watchdog"
+	"github.com/multiversx/mx-chain-core-go/data/endProcess"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/data/api/apiBlock.go b/data/api/apiBlock.go
index cd7044a40..5387c1099 100644
--- a/data/api/apiBlock.go
+++ b/data/api/apiBlock.go
@@ -4,8 +4,8 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/data/outport"
-	"github.com/ElrondNetwork/elrond-go-core/data/transaction"
+	"github.com/multiversx/mx-chain-core-go/data/outport"
+	"github.com/multiversx/mx-chain-core-go/data/transaction"
 )
 
 // Block represents the structure for block that is returned by api routes
diff --git a/data/api/apiBlock_test.go b/data/api/apiBlock_test.go
index 740644e5c..3528369c1 100644
--- a/data/api/apiBlock_test.go
+++ b/data/api/apiBlock_test.go
@@ -3,7 +3,7 @@ package api_test
 import (
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/data/api"
+	"github.com/multiversx/mx-chain-core-go/data/api"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/data/api/apiHyperBlock.go b/data/api/apiHyperBlock.go
index 01575df45..84bceae39 100644
--- a/data/api/apiHyperBlock.go
+++ b/data/api/apiHyperBlock.go
@@ -3,7 +3,7 @@ package api
 import (
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/data/transaction"
+	"github.com/multiversx/mx-chain-core-go/data/transaction"
 )
 
 // Hyperblock contains all fully executed (both in source and in destination shards) transactions notarized in a given metablock
diff --git a/data/api/options.go b/data/api/options.go
index 0b4e773ec..66ce40dd4 100644
--- a/data/api/options.go
+++ b/data/api/options.go
@@ -1,6 +1,6 @@
 package api
 
-import "github.com/ElrondNetwork/elrond-go-core/core"
+import "github.com/multiversx/mx-chain-core-go/core"
 
 // AccountQueryOptions holds options for account queries
 type AccountQueryOptions struct {
diff --git a/data/batch/batch.go b/data/batch/batch.go
index 6bcb7d228..353994a1d 100644
--- a/data/batch/batch.go
+++ b/data/batch/batch.go
@@ -1,4 +1,4 @@
-//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/ElrondNetwork/protobuf/protobuf  --gogoslick_out=. batch.proto
+//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/multiversx/protobuf/protobuf  --gogoslick_out=. batch.proto
 package batch
 
 // New returns a new batch from given buffers
diff --git a/data/block/block.go b/data/block/block.go
index bc1e91a29..5147be5d6 100644
--- a/data/block/block.go
+++ b/data/block/block.go
@@ -1,11 +1,11 @@
-//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/ElrondNetwork/protobuf/protobuf  --gogoslick_out=. block.proto
+//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/multiversx/protobuf/protobuf  --gogoslick_out=. block.proto
 package block
 
 import (
 	"math/big"
 
-	"github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/data/headerVersionData"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/headerVersionData"
 )
 
 // TODO: add access protection through wrappers
diff --git a/data/block/block.pb.go b/data/block/block.pb.go
index 080fb4781..880b6eee5 100644
--- a/data/block/block.pb.go
+++ b/data/block/block.pb.go
@@ -6,9 +6,9 @@ package block
 import (
 	bytes "bytes"
 	fmt "fmt"
-	github_com_ElrondNetwork_elrond_go_core_data "github.com/ElrondNetwork/elrond-go-core/data"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
+	github_com_multiversx_mx_chain_core_go_data "github.com/multiversx/mx-chain-core-go/data"
 	io "io"
 	math "math"
 	math_big "math/big"
@@ -336,8 +336,8 @@ type Header struct {
 	ReceiptsHash       []byte            `protobuf:"bytes,19,opt,name=ReceiptsHash,proto3" json:"ReceiptsHash,omitempty"`
 	ChainID            []byte            `protobuf:"bytes,20,opt,name=ChainID,proto3" json:"ChainID,omitempty"`
 	SoftwareVersion    []byte            `protobuf:"bytes,21,opt,name=SoftwareVersion,proto3" json:"SoftwareVersion,omitempty"`
-	AccumulatedFees    *math_big.Int     `protobuf:"bytes,22,opt,name=AccumulatedFees,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"AccumulatedFees,omitempty"`
-	DeveloperFees      *math_big.Int     `protobuf:"bytes,23,opt,name=DeveloperFees,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"DeveloperFees,omitempty"`
+	AccumulatedFees    *math_big.Int     `protobuf:"bytes,22,opt,name=AccumulatedFees,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"AccumulatedFees,omitempty"`
+	DeveloperFees      *math_big.Int     `protobuf:"bytes,23,opt,name=DeveloperFees,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"DeveloperFees,omitempty"`
 	Reserved           []byte            `protobuf:"bytes,24,opt,name=Reserved,proto3" json:"Reserved,omitempty"`
 }
 
@@ -639,68 +639,68 @@ func init() {
 func init() { proto.RegisterFile("block.proto", fileDescriptor_8e550b1f5926e92d) }
 
 var fileDescriptor_8e550b1f5926e92d = []byte{
-	// 961 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x3b, 0x6f, 0x1b, 0x47,
-	0x10, 0xe6, 0x49, 0x24, 0x2d, 0x0d, 0x1f, 0xa2, 0xd6, 0x8e, 0x72, 0x30, 0x8c, 0x13, 0x21, 0xb8,
-	0x10, 0x04, 0x88, 0x4a, 0x94, 0x26, 0x0f, 0x23, 0x41, 0xa8, 0x07, 0xa4, 0x24, 0x16, 0x88, 0x3b,
-	0x21, 0x85, 0xbb, 0xe5, 0xdd, 0x98, 0x3c, 0x98, 0xbc, 0x25, 0xf6, 0xf6, 0x28, 0xa9, 0x73, 0x99,
-	0x32, 0x55, 0x7e, 0x43, 0x90, 0x3a, 0x3f, 0xc2, 0x45, 0x0a, 0x95, 0xaa, 0x92, 0x88, 0x6a, 0x52,
-	0xfa, 0x1f, 0x24, 0xd8, 0xd9, 0x3b, 0x3e, 0x4e, 0x2a, 0x52, 0xb8, 0xe2, 0x7d, 0xdf, 0xcc, 0xec,
-	0x7c, 0x33, 0x3b, 0x3b, 0x84, 0x4a, 0x77, 0x20, 0xfc, 0x37, 0xad, 0x91, 0x14, 0x4a, 0xb0, 0x12,
-	0xfd, 0x3c, 0xdd, 0xed, 0x85, 0xaa, 0x9f, 0x74, 0x5b, 0xbe, 0x18, 0xee, 0xf5, 0x44, 0x4f, 0xec,
-	0x11, 0xdd, 0x4d, 0x5e, 0x13, 0x22, 0x40, 0x5f, 0x26, 0x6a, 0xeb, 0x77, 0x0b, 0x56, 0x5f, 0x86,
-	0x51, 0xd8, 0xd6, 0x27, 0xb1, 0xa7, 0xb0, 0x72, 0x7e, 0x79, 0xc2, 0xe3, 0x3e, 0xc6, 0xb6, 0xd5,
-	0x5c, 0xde, 0xae, 0xba, 0x53, 0xcc, 0xb6, 0x61, 0xcd, 0x45, 0x1f, 0xc3, 0x31, 0x4a, 0xaf, 0xcf,
-	0x65, 0x70, 0x7a, 0x68, 0x2f, 0x35, 0xad, 0xed, 0x9a, 0x9b, 0xa7, 0xd9, 0x73, 0xa8, 0x79, 0x18,
-	0x05, 0x33, 0xbf, 0x65, 0xf2, 0x5b, 0x24, 0xd9, 0x26, 0x14, 0xcf, 0xaf, 0x46, 0x68, 0x17, 0x9b,
-	0xd6, 0x76, 0x7d, 0xbf, 0x62, 0xf4, 0xb4, 0x34, 0xe5, 0x92, 0x41, 0x8b, 0x71, 0x31, 0x46, 0x39,
-	0xc6, 0xc0, 0x2e, 0x35, 0x2d, 0x2d, 0x26, 0xc3, 0x5b, 0x7f, 0x58, 0xb0, 0x36, 0x95, 0x7d, 0x82,
-	0x3c, 0x40, 0xc9, 0x18, 0x14, 0xb5, 0x54, 0xdb, 0x22, 0x5f, 0xfa, 0xbe, 0x2f, 0x65, 0xe9, 0x21,
-	0x29, 0x0f, 0x94, 0xb6, 0xfc, 0x70, 0x69, 0x36, 0x3c, 0x3a, 0xbf, 0x3c, 0x10, 0x49, 0xa4, 0x48,
-	0x77, 0xcd, 0xcd, 0xe0, 0xb4, 0x9c, 0xd2, 0xff, 0x29, 0xa7, 0x9c, 0x2b, 0xe7, 0x18, 0xa0, 0x83,
-	0x28, 0x0f, 0xfa, 0x3c, 0xea, 0x21, 0xdb, 0x80, 0x72, 0x27, 0xe9, 0x7e, 0x8f, 0x57, 0x69, 0x29,
-	0x29, 0x62, 0x4d, 0xa8, 0x18, 0x1d, 0xc1, 0x21, 0xc6, 0x2a, 0x2d, 0x65, 0x9e, 0xda, 0x7a, 0xbb,
-	0x02, 0xe5, 0xb4, 0x1b, 0x4f, 0xa0, 0x74, 0x26, 0x22, 0x1f, 0xe9, 0x8c, 0xa2, 0x6b, 0x80, 0x16,
-	0xd1, 0x91, 0x38, 0xa6, 0x3e, 0x2d, 0x19, 0x11, 0x19, 0x66, 0x5b, 0x50, 0xd5, 0xdf, 0x2e, 0x8f,
-	0x02, 0x0f, 0x31, 0xa0, 0x16, 0x54, 0xdd, 0x05, 0x8e, 0x8a, 0xc8, 0xec, 0xc5, 0xb4, 0x88, 0xcc,
-	0xf6, 0x1c, 0x6a, 0x46, 0x68, 0xdc, 0x0e, 0xd5, 0x90, 0x8f, 0xd2, 0x4b, 0x5b, 0x24, 0x75, 0x07,
-	0xb3, 0x1e, 0x97, 0x4d, 0x07, 0xb3, 0xde, 0x3e, 0x83, 0xd5, 0xf3, 0x70, 0x88, 0x9e, 0xe2, 0xc3,
-	0x91, 0xfd, 0x88, 0x54, 0xcf, 0x08, 0x5d, 0x8f, 0x2b, 0x92, 0x28, 0xb0, 0x57, 0x4c, 0x3d, 0x04,
-	0x34, 0x7b, 0x34, 0x12, 0x7e, 0xdf, 0x5e, 0xa5, 0xb3, 0x0c, 0x60, 0x9f, 0x42, 0x8d, 0x06, 0xa3,
-	0x2d, 0x82, 0x2b, 0xba, 0x14, 0xb8, 0x7f, 0x29, 0x8b, 0x1e, 0x3a, 0xb9, 0x17, 0xf6, 0x22, 0xae,
-	0x12, 0x89, 0x76, 0x85, 0x84, 0xcf, 0x08, 0x3d, 0x20, 0x3f, 0x50, 0x5b, 0x67, 0x3e, 0x55, 0xf2,
-	0xc9, 0xd3, 0xec, 0x04, 0x1a, 0xb9, 0xb9, 0x8c, 0xed, 0x5a, 0x73, 0x79, 0xbb, 0xb2, 0xbf, 0x91,
-	0x66, 0xcf, 0x99, 0xdb, 0xc5, 0x77, 0x7f, 0x6e, 0x16, 0xdc, 0x7b, 0x51, 0xec, 0x0b, 0xa8, 0xcc,
-	0x66, 0x22, 0xb6, 0xeb, 0x74, 0xc8, 0x7a, 0x7a, 0xc8, 0xcc, 0x92, 0xc6, 0xcf, 0xfb, 0xd2, 0x2d,
-	0x09, 0xa1, 0xe8, 0x96, 0xd7, 0xd2, 0x5b, 0x4a, 0xb1, 0x2e, 0xe5, 0x25, 0x2a, 0x6e, 0x52, 0x99,
-	0x97, 0xde, 0xa0, 0x97, 0x9e, 0xa7, 0xe7, 0x67, 0x7d, 0x7d, 0x71, 0xd6, 0x5b, 0xc0, 0xa8, 0xd1,
-	0x9e, 0xe2, 0x52, 0xe9, 0x30, 0xca, 0xc4, 0x28, 0xd3, 0x03, 0x16, 0x3d, 0x59, 0xf4, 0x90, 0x46,
-	0x2a, 0x26, 0xcf, 0xc7, 0x66, 0xb2, 0xe6, 0x39, 0x9d, 0xed, 0xa0, 0xcf, 0xc3, 0xe8, 0xf4, 0xd0,
-	0x7e, 0x42, 0xe6, 0x0c, 0x6a, 0xc5, 0x9e, 0x78, 0xad, 0x2e, 0xb8, 0xc4, 0x1f, 0x51, 0xc6, 0xa1,
-	0x88, 0xec, 0x8f, 0x4c, 0xf3, 0x73, 0x34, 0x53, 0xb0, 0xf6, 0xad, 0xef, 0x27, 0xc3, 0x64, 0xc0,
-	0x15, 0x06, 0xc7, 0x88, 0xb1, 0xbd, 0xa1, 0x3d, 0xdb, 0xdf, 0xfd, 0xf6, 0xd7, 0xe6, 0xf1, 0x90,
-	0xab, 0xfe, 0x5e, 0x37, 0xec, 0xb5, 0x4e, 0x23, 0xf5, 0xd5, 0xdc, 0x96, 0x3c, 0x1a, 0x48, 0x11,
-	0x05, 0x67, 0xa8, 0x2e, 0x84, 0x7c, 0xb3, 0x87, 0x84, 0x76, 0x7b, 0x62, 0xd7, 0x17, 0x12, 0xf7,
-	0x02, 0xae, 0x78, 0xab, 0x1d, 0xf6, 0x4e, 0x23, 0x75, 0xc0, 0x63, 0x85, 0xd2, 0xcd, 0xa7, 0x60,
-	0x23, 0xa8, 0x1d, 0xe2, 0x18, 0x07, 0x62, 0x84, 0x92, 0x72, 0x7e, 0xfc, 0xc1, 0x73, 0x2e, 0x26,
-	0x58, 0x58, 0x25, 0x76, 0x6e, 0x95, 0x7c, 0x0e, 0x45, 0x3d, 0xd4, 0xec, 0x13, 0x80, 0xe9, 0x48,
-	0x99, 0x65, 0x5e, 0xd9, 0x6f, 0xe4, 0x47, 0xd0, 0x9d, 0xf3, 0xd9, 0x7a, 0x01, 0x75, 0x1d, 0x69,
-	0xe6, 0xaf, 0xc3, 0x43, 0xda, 0xa8, 0x9a, 0xc9, 0x36, 0x2a, 0x9d, 0xbb, 0x91, 0x6d, 0x98, 0x74,
-	0x7f, 0xa4, 0x68, 0xe7, 0x27, 0xcb, 0x2c, 0x40, 0x56, 0xd1, 0x63, 0x43, 0x47, 0x36, 0x0a, 0xac,
-	0x0e, 0xe0, 0x29, 0xae, 0xd0, 0x60, 0x87, 0xd5, 0x60, 0x55, 0x0f, 0xaa, 0x81, 0x2f, 0xd8, 0x33,
-	0xb0, 0xbd, 0x21, 0x97, 0xea, 0x40, 0x44, 0x4a, 0x72, 0x5f, 0xb9, 0x18, 0x27, 0x03, 0x65, 0xac,
-	0xaf, 0x58, 0x03, 0xaa, 0xa7, 0xd1, 0x98, 0x0f, 0xc2, 0xc0, 0x30, 0x97, 0x6c, 0x7d, 0x3a, 0x48,
-	0x86, 0xf9, 0xc5, 0x32, 0xd4, 0x05, 0x97, 0x41, 0x6c, 0xa8, 0x7f, 0xad, 0x9d, 0x2f, 0xa1, 0xde,
-	0x91, 0xc2, 0xc7, 0x38, 0x0e, 0xa3, 0x1e, 0x69, 0x02, 0x28, 0x9f, 0x09, 0x39, 0xe4, 0x83, 0x46,
-	0x41, 0x4b, 0xf0, 0xfc, 0x3e, 0x06, 0xc9, 0x00, 0x83, 0x86, 0x45, 0x8a, 0x8c, 0x33, 0x06, 0x8d,
-	0xa5, 0x9d, 0xaf, 0xa1, 0x3e, 0x6d, 0x09, 0x29, 0x67, 0xab, 0x50, 0x3a, 0x0e, 0x23, 0x0a, 0xad,
-	0xea, 0xed, 0x29, 0x46, 0x22, 0xa6, 0xc8, 0xc7, 0xb0, 0xd6, 0xe1, 0x52, 0x85, 0x7c, 0x70, 0x74,
-	0x89, 0x7e, 0xa2, 0x74, 0x7c, 0xfb, 0x9b, 0xeb, 0x5b, 0xa7, 0x70, 0x73, 0xeb, 0x14, 0xde, 0xdf,
-	0x3a, 0xd6, 0xdb, 0x89, 0x63, 0xfd, 0x3a, 0x71, 0xac, 0x77, 0x13, 0xc7, 0xba, 0x9e, 0x38, 0xd6,
-	0xcd, 0xc4, 0xb1, 0xfe, 0x9e, 0x38, 0xd6, 0x3f, 0x13, 0xa7, 0xf0, 0x7e, 0xe2, 0x58, 0x3f, 0xdf,
-	0x39, 0x85, 0xeb, 0x3b, 0xa7, 0x70, 0x73, 0xe7, 0x14, 0x5e, 0x95, 0xe8, 0xcf, 0xbc, 0x5b, 0xa6,
-	0x2b, 0xfa, 0xec, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x38, 0x5f, 0xd7, 0x1a, 0xdc, 0x07, 0x00,
-	0x00,
+	// 962 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x3b, 0x6f, 0xe3, 0xc6,
+	0x13, 0x17, 0x6d, 0x49, 0x3e, 0x8f, 0x1e, 0x96, 0xf7, 0xee, 0xef, 0x3f, 0x71, 0x38, 0xd0, 0x82,
+	0x71, 0x85, 0x61, 0xc0, 0x72, 0xe2, 0x34, 0x79, 0x1c, 0x12, 0x44, 0x7e, 0xc0, 0x42, 0x72, 0x07,
+	0x81, 0x32, 0x52, 0x5c, 0xb7, 0x22, 0xe7, 0x24, 0x22, 0x22, 0x57, 0x58, 0x2e, 0x75, 0x72, 0x97,
+	0x32, 0x65, 0xaa, 0x7c, 0x86, 0x20, 0x75, 0x3e, 0xc4, 0x15, 0x29, 0x5c, 0xba, 0x4a, 0x62, 0xb9,
+	0x49, 0x79, 0x9f, 0x20, 0x09, 0x76, 0x96, 0xd4, 0x83, 0x76, 0x91, 0x22, 0x95, 0x38, 0xbf, 0x9d,
+	0xc7, 0x6f, 0x66, 0x7f, 0x3b, 0x82, 0x4a, 0x7f, 0x24, 0xbc, 0x6f, 0x5b, 0x63, 0x29, 0x94, 0x60,
+	0x25, 0xfa, 0x79, 0x7a, 0x38, 0x08, 0xd4, 0x30, 0xe9, 0xb7, 0x3c, 0x11, 0x1e, 0x0d, 0xc4, 0x40,
+	0x1c, 0x11, 0xdc, 0x4f, 0xde, 0x90, 0x45, 0x06, 0x7d, 0x99, 0xa8, 0xbd, 0x5f, 0x2c, 0xd8, 0x7c,
+	0x19, 0x44, 0x41, 0x5b, 0x67, 0x62, 0x4f, 0xe1, 0xd1, 0xe5, 0xf4, 0x82, 0xc7, 0x43, 0x8c, 0x6d,
+	0xab, 0xb9, 0xbe, 0x5f, 0x75, 0xe7, 0x36, 0xdb, 0x87, 0x2d, 0x17, 0x3d, 0x0c, 0x26, 0x28, 0x7b,
+	0x43, 0x2e, 0xfd, 0xce, 0xa9, 0xbd, 0xd6, 0xb4, 0xf6, 0x6b, 0x6e, 0x1e, 0x66, 0xcf, 0xa1, 0xd6,
+	0xc3, 0xc8, 0x5f, 0xf8, 0xad, 0x93, 0xdf, 0x2a, 0xc8, 0x76, 0xa1, 0x78, 0x79, 0x35, 0x46, 0xbb,
+	0xd8, 0xb4, 0xf6, 0xeb, 0xc7, 0x15, 0xc3, 0xa7, 0xa5, 0x21, 0x97, 0x0e, 0x34, 0x19, 0x17, 0x63,
+	0x94, 0x13, 0xf4, 0xed, 0x52, 0xd3, 0xd2, 0x64, 0x32, 0x7b, 0xef, 0x57, 0x0b, 0xb6, 0xe6, 0xb4,
+	0x2f, 0x90, 0xfb, 0x28, 0x19, 0x83, 0xa2, 0xa6, 0x6a, 0x5b, 0xe4, 0x4b, 0xdf, 0xf7, 0xa9, 0xac,
+	0x3d, 0x44, 0xe5, 0x81, 0xd6, 0xd6, 0x1f, 0x6e, 0xcd, 0x86, 0x8d, 0xcb, 0xe9, 0x89, 0x48, 0x22,
+	0x45, 0xbc, 0x6b, 0x6e, 0x66, 0xce, 0xdb, 0x29, 0xfd, 0x9b, 0x76, 0xca, 0xb9, 0x76, 0xce, 0x01,
+	0xba, 0x88, 0xf2, 0x64, 0xc8, 0xa3, 0x01, 0xb2, 0x1d, 0x28, 0x77, 0x93, 0xfe, 0x57, 0x78, 0x95,
+	0xb6, 0x92, 0x5a, 0xac, 0x09, 0x15, 0xc3, 0xc3, 0x3f, 0xc5, 0x58, 0xa5, 0xad, 0x2c, 0x43, 0x7b,
+	0x7f, 0x6d, 0x40, 0x39, 0x9d, 0xc6, 0x13, 0x28, 0xbd, 0x12, 0x91, 0x87, 0x94, 0xa3, 0xe8, 0x1a,
+	0x43, 0x93, 0xe8, 0x4a, 0x9c, 0xd0, 0x9c, 0xd6, 0x0c, 0x89, 0xcc, 0x66, 0x7b, 0x50, 0xd5, 0xdf,
+	0x2e, 0x8f, 0xfc, 0x1e, 0xa2, 0x4f, 0x23, 0xa8, 0xba, 0x2b, 0x18, 0x35, 0x91, 0x9d, 0x17, 0xd3,
+	0x26, 0xb2, 0xb3, 0xe7, 0x50, 0x33, 0x44, 0xe3, 0x76, 0xa0, 0x42, 0x3e, 0x4e, 0x2f, 0x6d, 0x15,
+	0xd4, 0x13, 0xcc, 0x66, 0x5c, 0x36, 0x13, 0xcc, 0x66, 0xfb, 0x0c, 0x36, 0x2f, 0x83, 0x10, 0x7b,
+	0x8a, 0x87, 0x63, 0x7b, 0x83, 0x58, 0x2f, 0x00, 0xdd, 0x8f, 0x2b, 0x92, 0xc8, 0xb7, 0x1f, 0x99,
+	0x7e, 0xc8, 0xd0, 0xe8, 0xd9, 0x58, 0x78, 0x43, 0x7b, 0x93, 0x72, 0x19, 0x83, 0x7d, 0x08, 0x35,
+	0x12, 0x46, 0x5b, 0xf8, 0x57, 0x74, 0x29, 0x70, 0xff, 0x52, 0x56, 0x3d, 0x74, 0xf1, 0x5e, 0x30,
+	0x88, 0xb8, 0x4a, 0x24, 0xda, 0x15, 0x22, 0xbe, 0x00, 0xb4, 0x40, 0xbe, 0xa6, 0xb1, 0x2e, 0x7c,
+	0xaa, 0xe4, 0x93, 0x87, 0xd9, 0x05, 0x34, 0x72, 0xba, 0x8c, 0xed, 0x5a, 0x73, 0x7d, 0xbf, 0x72,
+	0xbc, 0x93, 0x56, 0xcf, 0x1d, 0xb7, 0x8b, 0xef, 0x7e, 0xdb, 0x2d, 0xb8, 0xf7, 0xa2, 0xd8, 0x27,
+	0x50, 0x59, 0x68, 0x22, 0xb6, 0xeb, 0x94, 0x64, 0x3b, 0x4d, 0xb2, 0x38, 0x49, 0xe3, 0x97, 0x7d,
+	0xe9, 0x96, 0x84, 0x50, 0x74, 0xcb, 0x5b, 0xe9, 0x2d, 0xa5, 0xb6, 0x6e, 0xe5, 0x25, 0x2a, 0x6e,
+	0x4a, 0x99, 0x97, 0xde, 0xa0, 0x97, 0x9e, 0x87, 0x97, 0xb5, 0xbe, 0xbd, 0xaa, 0xf5, 0x16, 0x30,
+	0x1a, 0x74, 0x4f, 0x71, 0xa9, 0x74, 0x18, 0x55, 0x62, 0x54, 0xe9, 0x81, 0x13, 0xad, 0x2c, 0x7a,
+	0x48, 0x63, 0x15, 0x93, 0xe7, 0x63, 0xa3, 0xac, 0x65, 0x4c, 0x57, 0x3b, 0x19, 0xf2, 0x20, 0xea,
+	0x9c, 0xda, 0x4f, 0xe8, 0x38, 0x33, 0x35, 0xe3, 0x9e, 0x78, 0xa3, 0xde, 0x72, 0x89, 0xdf, 0xa0,
+	0x8c, 0x03, 0x11, 0xd9, 0xff, 0x33, 0xc3, 0xcf, 0xc1, 0x2c, 0x86, 0xad, 0x2f, 0x3d, 0x2f, 0x09,
+	0x93, 0x11, 0x57, 0xe8, 0x9f, 0x23, 0xc6, 0xf6, 0x8e, 0xf6, 0x6c, 0x77, 0x7e, 0xfe, 0x7d, 0xf7,
+	0x2c, 0xe4, 0x6a, 0x78, 0xd4, 0x0f, 0x06, 0xad, 0x4e, 0xa4, 0x3e, 0x5b, 0xda, 0x92, 0x61, 0x32,
+	0x52, 0xfa, 0x8d, 0xc7, 0xd3, 0xa3, 0x70, 0x7a, 0xe8, 0xe9, 0xaa, 0x87, 0x9e, 0x90, 0x78, 0x38,
+	0x10, 0x47, 0x3e, 0x57, 0xbc, 0xd5, 0x0e, 0x06, 0x9d, 0x48, 0x9d, 0xf0, 0x58, 0xa1, 0x74, 0xf3,
+	0x15, 0x98, 0x80, 0xda, 0x29, 0x4e, 0x70, 0x24, 0xc6, 0x28, 0xa9, 0xe4, 0xff, 0xff, 0xeb, 0x92,
+	0xab, 0xf9, 0x57, 0x16, 0x89, 0x9d, 0x5b, 0x24, 0x1f, 0x43, 0x51, 0x4b, 0x9a, 0x7d, 0x00, 0x30,
+	0x17, 0x94, 0x59, 0xe5, 0x95, 0xe3, 0x46, 0x5e, 0x80, 0xee, 0x92, 0xcf, 0xde, 0x0b, 0xa8, 0xeb,
+	0x48, 0xa3, 0xbe, 0x2e, 0x0f, 0x68, 0x9f, 0x6a, 0x24, 0xdb, 0xa7, 0x94, 0x77, 0x27, 0xdb, 0x2f,
+	0xe9, 0xf6, 0x48, 0xad, 0x83, 0xef, 0x2d, 0xb3, 0xfe, 0x58, 0x45, 0x8b, 0x86, 0x52, 0x36, 0x0a,
+	0xac, 0x0e, 0xd0, 0x53, 0x5c, 0xa1, 0xb1, 0x1d, 0x56, 0x83, 0x4d, 0x2d, 0x53, 0x63, 0xbe, 0x60,
+	0xcf, 0xc0, 0xee, 0x85, 0x5c, 0xaa, 0x13, 0x11, 0x29, 0xc9, 0x3d, 0xe5, 0x62, 0x9c, 0x8c, 0x94,
+	0x39, 0x7d, 0xcd, 0x1a, 0x50, 0xed, 0x44, 0x13, 0x3e, 0x0a, 0x7c, 0x83, 0x4c, 0xd9, 0xf6, 0x5c,
+	0x46, 0x06, 0xf9, 0xd1, 0x32, 0xd0, 0x5b, 0x2e, 0xfd, 0xd8, 0x40, 0x7f, 0x5b, 0x07, 0x9f, 0x42,
+	0xbd, 0x2b, 0x85, 0x87, 0x71, 0x1c, 0x44, 0x03, 0xe2, 0x04, 0x50, 0x7e, 0x25, 0x64, 0xc8, 0x47,
+	0x8d, 0x82, 0xa6, 0xd0, 0xf3, 0x86, 0xe8, 0x27, 0x23, 0xf4, 0x1b, 0x16, 0x31, 0x32, 0xce, 0xe8,
+	0x37, 0xd6, 0x0e, 0x3e, 0x87, 0xfa, 0x7c, 0x24, 0xc4, 0x9c, 0x6d, 0x42, 0xe9, 0x3c, 0x88, 0x28,
+	0xb4, 0xaa, 0x77, 0xa7, 0x18, 0x8b, 0x98, 0x22, 0x1f, 0xc3, 0x56, 0x97, 0x4b, 0x15, 0xf0, 0xd1,
+	0xd9, 0x14, 0xbd, 0x44, 0xe9, 0xf8, 0xf6, 0x17, 0xd7, 0xb7, 0x4e, 0xe1, 0xe6, 0xd6, 0x29, 0xbc,
+	0xbf, 0x75, 0xac, 0xef, 0x66, 0x8e, 0xf5, 0xd3, 0xcc, 0xb1, 0xde, 0xcd, 0x1c, 0xeb, 0x7a, 0xe6,
+	0x58, 0x37, 0x33, 0xc7, 0xfa, 0x63, 0xe6, 0x58, 0x7f, 0xce, 0x9c, 0xc2, 0xfb, 0x99, 0x63, 0xfd,
+	0x70, 0xe7, 0x14, 0xae, 0xef, 0x9c, 0xc2, 0xcd, 0x9d, 0x53, 0x78, 0x5d, 0xa2, 0xbf, 0xf2, 0x7e,
+	0x99, 0xae, 0xe8, 0xa3, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x89, 0x48, 0xfc, 0x4a, 0xda, 0x07,
+	0x00, 0x00,
 }
 
 func (x Type) String() string {
@@ -929,13 +929,13 @@ func (this *Header) Equal(that interface{}) bool {
 		return false
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.AccumulatedFees, that1.AccumulatedFees) {
 			return false
 		}
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.DeveloperFees, that1.DeveloperFees) {
 			return false
 		}
@@ -1293,7 +1293,7 @@ func (m *Header) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		dAtA[i] = 0xc2
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.DeveloperFees)
 		i -= size
 		if _, err := __caster.MarshalTo(m.DeveloperFees, dAtA[i:]); err != nil {
@@ -1306,7 +1306,7 @@ func (m *Header) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i--
 	dAtA[i] = 0xba
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.AccumulatedFees)
 		i -= size
 		if _, err := __caster.MarshalTo(m.AccumulatedFees, dAtA[i:]); err != nil {
@@ -1730,12 +1730,12 @@ func (m *Header) Size() (n int) {
 		n += 2 + l + sovBlock(uint64(l))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.AccumulatedFees)
 		n += 2 + l + sovBlock(uint64(l))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.DeveloperFees)
 		n += 2 + l + sovBlock(uint64(l))
 	}
@@ -3046,7 +3046,7 @@ func (m *Header) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
@@ -3084,7 +3084,7 @@ func (m *Header) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
diff --git a/data/block/block.proto b/data/block/block.proto
index c8290675f..0ace1958f 100644
--- a/data/block/block.proto
+++ b/data/block/block.proto
@@ -83,8 +83,8 @@ message Header  {
   bytes                    ReceiptsHash = 19;
   bytes                    ChainID = 20;
   bytes                    SoftwareVersion = 21;
-  bytes                    AccumulatedFees = 22 [(gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
-  bytes                    DeveloperFees = 23 [(gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
+  bytes                    AccumulatedFees = 22 [(gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
+  bytes                    DeveloperFees = 23 [(gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
   bytes                    Reserved = 24;
 }
 
diff --git a/data/block/blockV2.go b/data/block/blockV2.go
index 4aa1ec3b6..1d020c06f 100644
--- a/data/block/blockV2.go
+++ b/data/block/blockV2.go
@@ -1,12 +1,12 @@
-//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/ElrondNetwork/protobuf/protobuf  --gogoslick_out=. blockV2.proto
+//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/multiversx/protobuf/protobuf  --gogoslick_out=. blockV2.proto
 package block
 
 import (
 	"math/big"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/data/headerVersionData"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/headerVersionData"
 )
 
 // GetShardID returns the header shardID
diff --git a/data/block/blockV2.pb.go b/data/block/blockV2.pb.go
index 4599aa8ed..fedd77586 100644
--- a/data/block/blockV2.pb.go
+++ b/data/block/blockV2.pb.go
@@ -6,9 +6,9 @@ package block
 import (
 	bytes "bytes"
 	fmt "fmt"
-	github_com_ElrondNetwork_elrond_go_core_data "github.com/ElrondNetwork/elrond-go-core/data"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
+	github_com_multiversx_mx_chain_core_go_data "github.com/multiversx/mx-chain-core-go/data"
 	io "io"
 	math "math"
 	math_big "math/big"
@@ -32,8 +32,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 type HeaderV2 struct {
 	Header                   *Header       `protobuf:"bytes,1,opt,name=Header,proto3" json:"Header,omitempty"`
 	ScheduledRootHash        []byte        `protobuf:"bytes,2,opt,name=ScheduledRootHash,proto3" json:"ScheduledRootHash,omitempty"`
-	ScheduledAccumulatedFees *math_big.Int `protobuf:"bytes,3,opt,name=ScheduledAccumulatedFees,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"ScheduledAccumulatedFees,omitempty"`
-	ScheduledDeveloperFees   *math_big.Int `protobuf:"bytes,4,opt,name=ScheduledDeveloperFees,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"ScheduledDeveloperFees,omitempty"`
+	ScheduledAccumulatedFees *math_big.Int `protobuf:"bytes,3,opt,name=ScheduledAccumulatedFees,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"ScheduledAccumulatedFees,omitempty"`
+	ScheduledDeveloperFees   *math_big.Int `protobuf:"bytes,4,opt,name=ScheduledDeveloperFees,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"ScheduledDeveloperFees,omitempty"`
 	ScheduledGasProvided     uint64        `protobuf:"varint,5,opt,name=ScheduledGasProvided,proto3" json:"ScheduledGasProvided,omitempty"`
 	ScheduledGasPenalized    uint64        `protobuf:"varint,6,opt,name=ScheduledGasPenalized,proto3" json:"ScheduledGasPenalized,omitempty"`
 	ScheduledGasRefunded     uint64        `protobuf:"varint,7,opt,name=ScheduledGasRefunded,proto3" json:"ScheduledGasRefunded,omitempty"`
@@ -235,40 +235,40 @@ func init() {
 func init() { proto.RegisterFile("blockV2.proto", fileDescriptor_17a3844aa051366e) }
 
 var fileDescriptor_17a3844aa051366e = []byte{
-	// 524 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x3f, 0x6f, 0x13, 0x3f,
-	0x1c, 0xc6, 0xcf, 0xbf, 0x5f, 0x12, 0x90, 0x4b, 0x10, 0xb5, 0x68, 0x7b, 0xea, 0x60, 0xa2, 0x48,
-	0x48, 0x11, 0x90, 0x44, 0x0a, 0x08, 0x21, 0x75, 0x40, 0x04, 0x1a, 0x1a, 0xc4, 0x9f, 0xea, 0x1a,
-	0x75, 0x60, 0x73, 0xce, 0xdf, 0x5c, 0x4e, 0xbd, 0xd8, 0x91, 0xed, 0x0b, 0x01, 0x31, 0x20, 0x06,
-	0x16, 0x16, 0x5e, 0x06, 0xe2, 0x95, 0x30, 0x66, 0xcc, 0x06, 0xb9, 0x2c, 0x8c, 0x5d, 0xd8, 0x51,
-	0x7c, 0x21, 0x10, 0xd2, 0x6c, 0x9d, 0xce, 0xdf, 0xe7, 0xe3, 0xc7, 0x8f, 0x2d, 0x3d, 0x87, 0xf3,
-	0xed, 0x48, 0xfa, 0x27, 0xc7, 0xb5, 0x4a, 0x5f, 0x49, 0x23, 0x49, 0xd6, 0x7e, 0x76, 0xcb, 0x41,
-	0x68, 0xba, 0x71, 0xbb, 0xe2, 0xcb, 0x5e, 0x35, 0x90, 0x81, 0xac, 0x5a, 0xb9, 0x1d, 0x77, 0xec,
-	0x64, 0x07, 0xbb, 0x4a, 0x5d, 0xbb, 0x1b, 0xf6, 0x90, 0x74, 0x28, 0x7e, 0xcc, 0xe0, 0x8b, 0x07,
-	0xc0, 0x38, 0xa8, 0xe3, 0x1a, 0xb9, 0x8e, 0x73, 0xe9, 0xda, 0x45, 0x05, 0x54, 0xda, 0xa8, 0xe5,
-	0xd3, 0x4d, 0x95, 0x54, 0xf4, 0xe6, 0x90, 0xdc, 0xc2, 0x9b, 0x47, 0x7e, 0x17, 0x78, 0x1c, 0x01,
-	0xf7, 0xa4, 0x34, 0x07, 0x4c, 0x77, 0xdd, 0xff, 0x0a, 0xa8, 0x74, 0xc9, 0x5b, 0x05, 0xe4, 0x03,
-	0xc2, 0xee, 0x42, 0x7d, 0xe0, 0xfb, 0x71, 0x2f, 0x8e, 0x98, 0x01, 0xde, 0x00, 0xd0, 0xee, 0xff,
-	0x33, 0x57, 0xfd, 0xc9, 0x97, 0x6f, 0xd7, 0x1a, 0x3d, 0x66, 0xba, 0xd5, 0x76, 0x18, 0x54, 0x9a,
-	0xc2, 0xec, 0xfd, 0xf5, 0xa2, 0xfd, 0x48, 0x49, 0xc1, 0x9f, 0x83, 0x79, 0x25, 0xd5, 0x49, 0x15,
-	0xec, 0x54, 0x0e, 0x64, 0xd9, 0x97, 0x0a, 0xaa, 0x9c, 0x19, 0x56, 0xa9, 0x87, 0x41, 0x53, 0x98,
-	0x87, 0x4c, 0x1b, 0x50, 0xde, 0xda, 0x2c, 0xf2, 0x1e, 0xe1, 0xed, 0x05, 0x7c, 0x04, 0x03, 0x88,
-	0x64, 0x1f, 0x94, 0xbd, 0x46, 0xe6, 0xdc, 0xaf, 0xb1, 0x26, 0x89, 0xd4, 0xf0, 0xd5, 0x05, 0x79,
-	0xcc, 0xf4, 0xa1, 0x92, 0x83, 0x90, 0x03, 0x77, 0xb3, 0x05, 0x54, 0xca, 0x78, 0x67, 0x32, 0x72,
-	0x07, 0x6f, 0x2d, 0xe9, 0x20, 0x58, 0x14, 0xbe, 0x01, 0xee, 0xe6, 0xac, 0xe9, 0x6c, 0xf8, 0x6f,
-	0x92, 0x07, 0x9d, 0x58, 0xcc, 0x92, 0x2e, 0xac, 0x26, 0xfd, 0x66, 0xc5, 0xb7, 0x78, 0xf3, 0x59,
-	0x28, 0xc2, 0xfa, 0xac, 0x20, 0x1e, 0x68, 0x50, 0x03, 0xe0, 0x64, 0x0f, 0xe7, 0xf7, 0x87, 0xe0,
-	0xc7, 0x26, 0x94, 0xa2, 0xf5, 0xba, 0x0f, 0xb6, 0x1c, 0x97, 0x6b, 0x5b, 0xf3, 0x72, 0x1c, 0x2a,
-	0xe9, 0x83, 0xd6, 0xa1, 0x08, 0x66, 0xd0, 0x5b, 0xde, 0x4b, 0x6e, 0xe0, 0x2b, 0x2d, 0xc5, 0x84,
-	0x66, 0xfe, 0x4c, 0xd2, 0xd6, 0x9f, 0x56, 0x65, 0x45, 0x2f, 0xfe, 0x44, 0x78, 0x67, 0x11, 0x3f,
-	0xef, 0xdc, 0xb9, 0x5c, 0xe2, 0x26, 0xce, 0x1e, 0x19, 0x66, 0xd2, 0xe4, 0x3f, 0xa6, 0x45, 0x96,
-	0x85, 0x5e, 0xba, 0x87, 0xdc, 0xc3, 0x3b, 0x4d, 0xc1, 0x61, 0xf8, 0xa2, 0xd3, 0x08, 0x95, 0x36,
-	0xad, 0xe1, 0xfc, 0x6c, 0xe0, 0xb6, 0xad, 0x59, 0x6f, 0x1d, 0x26, 0x77, 0xf1, 0xf6, 0x1c, 0x3d,
-	0x65, 0xcb, 0xc6, 0x8c, 0x35, 0xae, 0xa1, 0xf5, 0xfb, 0xa3, 0x09, 0x75, 0xc6, 0x13, 0xea, 0x9c,
-	0x4e, 0x28, 0x7a, 0x97, 0x50, 0xf4, 0x39, 0xa1, 0xe8, 0x6b, 0x42, 0xd1, 0x28, 0xa1, 0x68, 0x9c,
-	0x50, 0xf4, 0x3d, 0xa1, 0xe8, 0x47, 0x42, 0x9d, 0xd3, 0x84, 0xa2, 0x4f, 0x53, 0xea, 0x8c, 0xa6,
-	0xd4, 0x19, 0x4f, 0xa9, 0xf3, 0x32, 0x6b, 0x7f, 0xe5, 0x76, 0xce, 0xbe, 0xe7, 0xf6, 0xaf, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0x83, 0xb1, 0x76, 0x7e, 0x1f, 0x04, 0x00, 0x00,
+	// 522 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x31, 0x6f, 0x13, 0x31,
+	0x1c, 0xc5, 0xcf, 0x90, 0x04, 0xe4, 0x12, 0x44, 0x2d, 0xda, 0x9e, 0x3a, 0x98, 0x28, 0x12, 0x52,
+	0x04, 0x24, 0x91, 0x02, 0x42, 0x48, 0x1d, 0x10, 0x81, 0x96, 0x46, 0x02, 0x51, 0x5d, 0xa3, 0x0e,
+	0x6c, 0xce, 0xf9, 0x9f, 0x8b, 0xc5, 0xe5, 0x1c, 0xd9, 0xbe, 0x28, 0x20, 0x06, 0x18, 0x18, 0xd8,
+	0xf8, 0x18, 0x88, 0x4f, 0xc2, 0x98, 0x31, 0x1b, 0xe4, 0xb2, 0x30, 0x76, 0x61, 0x47, 0xf1, 0x85,
+	0x83, 0x34, 0xcd, 0xd6, 0xe9, 0xec, 0xf7, 0xf3, 0xf3, 0xfb, 0x5b, 0x7a, 0x87, 0x8b, 0x9d, 0x50,
+	0xfa, 0x6f, 0x4e, 0x1a, 0xb5, 0x81, 0x92, 0x46, 0x92, 0xbc, 0xfd, 0xec, 0x56, 0x03, 0x61, 0x7a,
+	0x71, 0xa7, 0xe6, 0xcb, 0x7e, 0x3d, 0x90, 0x81, 0xac, 0x5b, 0xb9, 0x13, 0x77, 0xed, 0xce, 0x6e,
+	0xec, 0x2a, 0x75, 0xed, 0x6e, 0xd8, 0x4b, 0xd2, 0x4d, 0xf9, 0x73, 0x0e, 0x5f, 0x3d, 0x04, 0xc6,
+	0x41, 0x9d, 0x34, 0xc8, 0x6d, 0x5c, 0x48, 0xd7, 0x2e, 0x2a, 0xa1, 0xca, 0x46, 0xa3, 0x98, 0x1e,
+	0xaa, 0xa5, 0xa2, 0xb7, 0x80, 0xe4, 0x1e, 0xde, 0x3c, 0xf6, 0x7b, 0xc0, 0xe3, 0x10, 0xb8, 0x27,
+	0xa5, 0x39, 0x64, 0xba, 0xe7, 0x5e, 0x2a, 0xa1, 0xca, 0x35, 0x6f, 0x15, 0x90, 0x4f, 0x08, 0xbb,
+	0x99, 0xfa, 0xc4, 0xf7, 0xe3, 0x7e, 0x1c, 0x32, 0x03, 0xfc, 0x00, 0x40, 0xbb, 0x97, 0xe7, 0xae,
+	0x66, 0xeb, 0xdb, 0x8f, 0x5b, 0xfb, 0x7d, 0x66, 0x7a, 0xf5, 0x8e, 0x08, 0x6a, 0xad, 0xc8, 0xec,
+	0xfd, 0xf7, 0xa2, 0x7e, 0x1c, 0x1a, 0x31, 0x04, 0xa5, 0x47, 0xf5, 0xfe, 0xa8, 0xea, 0xf7, 0x98,
+	0x88, 0xaa, 0xbe, 0x54, 0x50, 0x0d, 0x64, 0x9d, 0x33, 0xc3, 0x6a, 0x4d, 0x11, 0xb4, 0x22, 0xf3,
+	0x94, 0x69, 0x03, 0xca, 0x5b, 0x1b, 0x45, 0x3e, 0x22, 0xbc, 0x9d, 0xc1, 0x67, 0x30, 0x84, 0x50,
+	0x0e, 0x40, 0xd9, 0x29, 0x72, 0x17, 0x3d, 0xc5, 0x9a, 0x20, 0xd2, 0xc0, 0x37, 0x33, 0xf2, 0x9c,
+	0xe9, 0x23, 0x25, 0x87, 0x82, 0x03, 0x77, 0xf3, 0x25, 0x54, 0xc9, 0x79, 0xe7, 0x32, 0xf2, 0x00,
+	0x6f, 0x2d, 0xe9, 0x10, 0xb1, 0x50, 0xbc, 0x03, 0xee, 0x16, 0xac, 0xe9, 0x7c, 0x78, 0x36, 0xc9,
+	0x83, 0x6e, 0x1c, 0xcd, 0x93, 0xae, 0xac, 0x26, 0xfd, 0x65, 0xe5, 0xf7, 0x78, 0xf3, 0xa5, 0x88,
+	0x44, 0x73, 0x5e, 0x0f, 0x0f, 0x34, 0xa8, 0x21, 0x70, 0xb2, 0x87, 0x8b, 0xfb, 0x23, 0xf0, 0x63,
+	0x23, 0x64, 0xd4, 0x7e, 0x3b, 0x00, 0x5b, 0x8d, 0xeb, 0x8d, 0xad, 0x45, 0x35, 0x8e, 0x94, 0xf4,
+	0x41, 0x6b, 0x11, 0x05, 0x73, 0xe8, 0x2d, 0x9f, 0x25, 0x77, 0xf0, 0x8d, 0xb6, 0x62, 0x91, 0x66,
+	0xfe, 0x5c, 0xd2, 0xd6, 0x9f, 0x16, 0x65, 0x45, 0x2f, 0xff, 0x46, 0x78, 0x27, 0x8b, 0x5f, 0x34,
+	0xee, 0x42, 0x86, 0xb8, 0x8b, 0xf3, 0xc7, 0x86, 0x99, 0x34, 0xf9, 0x9f, 0x29, 0xcb, 0xb2, 0xd0,
+	0x4b, 0xcf, 0x90, 0x47, 0x78, 0xa7, 0x15, 0x71, 0x18, 0xbd, 0xea, 0x1e, 0x08, 0xa5, 0x4d, 0x7b,
+	0xb4, 0xb8, 0x1b, 0xb8, 0xed, 0x6a, 0xde, 0x5b, 0x87, 0xc9, 0x43, 0xbc, 0xbd, 0x40, 0x2f, 0xd8,
+	0xb2, 0x31, 0x67, 0x8d, 0x6b, 0x68, 0xf3, 0xf1, 0x78, 0x4a, 0x9d, 0xc9, 0x94, 0x3a, 0xa7, 0x53,
+	0x8a, 0x3e, 0x24, 0x14, 0x7d, 0x4d, 0x28, 0xfa, 0x9e, 0x50, 0x34, 0x4e, 0x28, 0x9a, 0x24, 0x14,
+	0xfd, 0x4c, 0x28, 0xfa, 0x95, 0x50, 0xe7, 0x34, 0xa1, 0xe8, 0xcb, 0x8c, 0x3a, 0xe3, 0x19, 0x75,
+	0x26, 0x33, 0xea, 0xbc, 0xce, 0xdb, 0x1f, 0xb9, 0x53, 0xb0, 0xef, 0xb9, 0xff, 0x27, 0x00, 0x00,
+	0xff, 0xff, 0x86, 0xdd, 0xb3, 0x54, 0x1d, 0x04, 0x00, 0x00,
 }
 
 func (this *HeaderV2) Equal(that interface{}) bool {
@@ -297,13 +297,13 @@ func (this *HeaderV2) Equal(that interface{}) bool {
 		return false
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.ScheduledAccumulatedFees, that1.ScheduledAccumulatedFees) {
 			return false
 		}
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.ScheduledDeveloperFees, that1.ScheduledDeveloperFees) {
 			return false
 		}
@@ -465,7 +465,7 @@ func (m *HeaderV2) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		dAtA[i] = 0x28
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.ScheduledDeveloperFees)
 		i -= size
 		if _, err := __caster.MarshalTo(m.ScheduledDeveloperFees, dAtA[i:]); err != nil {
@@ -476,7 +476,7 @@ func (m *HeaderV2) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i--
 	dAtA[i] = 0x22
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.ScheduledAccumulatedFees)
 		i -= size
 		if _, err := __caster.MarshalTo(m.ScheduledAccumulatedFees, dAtA[i:]); err != nil {
@@ -612,12 +612,12 @@ func (m *HeaderV2) Size() (n int) {
 		n += 1 + l + sovBlockV2(uint64(l))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.ScheduledAccumulatedFees)
 		n += 1 + l + sovBlockV2(uint64(l))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.ScheduledDeveloperFees)
 		n += 1 + l + sovBlockV2(uint64(l))
 	}
@@ -853,7 +853,7 @@ func (m *HeaderV2) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
@@ -891,7 +891,7 @@ func (m *HeaderV2) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
diff --git a/data/block/blockV2.proto b/data/block/blockV2.proto
index 5d4b7b9c1..274f179cf 100644
--- a/data/block/blockV2.proto
+++ b/data/block/blockV2.proto
@@ -13,8 +13,8 @@ import "block.proto";
 message HeaderV2 {
   Header  Header = 1;
   bytes   ScheduledRootHash = 2;
-  bytes   ScheduledAccumulatedFees = 3 [(gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
-  bytes   ScheduledDeveloperFees = 4 [(gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
+  bytes   ScheduledAccumulatedFees = 3 [(gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
+  bytes   ScheduledDeveloperFees = 4 [(gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
   uint64  ScheduledGasProvided = 5;
   uint64  ScheduledGasPenalized = 6;
   uint64  ScheduledGasRefunded = 7;
diff --git a/data/block/blockV2_test.go b/data/block/blockV2_test.go
index 6503f92d1..a0e28f582 100644
--- a/data/block/blockV2_test.go
+++ b/data/block/blockV2_test.go
@@ -5,10 +5,10 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/data/block"
-	"github.com/ElrondNetwork/elrond-go-core/data/headerVersionData"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/block"
+	"github.com/multiversx/mx-chain-core-go/data/headerVersionData"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/data/block/block_test.go b/data/block/block_test.go
index fd86e1c16..980543b24 100644
--- a/data/block/block_test.go
+++ b/data/block/block_test.go
@@ -5,9 +5,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/data/block"
-	"github.com/ElrondNetwork/elrond-go-core/data/headerVersionData"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/block"
+	"github.com/multiversx/mx-chain-core-go/data/headerVersionData"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/data/block/economicsHandler.go b/data/block/economicsHandler.go
index d47ba1806..9f96a6185 100644
--- a/data/block/economicsHandler.go
+++ b/data/block/economicsHandler.go
@@ -3,7 +3,7 @@ package block
 import (
 	"math/big"
 
-	"github.com/ElrondNetwork/elrond-go-core/data"
+	"github.com/multiversx/mx-chain-core-go/data"
 )
 
 // SetTotalSupply sets the total supply
diff --git a/data/block/epochStartHandler.go b/data/block/epochStartHandler.go
index 5c5fde24b..a96fdc217 100644
--- a/data/block/epochStartHandler.go
+++ b/data/block/epochStartHandler.go
@@ -1,7 +1,7 @@
 package block
 
 import (
-	"github.com/ElrondNetwork/elrond-go-core/data"
+	"github.com/multiversx/mx-chain-core-go/data"
 )
 
 // GetLastFinalizedHeaderHandlers returns the last finalized header handlers
diff --git a/data/block/epochStartShardDataHandler.go b/data/block/epochStartShardDataHandler.go
index 0bc329193..5d3c5392a 100644
--- a/data/block/epochStartShardDataHandler.go
+++ b/data/block/epochStartShardDataHandler.go
@@ -1,6 +1,6 @@
 package block
 
-import "github.com/ElrondNetwork/elrond-go-core/data"
+import "github.com/multiversx/mx-chain-core-go/data"
 
 // GetPendingMiniBlockHeaderHandlers returns the pending miniBlock header handlers
 func (essd *EpochStartShardData) GetPendingMiniBlockHeaderHandlers() []data.MiniBlockHeaderHandler {
diff --git a/data/block/metaBlock.go b/data/block/metaBlock.go
index 041dc9010..3d78d5754 100644
--- a/data/block/metaBlock.go
+++ b/data/block/metaBlock.go
@@ -1,13 +1,13 @@
-//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/ElrondNetwork/protobuf/protobuf  --gogoslick_out=. metaBlock.proto
+//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/multiversx/protobuf/protobuf  --gogoslick_out=. metaBlock.proto
 package block
 
 import (
 	"math/big"
 	"sort"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/data/headerVersionData"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/headerVersionData"
 )
 
 // don't break the interface
diff --git a/data/block/metaBlock.pb.go b/data/block/metaBlock.pb.go
index bce26ae0a..a86de4855 100644
--- a/data/block/metaBlock.pb.go
+++ b/data/block/metaBlock.pb.go
@@ -6,9 +6,9 @@ package block
 import (
 	bytes "bytes"
 	fmt "fmt"
-	github_com_ElrondNetwork_elrond_go_core_data "github.com/ElrondNetwork/elrond-go-core/data"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
+	github_com_multiversx_mx_chain_core_go_data "github.com/multiversx/mx-chain-core-go/data"
 	io "io"
 	math "math"
 	math_big "math/big"
@@ -77,7 +77,7 @@ type PeerData struct {
 	PublicKey   []byte        `protobuf:"bytes,2,opt,name=PublicKey,proto3" json:"PublicKey,omitempty"`
 	Action      PeerAction    `protobuf:"varint,3,opt,name=Action,proto3,enum=proto.PeerAction" json:"Action,omitempty"`
 	TimeStamp   uint64        `protobuf:"varint,4,opt,name=TimeStamp,proto3" json:"TimeStamp,omitempty"`
-	ValueChange *math_big.Int `protobuf:"bytes,5,opt,name=ValueChange,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"ValueChange,omitempty"`
+	ValueChange *math_big.Int `protobuf:"bytes,5,opt,name=ValueChange,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"ValueChange,omitempty"`
 }
 
 func (m *PeerData) Reset()      { *m = PeerData{} }
@@ -153,8 +153,8 @@ type ShardData struct {
 	Round                 uint64            `protobuf:"varint,8,opt,name=Round,proto3" json:"Round,omitempty"`
 	PrevHash              []byte            `protobuf:"bytes,9,opt,name=PrevHash,proto3" json:"PrevHash,omitempty"`
 	Nonce                 uint64            `protobuf:"varint,10,opt,name=Nonce,proto3" json:"Nonce,omitempty"`
-	AccumulatedFees       *math_big.Int     `protobuf:"bytes,12,opt,name=AccumulatedFees,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"AccumulatedFees,omitempty"`
-	DeveloperFees         *math_big.Int     `protobuf:"bytes,14,opt,name=DeveloperFees,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"DeveloperFees,omitempty"`
+	AccumulatedFees       *math_big.Int     `protobuf:"bytes,12,opt,name=AccumulatedFees,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"AccumulatedFees,omitempty"`
+	DeveloperFees         *math_big.Int     `protobuf:"bytes,14,opt,name=DeveloperFees,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"DeveloperFees,omitempty"`
 	NumPendingMiniBlocks  uint32            `protobuf:"varint,11,opt,name=NumPendingMiniBlocks,proto3" json:"NumPendingMiniBlocks,omitempty"`
 	LastIncludedMetaNonce uint64            `protobuf:"varint,13,opt,name=LastIncludedMetaNonce,proto3" json:"LastIncludedMetaNonce,omitempty"`
 	ShardID               uint32            `protobuf:"varint,1,opt,name=ShardID,proto3" json:"ShardID,omitempty"`
@@ -401,12 +401,12 @@ func (m *EpochStartShardData) GetPendingMiniBlockHeaders() []MiniBlockHeader {
 
 // Economics holds the block information for total supply and rewards
 type Economics struct {
-	TotalSupply                      *math_big.Int `protobuf:"bytes,1,opt,name=TotalSupply,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"TotalSupply,omitempty"`
-	TotalToDistribute                *math_big.Int `protobuf:"bytes,2,opt,name=TotalToDistribute,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"TotalToDistribute,omitempty"`
-	TotalNewlyMinted                 *math_big.Int `protobuf:"bytes,3,opt,name=TotalNewlyMinted,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"TotalNewlyMinted,omitempty"`
-	RewardsPerBlock                  *math_big.Int `protobuf:"bytes,4,opt,name=RewardsPerBlock,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"RewardsPerBlock,omitempty"`
-	RewardsForProtocolSustainability *math_big.Int `protobuf:"bytes,5,opt,name=RewardsForProtocolSustainability,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"RewardsForProtocolSustainability,omitempty"`
-	NodePrice                        *math_big.Int `protobuf:"bytes,6,opt,name=NodePrice,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"NodePrice,omitempty"`
+	TotalSupply                      *math_big.Int `protobuf:"bytes,1,opt,name=TotalSupply,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"TotalSupply,omitempty"`
+	TotalToDistribute                *math_big.Int `protobuf:"bytes,2,opt,name=TotalToDistribute,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"TotalToDistribute,omitempty"`
+	TotalNewlyMinted                 *math_big.Int `protobuf:"bytes,3,opt,name=TotalNewlyMinted,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"TotalNewlyMinted,omitempty"`
+	RewardsPerBlock                  *math_big.Int `protobuf:"bytes,4,opt,name=RewardsPerBlock,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"RewardsPerBlock,omitempty"`
+	RewardsForProtocolSustainability *math_big.Int `protobuf:"bytes,5,opt,name=RewardsForProtocolSustainability,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"RewardsForProtocolSustainability,omitempty"`
+	NodePrice                        *math_big.Int `protobuf:"bytes,6,opt,name=NodePrice,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"NodePrice,omitempty"`
 	PrevEpochStartRound              uint64        `protobuf:"varint,7,opt,name=PrevEpochStartRound,proto3" json:"PrevEpochStartRound,omitempty"`
 	PrevEpochStartHash               []byte        `protobuf:"bytes,8,opt,name=PrevEpochStartHash,proto3" json:"PrevEpochStartHash,omitempty"`
 }
@@ -564,10 +564,10 @@ type MetaBlock struct {
 	EpochStart             EpochStart        `protobuf:"bytes,18,opt,name=EpochStart,proto3" json:"EpochStart"`
 	ChainID                []byte            `protobuf:"bytes,19,opt,name=ChainID,proto3" json:"ChainID,omitempty"`
 	SoftwareVersion        []byte            `protobuf:"bytes,20,opt,name=SoftwareVersion,proto3" json:"SoftwareVersion,omitempty"`
-	AccumulatedFees        *math_big.Int     `protobuf:"bytes,21,opt,name=AccumulatedFees,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"AccumulatedFees,omitempty"`
-	AccumulatedFeesInEpoch *math_big.Int     `protobuf:"bytes,22,opt,name=AccumulatedFeesInEpoch,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"AccumulatedFeesInEpoch,omitempty"`
-	DeveloperFees          *math_big.Int     `protobuf:"bytes,23,opt,name=DeveloperFees,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"DeveloperFees,omitempty"`
-	DevFeesInEpoch         *math_big.Int     `protobuf:"bytes,24,opt,name=DevFeesInEpoch,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"DevFeesInEpoch,omitempty"`
+	AccumulatedFees        *math_big.Int     `protobuf:"bytes,21,opt,name=AccumulatedFees,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"AccumulatedFees,omitempty"`
+	AccumulatedFeesInEpoch *math_big.Int     `protobuf:"bytes,22,opt,name=AccumulatedFeesInEpoch,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"AccumulatedFeesInEpoch,omitempty"`
+	DeveloperFees          *math_big.Int     `protobuf:"bytes,23,opt,name=DeveloperFees,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"DeveloperFees,omitempty"`
+	DevFeesInEpoch         *math_big.Int     `protobuf:"bytes,24,opt,name=DevFeesInEpoch,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"DevFeesInEpoch,omitempty"`
 	TxCount                uint32            `protobuf:"varint,25,opt,name=TxCount,proto3" json:"TxCount,omitempty"`
 	Reserved               []byte            `protobuf:"bytes,26,opt,name=Reserved,proto3" json:"Reserved,omitempty"`
 }
@@ -788,88 +788,87 @@ func init() {
 func init() { proto.RegisterFile("metaBlock.proto", fileDescriptor_87b91ab531130b2b) }
 
 var fileDescriptor_87b91ab531130b2b = []byte{
-	// 1281 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xbf, 0x6f, 0xdb, 0xc6,
-	0x17, 0x17, 0x23, 0xcb, 0xb6, 0x9e, 0x2c, 0x9b, 0xbe, 0x38, 0x0e, 0xbf, 0xc6, 0x17, 0x8c, 0x21,
-	0x74, 0x70, 0x8b, 0xc6, 0x6e, 0xdd, 0xa0, 0x1d, 0x3a, 0x14, 0xb1, 0x1d, 0x23, 0xca, 0x0f, 0x43,
-	0xa0, 0x5c, 0x0f, 0xdd, 0x4e, 0xe4, 0x8b, 0x74, 0x30, 0xc5, 0x13, 0x8e, 0x47, 0x3b, 0xee, 0x54,
-	0xf4, 0x2f, 0xe8, 0x54, 0x74, 0xeb, 0xd2, 0xa1, 0xe8, 0xde, 0x7f, 0xa1, 0xc8, 0x98, 0x31, 0x53,
-	0xdb, 0x28, 0x4b, 0xc7, 0x0c, 0x5d, 0xba, 0x15, 0xbc, 0x23, 0x45, 0x9a, 0xa2, 0x9b, 0x0c, 0xca,
-	0x64, 0xbf, 0xcf, 0x7b, 0xef, 0x9e, 0xee, 0xfd, 0xba, 0x0f, 0x61, 0x65, 0x88, 0x92, 0xee, 0xf9,
-	0xdc, 0x3d, 0xdd, 0x1e, 0x09, 0x2e, 0x39, 0xa9, 0xa9, 0x3f, 0x1b, 0xb7, 0xfb, 0x4c, 0x0e, 0xa2,
-	0xde, 0xb6, 0xcb, 0x87, 0x3b, 0x7d, 0xde, 0xe7, 0x3b, 0x0a, 0xee, 0x45, 0x4f, 0x94, 0xa4, 0x04,
-	0xf5, 0x9f, 0xf6, 0xda, 0x68, 0xf4, 0xb2, 0x23, 0x5a, 0xff, 0x18, 0xb0, 0xd8, 0x41, 0x14, 0x07,
-	0x54, 0x52, 0x62, 0xc1, 0xc2, 0x5d, 0xcf, 0x13, 0x18, 0x86, 0x96, 0xb1, 0x69, 0x6c, 0x2d, 0x39,
-	0xa9, 0x48, 0xfe, 0x0f, 0xf5, 0x4e, 0xd4, 0xf3, 0x99, 0xfb, 0x10, 0x2f, 0xac, 0x6b, 0x4a, 0x97,
-	0x01, 0xe4, 0x7d, 0x98, 0xbf, 0xeb, 0x4a, 0xc6, 0x03, 0xab, 0xba, 0x69, 0x6c, 0x2d, 0xef, 0xae,
-	0xea, 0xc3, 0xb7, 0xe3, 0x83, 0xb5, 0xc2, 0x49, 0x0c, 0xe2, 0x83, 0x8e, 0xd9, 0x10, 0xbb, 0x92,
-	0x0e, 0x47, 0xd6, 0xdc, 0xa6, 0xb1, 0x35, 0xe7, 0x64, 0x00, 0xf1, 0xa1, 0x71, 0x42, 0xfd, 0x08,
-	0xf7, 0x07, 0x34, 0xe8, 0xa3, 0x55, 0x8b, 0x03, 0xed, 0x3d, 0xf8, 0xe5, 0x8f, 0x5b, 0x87, 0x43,
-	0x2a, 0x07, 0x3b, 0x3d, 0xd6, 0xdf, 0x6e, 0x07, 0xf2, 0xf3, 0xdc, 0x7d, 0xef, 0xf9, 0x82, 0x07,
-	0xde, 0x11, 0xca, 0x73, 0x2e, 0x4e, 0x77, 0x50, 0x49, 0xb7, 0xfb, 0xfc, 0xb6, 0xcb, 0x05, 0xee,
-	0x78, 0x54, 0xd2, 0xed, 0x3d, 0xd6, 0x6f, 0x07, 0x72, 0x9f, 0x86, 0x12, 0x85, 0x93, 0x3f, 0xbe,
-	0xf5, 0x6b, 0x0d, 0xea, 0xdd, 0x01, 0x15, 0x9e, 0xba, 0xbc, 0x0d, 0x70, 0x1f, 0xa9, 0x87, 0xe2,
-	0x3e, 0x0d, 0x07, 0xc9, 0x1d, 0x73, 0x08, 0x71, 0xe0, 0x86, 0x32, 0x7e, 0xcc, 0x02, 0xa6, 0x8a,
-	0xa0, 0x75, 0xa1, 0x55, 0xdd, 0xac, 0x6e, 0x35, 0x76, 0xd7, 0x93, 0x3b, 0x17, 0xd4, 0x7b, 0x73,
-	0xcf, 0x7e, 0xbf, 0x55, 0x71, 0xca, 0x5d, 0x49, 0x0b, 0x96, 0x3a, 0x02, 0xcf, 0x1c, 0x1a, 0x78,
-	0x5d, 0x44, 0x4f, 0x25, 0x64, 0xc9, 0xb9, 0x84, 0x91, 0xf7, 0xa0, 0xd9, 0x89, 0x7a, 0x0f, 0xf1,
-	0x22, 0xdc, 0x63, 0x72, 0x48, 0x47, 0x3a, 0x2b, 0xce, 0x65, 0x30, 0xce, 0x6b, 0x97, 0xf5, 0x03,
-	0x2a, 0x23, 0x81, 0xd6, 0xbc, 0x2e, 0xd0, 0x04, 0x20, 0x6b, 0x50, 0x73, 0x78, 0x14, 0x78, 0xd6,
-	0xa2, 0xca, 0xb8, 0x16, 0xc8, 0x06, 0x2c, 0xc6, 0x91, 0xd4, 0x7d, 0xeb, 0xca, 0x65, 0x22, 0xc7,
-	0x1e, 0x47, 0x3c, 0x70, 0xd1, 0x02, 0xed, 0xa1, 0x04, 0x22, 0x61, 0xe5, 0xae, 0xeb, 0x46, 0xc3,
-	0xc8, 0xa7, 0x12, 0xbd, 0x43, 0xc4, 0xd0, 0x5a, 0x9a, 0x79, 0x8d, 0x8a, 0x21, 0xc8, 0x08, 0x9a,
-	0x07, 0x78, 0x86, 0x3e, 0x1f, 0xa1, 0x50, 0x31, 0x97, 0x67, 0x1e, 0xf3, 0x72, 0x00, 0xb2, 0x0b,
-	0x6b, 0x47, 0xd1, 0xb0, 0x83, 0x81, 0xc7, 0x82, 0xfe, 0xa4, 0x6a, 0xa1, 0xd5, 0xd8, 0x34, 0xb6,
-	0x9a, 0x4e, 0xa9, 0x8e, 0xdc, 0x81, 0x1b, 0x8f, 0x68, 0x28, 0xdb, 0x81, 0xeb, 0x47, 0x1e, 0x7a,
-	0x8f, 0x51, 0x52, 0x9d, 0xc1, 0xa6, 0xca, 0x60, 0xb9, 0x32, 0x1e, 0x39, 0xd5, 0x1a, 0xed, 0x03,
-	0x35, 0x72, 0x4d, 0x27, 0x15, 0x63, 0xcd, 0xf1, 0xd3, 0x7d, 0x1e, 0x05, 0xd2, 0x5a, 0xd0, 0x9a,
-	0x44, 0x6c, 0xfd, 0x58, 0x85, 0xeb, 0xf7, 0x46, 0xdc, 0x1d, 0x74, 0x25, 0x15, 0x32, 0xeb, 0xe0,
-	0xab, 0xcf, 0x5a, 0x83, 0x9a, 0x72, 0x50, 0x65, 0x6e, 0x3a, 0x5a, 0xc8, 0xba, 0x62, 0x21, 0xdf,
-	0x15, 0x93, 0xca, 0x2f, 0xe6, 0x2b, 0xff, 0xa6, 0xe9, 0xd8, 0x80, 0x45, 0x87, 0x73, 0xa9, 0xb4,
-	0x55, 0xdd, 0x4b, 0xa9, 0x4c, 0x3e, 0x84, 0xd5, 0xae, 0x3b, 0x40, 0x2f, 0xf2, 0xd1, 0x9b, 0x18,
-	0x81, 0x32, 0x9a, 0x56, 0xc4, 0x79, 0x3c, 0x64, 0x22, 0x94, 0x69, 0x86, 0xd3, 0x9d, 0x97, 0x0c,
-	0x47, 0xb9, 0x32, 0xcd, 0xfe, 0x21, 0x0b, 0x58, 0x38, 0xd0, 0x09, 0xd6, 0x5e, 0x7a, 0x5a, 0xca,
-	0x95, 0xe4, 0x04, 0x6e, 0x16, 0x0b, 0x99, 0x4e, 0xf5, 0xfc, 0x5b, 0x4c, 0xf5, 0x55, 0xce, 0xad,
-	0xdf, 0xe6, 0xa1, 0x7e, 0xcf, 0xe5, 0x01, 0x1f, 0x32, 0x37, 0x8c, 0xb7, 0xda, 0x31, 0x97, 0xd4,
-	0xef, 0x46, 0xa3, 0x91, 0x7f, 0xa1, 0x57, 0xeb, 0x6c, 0xb7, 0x5a, 0xee, 0x78, 0xf2, 0x14, 0x56,
-	0x95, 0x78, 0xcc, 0x0f, 0x58, 0x28, 0x05, 0xeb, 0x45, 0x12, 0x75, 0xc1, 0x66, 0x1a, 0x73, 0x3a,
-	0x08, 0x39, 0x03, 0x53, 0x81, 0x47, 0x78, 0xee, 0x5f, 0x3c, 0x66, 0x81, 0x44, 0x4f, 0xf7, 0xc2,
-	0x4c, 0x03, 0x4f, 0xc5, 0x88, 0xb7, 0x92, 0x83, 0xe7, 0x54, 0x78, 0x61, 0x07, 0x45, 0xae, 0x57,
-	0x66, 0xbb, 0x95, 0x0a, 0x21, 0xc8, 0xf7, 0x06, 0x6c, 0x26, 0xd8, 0x21, 0x17, 0x9d, 0xb8, 0x4d,
-	0x5c, 0xee, 0x77, 0xa3, 0x50, 0x52, 0x16, 0xd0, 0x1e, 0xf3, 0x99, 0xbc, 0x78, 0x07, 0x2f, 0xd8,
-	0x1b, 0x63, 0x92, 0x01, 0xd4, 0x8f, 0xb8, 0x87, 0x1d, 0xc1, 0xdc, 0xe4, 0x29, 0x98, 0xe9, 0x0f,
-	0xc8, 0x0e, 0x27, 0x1f, 0xc1, 0xf5, 0xf8, 0xc1, 0xc8, 0x76, 0x51, 0x7e, 0x9d, 0x94, 0xa9, 0xc8,
-	0x36, 0x90, 0xcb, 0xb0, 0xda, 0x05, 0x8b, 0x6a, 0x46, 0x4b, 0x34, 0xad, 0x1f, 0x0c, 0x80, 0x0c,
-	0x22, 0xc7, 0xb0, 0x96, 0x0c, 0x32, 0xf5, 0xd9, 0xd7, 0xe8, 0xa5, 0xc3, 0x6a, 0xa8, 0x61, 0xdd,
-	0x48, 0x86, 0xb5, 0x64, 0x37, 0x26, 0x03, 0x5b, 0xea, 0x4d, 0xee, 0xe4, 0x86, 0x55, 0x4d, 0x4a,
-	0x63, 0xd7, 0x4c, 0x8f, 0x4a, 0xf1, 0xe4, 0x80, 0xcc, 0xb0, 0xf5, 0x77, 0x1d, 0xea, 0xd9, 0x26,
-	0x99, 0x6c, 0x4d, 0x23, 0xbf, 0x35, 0x27, 0x7b, 0xf7, 0x5a, 0xe9, 0xde, 0xad, 0xe6, 0xf7, 0xee,
-	0x7f, 0x33, 0xa3, 0x3b, 0x09, 0x55, 0x69, 0x07, 0x4f, 0xb8, 0x55, 0x53, 0xd7, 0x4d, 0x7f, 0x63,
-	0xf1, 0x92, 0x99, 0x21, 0xf9, 0x58, 0x93, 0x3b, 0xe5, 0xa4, 0x17, 0xda, 0x4a, 0x8e, 0x9a, 0xe5,
-	0x7c, 0x26, 0x66, 0x97, 0x89, 0xc4, 0x42, 0x91, 0x48, 0x6c, 0xc1, 0xca, 0x23, 0x95, 0xb5, 0xcc,
-	0x46, 0x17, 0xaf, 0x08, 0x4f, 0xd3, 0x96, 0x7a, 0x19, 0x6d, 0xc9, 0x53, 0x10, 0x28, 0x50, 0x90,
-	0x22, 0x39, 0x6a, 0x94, 0x90, 0xa3, 0xf8, 0xd9, 0x49, 0xf5, 0x4b, 0xc9, 0xb3, 0x93, 0xd7, 0xa5,
-	0xaf, 0x4d, 0xb3, 0xf0, 0x24, 0x7d, 0x0a, 0xeb, 0x27, 0xd4, 0x67, 0x1e, 0x95, 0x5c, 0x74, 0x25,
-	0x95, 0xe1, 0xc4, 0x52, 0x71, 0x0b, 0xe7, 0x0a, 0x2d, 0xb9, 0x0f, 0xe6, 0xd4, 0x4b, 0x61, 0xbe,
-	0xc5, 0x4b, 0x61, 0x96, 0x51, 0x3f, 0x07, 0x5d, 0x64, 0x23, 0x19, 0xaa, 0xb8, 0xab, 0xfa, 0x76,
-	0x79, 0x8c, 0x7c, 0x96, 0x6f, 0x7e, 0x8b, 0xa8, 0xce, 0x5c, 0x9d, 0x6a, 0xf2, 0x24, 0x44, 0x7e,
-	0x4e, 0x2c, 0x58, 0xd8, 0x1f, 0x50, 0x16, 0xb4, 0x0f, 0xac, 0xeb, 0x9a, 0xc8, 0x27, 0x62, 0x5c,
-	0xc0, 0x2e, 0x7f, 0x22, 0xcf, 0xa9, 0xc0, 0x13, 0x14, 0x61, 0xcc, 0xd9, 0xd7, 0x74, 0x01, 0x0b,
-	0x70, 0x19, 0xd7, 0xbb, 0xf1, 0xee, 0xb9, 0xde, 0xb7, 0x06, 0xac, 0x17, 0xb0, 0x76, 0xa0, 0x67,
-	0x68, 0x7d, 0xe6, 0xd1, 0xaf, 0x88, 0x34, 0x4d, 0x38, 0x6f, 0xbe, 0x6b, 0xc2, 0x29, 0x60, 0xf9,
-	0x00, 0xcf, 0xf2, 0xb7, 0xb5, 0x66, 0x1e, 0xb2, 0x10, 0x21, 0x4f, 0x30, 0xff, 0x77, 0x89, 0x60,
-	0xaa, 0xc9, 0xc1, 0x10, 0xc5, 0x19, 0x7a, 0xd6, 0x46, 0x32, 0x39, 0x89, 0xfc, 0xc1, 0x4f, 0x06,
-	0x40, 0xf6, 0x5d, 0x47, 0x56, 0xa1, 0xd9, 0x0e, 0xce, 0xe2, 0x61, 0xd1, 0x80, 0x59, 0x21, 0x6b,
-	0x60, 0xc6, 0x06, 0x0e, 0xf6, 0x63, 0x6a, 0x40, 0x15, 0x6a, 0xc4, 0x86, 0x31, 0xfa, 0x65, 0x10,
-	0x4a, 0x7a, 0xca, 0x82, 0xbe, 0x79, 0x8d, 0xac, 0x03, 0x51, 0x6b, 0x08, 0x45, 0xde, 0xb4, 0x4a,
-	0x96, 0x75, 0x84, 0x07, 0x94, 0xf9, 0xe8, 0x99, 0x73, 0xc4, 0x84, 0x25, 0xed, 0x9a, 0x20, 0x35,
-	0xb2, 0x02, 0x8d, 0x18, 0xe9, 0xfa, 0x34, 0xe6, 0x73, 0xe6, 0x7c, 0x0a, 0x38, 0xf1, 0xb6, 0x3c,
-	0x45, 0x73, 0x61, 0xef, 0x8b, 0xe7, 0x2f, 0xed, 0xca, 0x8b, 0x97, 0x76, 0xe5, 0xf5, 0x4b, 0xdb,
-	0xf8, 0x66, 0x6c, 0x1b, 0x3f, 0x8f, 0x6d, 0xe3, 0xd9, 0xd8, 0x36, 0x9e, 0x8f, 0x6d, 0xe3, 0xc5,
-	0xd8, 0x36, 0xfe, 0x1c, 0xdb, 0xc6, 0x5f, 0x63, 0xbb, 0xf2, 0x7a, 0x6c, 0x1b, 0xdf, 0xbd, 0xb2,
-	0x2b, 0xcf, 0x5f, 0xd9, 0x95, 0x17, 0xaf, 0xec, 0xca, 0x57, 0x35, 0xf5, 0x79, 0xdc, 0x9b, 0x57,
-	0x63, 0xf6, 0xc9, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x10, 0x9d, 0x19, 0x75, 0x0f, 0x00,
-	0x00,
+	// 1280 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x31, 0x73, 0x1b, 0x45,
+	0x14, 0xd6, 0x45, 0x96, 0x6d, 0x3d, 0x59, 0xb6, 0xbc, 0x71, 0x9c, 0xc3, 0xc3, 0x5c, 0x3c, 0x1a,
+	0x0a, 0xc3, 0x60, 0x1b, 0x4c, 0x06, 0x0a, 0x0a, 0x26, 0xb6, 0xe3, 0x89, 0x48, 0xe2, 0xd1, 0x9c,
+	0x8c, 0x0b, 0xba, 0xd5, 0xdd, 0x8b, 0xb4, 0xe3, 0xd3, 0xad, 0xb8, 0xdb, 0xb3, 0x63, 0x2a, 0xf8,
+	0x07, 0x34, 0xcc, 0xd0, 0xd1, 0x50, 0x30, 0xb4, 0xfc, 0x01, 0xca, 0x94, 0x29, 0x53, 0x01, 0x51,
+	0x1a, 0x4a, 0x97, 0x94, 0xcc, 0xee, 0xde, 0xe9, 0x4e, 0xa7, 0x33, 0x49, 0xa1, 0x54, 0xf6, 0xfb,
+	0xde, 0x7b, 0xfb, 0xb4, 0xfb, 0xf6, 0x7b, 0xfb, 0x1d, 0xac, 0x0c, 0x50, 0xd0, 0x7d, 0x8f, 0x3b,
+	0x67, 0x3b, 0xc3, 0x80, 0x0b, 0x4e, 0x2a, 0xea, 0xcf, 0xc6, 0x76, 0x8f, 0x89, 0x7e, 0xd4, 0xdd,
+	0x71, 0xf8, 0x60, 0xb7, 0xc7, 0x7b, 0x7c, 0x57, 0xc1, 0xdd, 0xe8, 0x89, 0xb2, 0x94, 0xa1, 0xfe,
+	0xd3, 0x59, 0x1b, 0xb5, 0x6e, 0xba, 0x44, 0xf3, 0x5f, 0x03, 0x16, 0xdb, 0x88, 0xc1, 0x21, 0x15,
+	0x94, 0x98, 0xb0, 0x70, 0xcf, 0x75, 0x03, 0x0c, 0x43, 0xd3, 0xd8, 0x34, 0xb6, 0x96, 0xec, 0xc4,
+	0x24, 0xef, 0x42, 0xb5, 0x1d, 0x75, 0x3d, 0xe6, 0x3c, 0xc4, 0x4b, 0xf3, 0x86, 0xf2, 0xa5, 0x00,
+	0x79, 0x1f, 0xe6, 0xef, 0x39, 0x82, 0x71, 0xdf, 0x2c, 0x6f, 0x1a, 0x5b, 0xcb, 0x7b, 0xab, 0x7a,
+	0xf1, 0x1d, 0xb9, 0xb0, 0x76, 0xd8, 0x71, 0x80, 0x5c, 0xe8, 0x84, 0x0d, 0xb0, 0x23, 0xe8, 0x60,
+	0x68, 0xce, 0x6d, 0x1a, 0x5b, 0x73, 0x76, 0x0a, 0x90, 0x33, 0xa8, 0x9d, 0x52, 0x2f, 0xc2, 0x83,
+	0x3e, 0xf5, 0x7b, 0x68, 0x56, 0x64, 0xa1, 0xfd, 0xd6, 0x6f, 0x7f, 0xdd, 0xb9, 0x3f, 0xa0, 0xa2,
+	0xbf, 0xdb, 0x65, 0xbd, 0x9d, 0x96, 0x2f, 0x3e, 0xcf, 0xec, 0x77, 0x10, 0x79, 0x82, 0x9d, 0x63,
+	0x10, 0x3e, 0xdd, 0x1d, 0x3c, 0xdd, 0x76, 0xfa, 0x94, 0xf9, 0xdb, 0x0e, 0x0f, 0x70, 0xbb, 0xc7,
+	0x77, 0x5d, 0x2a, 0xe8, 0xce, 0x3e, 0xeb, 0xb5, 0x7c, 0x71, 0x40, 0x43, 0x81, 0x81, 0x9d, 0x5d,
+	0xbd, 0xf9, 0x7b, 0x05, 0xaa, 0x9d, 0x3e, 0x0d, 0x5c, 0xb5, 0x77, 0x0b, 0xe0, 0x01, 0x52, 0x17,
+	0x83, 0x07, 0x34, 0xec, 0xc7, 0x5b, 0xcc, 0x20, 0xc4, 0x86, 0x5b, 0x2a, 0xf8, 0x31, 0xf3, 0x99,
+	0xea, 0x81, 0xf6, 0x85, 0x66, 0x79, 0xb3, 0xbc, 0x55, 0xdb, 0x5b, 0x8f, 0xb7, 0x9c, 0x73, 0xef,
+	0xcf, 0x3d, 0xfb, 0xf3, 0x4e, 0xc9, 0x2e, 0x4e, 0x25, 0x4d, 0x58, 0x6a, 0x07, 0x78, 0x6e, 0x53,
+	0xdf, 0xed, 0x20, 0xba, 0xea, 0x3c, 0x96, 0xec, 0x09, 0x8c, 0xbc, 0x07, 0xf5, 0x76, 0xd4, 0x7d,
+	0x88, 0x97, 0xe1, 0x3e, 0x13, 0x03, 0x3a, 0xd4, 0x87, 0x62, 0x4f, 0x82, 0xf2, 0x58, 0x3b, 0xac,
+	0xe7, 0x53, 0x11, 0x05, 0x68, 0xce, 0xeb, 0xfe, 0x8c, 0x01, 0xb2, 0x06, 0x15, 0x9b, 0x47, 0xbe,
+	0x6b, 0x2e, 0xaa, 0x03, 0xd7, 0x06, 0xd9, 0x80, 0x45, 0x59, 0x49, 0xed, 0xb7, 0xaa, 0x52, 0xc6,
+	0xb6, 0xcc, 0x38, 0xe6, 0xbe, 0x83, 0x26, 0xe8, 0x0c, 0x65, 0x90, 0x10, 0x56, 0xee, 0x39, 0x4e,
+	0x34, 0x88, 0x3c, 0x2a, 0xd0, 0x3d, 0x42, 0x0c, 0xcd, 0xa5, 0x59, 0xb7, 0x28, 0x5f, 0x81, 0x70,
+	0xa8, 0x1f, 0xe2, 0x39, 0x7a, 0x7c, 0x88, 0x81, 0x2a, 0xb9, 0x3c, 0xeb, 0x92, 0x93, 0xeb, 0x93,
+	0x3d, 0x58, 0x3b, 0x8e, 0x06, 0x6d, 0xf4, 0x5d, 0xe6, 0xf7, 0xc6, 0x3d, 0x0b, 0xcd, 0xda, 0xa6,
+	0xb1, 0x55, 0xb7, 0x0b, 0x7d, 0xe4, 0x2e, 0xdc, 0x7a, 0x44, 0x43, 0xd1, 0xf2, 0x1d, 0x2f, 0x72,
+	0xd1, 0x7d, 0x8c, 0x82, 0xea, 0xf3, 0xab, 0xab, 0xf3, 0x2b, 0x76, 0x4a, 0xbe, 0xa9, 0x8b, 0xd1,
+	0x3a, 0x54, 0x7c, 0xab, 0xdb, 0x89, 0x29, 0x3d, 0x27, 0x4f, 0x0f, 0x78, 0xe4, 0x0b, 0x73, 0x41,
+	0x7b, 0x62, 0xb3, 0xf9, 0x73, 0x19, 0x6e, 0xde, 0x1f, 0x72, 0xa7, 0xdf, 0x11, 0x34, 0x10, 0xe9,
+	0xfd, 0xbd, 0x7e, 0xad, 0x35, 0xa8, 0xa8, 0x04, 0xd5, 0xe4, 0xba, 0xad, 0x8d, 0xf4, 0x4e, 0x2c,
+	0x64, 0xef, 0xc4, 0xb8, 0xef, 0x8b, 0xd9, 0xbe, 0xbf, 0x8e, 0x1b, 0x1b, 0xb0, 0x68, 0x73, 0x2e,
+	0x94, 0xb7, 0xac, 0x6f, 0x52, 0x62, 0x93, 0x0f, 0x61, 0xb5, 0xe3, 0xf4, 0xd1, 0x8d, 0x3c, 0x74,
+	0xc7, 0x41, 0xa0, 0x82, 0xa6, 0x1d, 0xf2, 0x1c, 0x8f, 0x58, 0x10, 0x8a, 0xe4, 0x84, 0x93, 0x81,
+	0x17, 0x53, 0xa3, 0xd8, 0x99, 0x9c, 0xfe, 0x11, 0xf3, 0x59, 0xd8, 0xd7, 0x07, 0xac, 0xb3, 0x34,
+	0x57, 0x8a, 0x9d, 0xe4, 0x14, 0x6e, 0xe7, 0x1b, 0x99, 0x70, 0x7a, 0xfe, 0x0d, 0x38, 0x7d, 0x5d,
+	0x72, 0xf3, 0x8f, 0x79, 0xa8, 0xde, 0x77, 0xb8, 0xcf, 0x07, 0xcc, 0x09, 0xe5, 0x48, 0x3b, 0xe1,
+	0x82, 0x7a, 0x9d, 0x68, 0x38, 0xf4, 0x2e, 0xf5, 0x5c, 0x9d, 0xe9, 0x48, 0xcb, 0xac, 0x4e, 0x2e,
+	0x60, 0x55, 0x99, 0x27, 0xfc, 0x90, 0x85, 0x22, 0x60, 0xdd, 0x48, 0xa0, 0xee, 0xd7, 0x2c, 0x4b,
+	0x4e, 0xd7, 0x20, 0x11, 0x34, 0x14, 0x78, 0x8c, 0x17, 0xde, 0xe5, 0x63, 0xe6, 0x0b, 0x74, 0xf5,
+	0x4d, 0x98, 0x65, 0xdd, 0xa9, 0x12, 0x72, 0x20, 0xd9, 0x78, 0x41, 0x03, 0x37, 0x6c, 0x63, 0x90,
+	0xb9, 0x28, 0x33, 0x1d, 0x48, 0xb9, 0x0a, 0xe4, 0x47, 0x03, 0x36, 0x63, 0xec, 0x88, 0x07, 0x6d,
+	0x79, 0x45, 0x1c, 0xee, 0x75, 0xa2, 0x50, 0x50, 0xe6, 0xd3, 0x2e, 0xf3, 0x98, 0xb8, 0x9c, 0xfd,
+	0xd3, 0xf5, 0xda, 0x92, 0xa4, 0x07, 0xd5, 0x63, 0xee, 0x62, 0x3b, 0x60, 0x4e, 0xfc, 0x06, 0xcc,
+	0xb2, 0x7e, 0xba, 0x36, 0xf9, 0x08, 0x6e, 0xca, 0x87, 0x22, 0x9d, 0x42, 0xd9, 0x41, 0x52, 0xe4,
+	0x22, 0x3b, 0x40, 0x26, 0x61, 0x35, 0x05, 0x16, 0x15, 0x3b, 0x0b, 0x3c, 0xcd, 0x9f, 0x0c, 0x80,
+	0x14, 0x22, 0x27, 0xb0, 0x16, 0x53, 0x98, 0x7a, 0xec, 0x5b, 0x74, 0x13, 0x9a, 0x1a, 0x8a, 0xa6,
+	0x1b, 0x31, 0x4d, 0x0b, 0xa6, 0x62, 0x4c, 0xd5, 0xc2, 0x6c, 0x72, 0x37, 0x43, 0x53, 0x45, 0x92,
+	0xda, 0x5e, 0x23, 0x59, 0x2a, 0xc1, 0xe3, 0x05, 0xd2, 0xc0, 0xe6, 0x55, 0x15, 0xaa, 0xe9, 0x0c,
+	0x19, 0xcf, 0x4b, 0x23, 0x3b, 0x2f, 0xc7, 0x13, 0xf7, 0x46, 0xe1, 0xc4, 0x2d, 0x67, 0x27, 0xee,
+	0xff, 0x0b, 0xa2, 0xbb, 0xb1, 0x44, 0x69, 0xf9, 0x4f, 0xb8, 0x59, 0x51, 0xdb, 0x4d, 0x7e, 0x63,
+	0x7e, 0x93, 0x69, 0x20, 0xf9, 0x58, 0x6b, 0x3a, 0x95, 0xa4, 0x47, 0xd9, 0x4a, 0x46, 0x91, 0x65,
+	0x72, 0xc6, 0x61, 0x93, 0x02, 0x62, 0x21, 0x2f, 0x20, 0xb6, 0x60, 0xe5, 0x91, 0x3a, 0xb5, 0x34,
+	0x46, 0x37, 0x2f, 0x0f, 0x4f, 0xcb, 0x95, 0x6a, 0x91, 0x5c, 0xc9, 0x4a, 0x0f, 0xc8, 0x49, 0x8f,
+	0xbc, 0x28, 0xaa, 0x15, 0x88, 0x22, 0xf9, 0xe0, 0x24, 0xfe, 0xa5, 0xf8, 0xc1, 0xc9, 0xfa, 0x92,
+	0x77, 0xa6, 0x9e, 0x7b, 0x8c, 0x3e, 0x85, 0xf5, 0x53, 0xea, 0x31, 0x97, 0x0a, 0x1e, 0x74, 0x04,
+	0x15, 0xe1, 0x38, 0x52, 0x89, 0x0a, 0xfb, 0x1a, 0x2f, 0x79, 0x00, 0x8d, 0xa9, 0x37, 0xa2, 0xf1,
+	0x06, 0x6f, 0x44, 0xa3, 0x48, 0xf2, 0xd9, 0xe8, 0x20, 0x1b, 0x8a, 0x50, 0xd5, 0x5d, 0xd5, 0xbb,
+	0xcb, 0x62, 0xe4, 0xb3, 0xec, 0xe5, 0x37, 0x89, 0xba, 0x99, 0xab, 0x53, 0x97, 0x3c, 0x2e, 0x91,
+	0xe5, 0x89, 0x09, 0x0b, 0x07, 0x92, 0xc6, 0xad, 0x43, 0xf3, 0xa6, 0xd6, 0xef, 0xb1, 0x29, 0x1b,
+	0xd8, 0xe1, 0x4f, 0xc4, 0x05, 0x0d, 0xf0, 0x14, 0x83, 0x50, 0x4a, 0xf5, 0x35, 0xdd, 0xc0, 0x1c,
+	0x5c, 0xa4, 0xf1, 0x6e, 0xbd, 0x75, 0x8d, 0xf7, 0xbd, 0x01, 0xeb, 0x39, 0xac, 0xe5, 0x6b, 0x0a,
+	0xad, 0xcf, 0xba, 0xf8, 0x35, 0x85, 0xa6, 0x75, 0xe6, 0xed, 0xb7, 0xac, 0x33, 0xbf, 0x81, 0xe5,
+	0x43, 0x3c, 0xcf, 0xee, 0xd5, 0x9c, 0x75, 0xc5, 0x5c, 0x81, 0xac, 0xac, 0x7c, 0x67, 0x42, 0x56,
+	0x2a, 0xd6, 0x60, 0x88, 0xc1, 0x39, 0xba, 0xe6, 0x46, 0xcc, 0x9a, 0xd8, 0xfe, 0xe0, 0x17, 0x03,
+	0x20, 0xfd, 0x94, 0x23, 0xab, 0x50, 0x6f, 0xf9, 0xe7, 0x92, 0x28, 0x1a, 0x68, 0x94, 0xc8, 0x1a,
+	0x34, 0x64, 0x80, 0x8d, 0x3d, 0x29, 0x09, 0xa8, 0x42, 0x0d, 0x19, 0x28, 0xd1, 0xaf, 0xfc, 0x50,
+	0xd0, 0x33, 0xe6, 0xf7, 0x1a, 0x37, 0xc8, 0x3a, 0x10, 0x35, 0x82, 0x30, 0xc8, 0x86, 0x96, 0xc9,
+	0xb2, 0xae, 0xf0, 0x25, 0x65, 0x1e, 0xba, 0x8d, 0x39, 0xd2, 0x80, 0x25, 0x9d, 0x1a, 0x23, 0x15,
+	0xb2, 0x02, 0x35, 0x89, 0x74, 0x3c, 0x2a, 0x55, 0x5c, 0x63, 0x3e, 0x01, 0x6c, 0x39, 0x29, 0xcf,
+	0xb0, 0xb1, 0xb0, 0xff, 0xc5, 0xf3, 0x97, 0x56, 0xe9, 0xc5, 0x4b, 0xab, 0x74, 0xf5, 0xd2, 0x32,
+	0xbe, 0x1b, 0x59, 0xc6, 0xaf, 0x23, 0xcb, 0x78, 0x36, 0xb2, 0x8c, 0xe7, 0x23, 0xcb, 0x78, 0x31,
+	0xb2, 0x8c, 0xbf, 0x47, 0x96, 0xf1, 0xcf, 0xc8, 0x2a, 0x5d, 0x8d, 0x2c, 0xe3, 0x87, 0x57, 0x56,
+	0xe9, 0xf9, 0x2b, 0xab, 0xf4, 0xe2, 0x95, 0x55, 0xfa, 0xba, 0xa2, 0xbe, 0x88, 0xbb, 0xf3, 0x8a,
+	0x62, 0x9f, 0xfc, 0x17, 0x00, 0x00, 0xff, 0xff, 0xda, 0x60, 0xe6, 0xc3, 0x68, 0x0f, 0x00, 0x00,
 }
 
 func (x PeerAction) String() string {
@@ -911,7 +910,7 @@ func (this *PeerData) Equal(that interface{}) bool {
 		return false
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.ValueChange, that1.ValueChange) {
 			return false
 		}
@@ -967,13 +966,13 @@ func (this *ShardData) Equal(that interface{}) bool {
 		return false
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.AccumulatedFees, that1.AccumulatedFees) {
 			return false
 		}
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.DeveloperFees, that1.DeveloperFees) {
 			return false
 		}
@@ -1068,37 +1067,37 @@ func (this *Economics) Equal(that interface{}) bool {
 		return false
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.TotalSupply, that1.TotalSupply) {
 			return false
 		}
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.TotalToDistribute, that1.TotalToDistribute) {
 			return false
 		}
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.TotalNewlyMinted, that1.TotalNewlyMinted) {
 			return false
 		}
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.RewardsPerBlock, that1.RewardsPerBlock) {
 			return false
 		}
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.RewardsForProtocolSustainability, that1.RewardsForProtocolSustainability) {
 			return false
 		}
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.NodePrice, that1.NodePrice) {
 			return false
 		}
@@ -1235,25 +1234,25 @@ func (this *MetaBlock) Equal(that interface{}) bool {
 		return false
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.AccumulatedFees, that1.AccumulatedFees) {
 			return false
 		}
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.AccumulatedFeesInEpoch, that1.AccumulatedFeesInEpoch) {
 			return false
 		}
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.DeveloperFees, that1.DeveloperFees) {
 			return false
 		}
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.DevFeesInEpoch, that1.DevFeesInEpoch) {
 			return false
 		}
@@ -1449,7 +1448,7 @@ func (m *PeerData) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	var l int
 	_ = l
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.ValueChange)
 		i -= size
 		if _, err := __caster.MarshalTo(m.ValueChange, dAtA[i:]); err != nil {
@@ -1507,7 +1506,7 @@ func (m *ShardData) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	var l int
 	_ = l
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.DeveloperFees)
 		i -= size
 		if _, err := __caster.MarshalTo(m.DeveloperFees, dAtA[i:]); err != nil {
@@ -1523,7 +1522,7 @@ func (m *ShardData) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		dAtA[i] = 0x68
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.AccumulatedFees)
 		i -= size
 		if _, err := __caster.MarshalTo(m.AccumulatedFees, dAtA[i:]); err != nil {
@@ -1735,7 +1734,7 @@ func (m *Economics) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		dAtA[i] = 0x38
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.NodePrice)
 		i -= size
 		if _, err := __caster.MarshalTo(m.NodePrice, dAtA[i:]); err != nil {
@@ -1746,7 +1745,7 @@ func (m *Economics) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i--
 	dAtA[i] = 0x32
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.RewardsForProtocolSustainability)
 		i -= size
 		if _, err := __caster.MarshalTo(m.RewardsForProtocolSustainability, dAtA[i:]); err != nil {
@@ -1757,7 +1756,7 @@ func (m *Economics) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i--
 	dAtA[i] = 0x2a
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.RewardsPerBlock)
 		i -= size
 		if _, err := __caster.MarshalTo(m.RewardsPerBlock, dAtA[i:]); err != nil {
@@ -1768,7 +1767,7 @@ func (m *Economics) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i--
 	dAtA[i] = 0x22
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.TotalNewlyMinted)
 		i -= size
 		if _, err := __caster.MarshalTo(m.TotalNewlyMinted, dAtA[i:]); err != nil {
@@ -1779,7 +1778,7 @@ func (m *Economics) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i--
 	dAtA[i] = 0x1a
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.TotalToDistribute)
 		i -= size
 		if _, err := __caster.MarshalTo(m.TotalToDistribute, dAtA[i:]); err != nil {
@@ -1790,7 +1789,7 @@ func (m *Economics) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i--
 	dAtA[i] = 0x12
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.TotalSupply)
 		i -= size
 		if _, err := __caster.MarshalTo(m.TotalSupply, dAtA[i:]); err != nil {
@@ -1887,7 +1886,7 @@ func (m *MetaBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		dAtA[i] = 0xc8
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.DevFeesInEpoch)
 		i -= size
 		if _, err := __caster.MarshalTo(m.DevFeesInEpoch, dAtA[i:]); err != nil {
@@ -1900,7 +1899,7 @@ func (m *MetaBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i--
 	dAtA[i] = 0xc2
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.DeveloperFees)
 		i -= size
 		if _, err := __caster.MarshalTo(m.DeveloperFees, dAtA[i:]); err != nil {
@@ -1913,7 +1912,7 @@ func (m *MetaBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i--
 	dAtA[i] = 0xba
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.AccumulatedFeesInEpoch)
 		i -= size
 		if _, err := __caster.MarshalTo(m.AccumulatedFeesInEpoch, dAtA[i:]); err != nil {
@@ -1926,7 +1925,7 @@ func (m *MetaBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i--
 	dAtA[i] = 0xb2
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.AccumulatedFees)
 		i -= size
 		if _, err := __caster.MarshalTo(m.AccumulatedFees, dAtA[i:]); err != nil {
@@ -2132,7 +2131,7 @@ func (m *PeerData) Size() (n int) {
 		n += 1 + sovMetaBlock(uint64(m.TimeStamp))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.ValueChange)
 		n += 1 + l + sovMetaBlock(uint64(l))
 	}
@@ -2187,7 +2186,7 @@ func (m *ShardData) Size() (n int) {
 		n += 1 + sovMetaBlock(uint64(m.NumPendingMiniBlocks))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.AccumulatedFees)
 		n += 1 + l + sovMetaBlock(uint64(l))
 	}
@@ -2195,7 +2194,7 @@ func (m *ShardData) Size() (n int) {
 		n += 1 + sovMetaBlock(uint64(m.LastIncludedMetaNonce))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.DeveloperFees)
 		n += 1 + l + sovMetaBlock(uint64(l))
 	}
@@ -2256,32 +2255,32 @@ func (m *Economics) Size() (n int) {
 	var l int
 	_ = l
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.TotalSupply)
 		n += 1 + l + sovMetaBlock(uint64(l))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.TotalToDistribute)
 		n += 1 + l + sovMetaBlock(uint64(l))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.TotalNewlyMinted)
 		n += 1 + l + sovMetaBlock(uint64(l))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.RewardsPerBlock)
 		n += 1 + l + sovMetaBlock(uint64(l))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.RewardsForProtocolSustainability)
 		n += 1 + l + sovMetaBlock(uint64(l))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.NodePrice)
 		n += 1 + l + sovMetaBlock(uint64(l))
 	}
@@ -2395,22 +2394,22 @@ func (m *MetaBlock) Size() (n int) {
 		n += 2 + l + sovMetaBlock(uint64(l))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.AccumulatedFees)
 		n += 2 + l + sovMetaBlock(uint64(l))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.AccumulatedFeesInEpoch)
 		n += 2 + l + sovMetaBlock(uint64(l))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.DeveloperFees)
 		n += 2 + l + sovMetaBlock(uint64(l))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.DevFeesInEpoch)
 		n += 2 + l + sovMetaBlock(uint64(l))
 	}
@@ -2751,7 +2750,7 @@ func (m *PeerData) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
@@ -3141,7 +3140,7 @@ func (m *ShardData) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
@@ -3198,7 +3197,7 @@ func (m *ShardData) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
@@ -3622,7 +3621,7 @@ func (m *Economics) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
@@ -3660,7 +3659,7 @@ func (m *Economics) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
@@ -3698,7 +3697,7 @@ func (m *Economics) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
@@ -3736,7 +3735,7 @@ func (m *Economics) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
@@ -3774,7 +3773,7 @@ func (m *Economics) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
@@ -3812,7 +3811,7 @@ func (m *Economics) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
@@ -4661,7 +4660,7 @@ func (m *MetaBlock) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
@@ -4699,7 +4698,7 @@ func (m *MetaBlock) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
@@ -4737,7 +4736,7 @@ func (m *MetaBlock) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
@@ -4775,7 +4774,7 @@ func (m *MetaBlock) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
diff --git a/data/block/metaBlock.proto b/data/block/metaBlock.proto
index c90c2d2f8..5b1055e96 100644
--- a/data/block/metaBlock.proto
+++ b/data/block/metaBlock.proto
@@ -31,7 +31,7 @@ message PeerData {
 	bytes      PublicKey   = 2;
 	PeerAction Action      = 3;
 	uint64     TimeStamp   = 4;
-	bytes      ValueChange = 5 [(gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
+	bytes      ValueChange = 5 [(gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
 }
 
 // ShardData holds the block information sent by the shards to the metachain
@@ -44,8 +44,8 @@ message ShardData {
 	uint64                   Round                 = 8;
 	bytes                    PrevHash              = 9;
 	uint64                   Nonce                 = 10;
-	bytes                    AccumulatedFees       = 12 [(gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
-	bytes                    DeveloperFees         = 14 [(gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
+	bytes                    AccumulatedFees       = 12 [(gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
+	bytes                    DeveloperFees         = 14 [(gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
 	uint32                   NumPendingMiniBlocks  = 11;
 	uint64                   LastIncludedMetaNonce = 13;
 	uint32                   ShardID               = 1;
@@ -68,12 +68,12 @@ message EpochStartShardData {
 
 // Economics holds the block information for total supply and rewards
 message Economics {
-	bytes  TotalSupply                      = 1 [(gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
-	bytes  TotalToDistribute                = 2 [(gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
-	bytes  TotalNewlyMinted                 = 3 [(gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
-	bytes  RewardsPerBlock                  = 4 [(gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
-	bytes  RewardsForProtocolSustainability = 5 [(gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
-	bytes  NodePrice                        = 6 [(gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
+	bytes  TotalSupply                      = 1 [(gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
+	bytes  TotalToDistribute                = 2 [(gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
+	bytes  TotalNewlyMinted                 = 3 [(gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
+	bytes  RewardsPerBlock                  = 4 [(gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
+	bytes  RewardsForProtocolSustainability = 5 [(gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
+	bytes  NodePrice                        = 6 [(gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
 	uint64 PrevEpochStartRound              = 7;
 	bytes  PrevEpochStartHash               = 8;
 }
@@ -105,10 +105,10 @@ message MetaBlock {
 	 EpochStart        EpochStart               = 18 [(gogoproto.nullable) = false];
 	 bytes             ChainID                  = 19;
 	 bytes             SoftwareVersion          = 20;
-	 bytes             AccumulatedFees          = 21 [(gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
-	 bytes             AccumulatedFeesInEpoch   = 22 [(gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
-	 bytes             DeveloperFees            = 23 [(gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
-	 bytes             DevFeesInEpoch           = 24 [(gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
+	 bytes             AccumulatedFees          = 21 [(gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
+	 bytes             AccumulatedFeesInEpoch   = 22 [(gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
+	 bytes             DeveloperFees            = 23 [(gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
+	 bytes             DevFeesInEpoch           = 24 [(gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
 	 uint32            TxCount                  = 25;
 	 bytes             Reserved                 = 26;
 }
diff --git a/data/block/metaBlock_test.go b/data/block/metaBlock_test.go
index 3ed724b60..1eca12602 100644
--- a/data/block/metaBlock_test.go
+++ b/data/block/metaBlock_test.go
@@ -3,10 +3,10 @@ package block_test
 import (
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/data/block"
-	"github.com/ElrondNetwork/elrond-go-core/data/headerVersionData"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/block"
+	"github.com/multiversx/mx-chain-core-go/data/headerVersionData"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/data/block/miniBlockHeader.go b/data/block/miniBlockHeader.go
index 098f78602..44b06a7ce 100644
--- a/data/block/miniBlockHeader.go
+++ b/data/block/miniBlockHeader.go
@@ -1,6 +1,6 @@
 package block
 
-import "github.com/ElrondNetwork/elrond-go-core/data"
+import "github.com/multiversx/mx-chain-core-go/data"
 
 // GetTypeInt32 gets the miniBlock type
 func (m *MiniBlockHeader) GetTypeInt32() int32 {
diff --git a/data/block/miniBlockHeader_test.go b/data/block/miniBlockHeader_test.go
index dbc6b2726..02a671ae1 100644
--- a/data/block/miniBlockHeader_test.go
+++ b/data/block/miniBlockHeader_test.go
@@ -4,7 +4,7 @@ import (
 	"math"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/data/block"
+	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/data/block/peerBlock.go b/data/block/peerBlock.go
index 3b5e2e3ff..115131523 100644
--- a/data/block/peerBlock.go
+++ b/data/block/peerBlock.go
@@ -1,6 +1,6 @@
 package block
 
-import "github.com/ElrondNetwork/elrond-go-core/data"
+import "github.com/multiversx/mx-chain-core-go/data"
 
 // SetPubKey - setter for public key
 func (pc *PeerChange) SetPubKey(pubKey []byte) error {
diff --git a/data/block/shardDataHandler.go b/data/block/shardDataHandler.go
index dce41b421..2599d0c19 100644
--- a/data/block/shardDataHandler.go
+++ b/data/block/shardDataHandler.go
@@ -3,7 +3,7 @@ package block
 import (
 	"math/big"
 
-	"github.com/ElrondNetwork/elrond-go-core/data"
+	"github.com/multiversx/mx-chain-core-go/data"
 )
 
 // GetShardMiniBlockHeaderHandlers returns the shard miniBlockHeaders as MiniBlockHeaderHandlers
diff --git a/data/block/trigger.go b/data/block/trigger.go
index 2a9a6dacf..c8b511e37 100644
--- a/data/block/trigger.go
+++ b/data/block/trigger.go
@@ -1,7 +1,7 @@
-//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/ElrondNetwork/protobuf/protobuf  --gogoslick_out=. trigger.proto
+//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/multiversx/protobuf/protobuf  --gogoslick_out=. trigger.proto
 package block
 
-import "github.com/ElrondNetwork/elrond-go-core/data"
+import "github.com/multiversx/mx-chain-core-go/data"
 
 // GetEpochStartHeaderHandler returns the epoch start headerHandler
 func (str *ShardTriggerRegistry) GetEpochStartHeaderHandler() data.HeaderHandler {
diff --git a/data/block/trigger_test.go b/data/block/trigger_test.go
index 854c76ae6..f0b7c785d 100644
--- a/data/block/trigger_test.go
+++ b/data/block/trigger_test.go
@@ -3,7 +3,7 @@ package block
 import (
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/data"
+	"github.com/multiversx/mx-chain-core-go/data"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/data/esdt/esdt.go b/data/esdt/esdt.go
index c3563ec8b..955dac063 100644
--- a/data/esdt/esdt.go
+++ b/data/esdt/esdt.go
@@ -1,4 +1,4 @@
-//go:generate protoc -I=proto -I=$GOPATH/src -I=$GOPATH/src/github.com/ElrondNetwork/protobuf/protobuf  --gogoslick_out=. esdt.proto
+//go:generate protoc -I=proto -I=$GOPATH/src -I=$GOPATH/src/github.com/multiversx/protobuf/protobuf  --gogoslick_out=. esdt.proto
 package esdt
 
 import "math/big"
diff --git a/data/esdt/esdt.pb.go b/data/esdt/esdt.pb.go
index 9345669f5..64f66dd36 100644
--- a/data/esdt/esdt.pb.go
+++ b/data/esdt/esdt.pb.go
@@ -6,9 +6,9 @@ package esdt
 import (
 	bytes "bytes"
 	fmt "fmt"
-	github_com_ElrondNetwork_elrond_go_core_data "github.com/ElrondNetwork/elrond-go-core/data"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
+	github_com_multiversx_mx_chain_core_go_data "github.com/multiversx/mx-chain-core-go/data"
 	io "io"
 	math "math"
 	math_big "math/big"
@@ -28,10 +28,10 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
-// ESDigitalToken holds the data for a Elrond standard digital token transaction
+// ESDigitalToken holds the data for a electronic standard digital token transaction
 type ESDigitalToken struct {
 	Type          uint32        `protobuf:"varint,1,opt,name=Type,proto3" json:"Type"`
-	Value         *math_big.Int `protobuf:"bytes,2,opt,name=Value,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"Value"`
+	Value         *math_big.Int `protobuf:"bytes,2,opt,name=Value,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"Value"`
 	Properties    []byte        `protobuf:"bytes,3,opt,name=Properties,proto3" json:"Properties"`
 	TokenMetaData *MetaData     `protobuf:"bytes,4,opt,name=TokenMetaData,proto3" json:"MetaData"`
 	Reserved      []byte        `protobuf:"bytes,5,opt,name=Reserved,proto3" json:"Reserved"`
@@ -237,39 +237,40 @@ func init() {
 func init() { proto.RegisterFile("esdt.proto", fileDescriptor_e413e402abc6a34c) }
 
 var fileDescriptor_e413e402abc6a34c = []byte{
-	// 512 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0xc1, 0x8b, 0xda, 0x4e,
-	0x14, 0xce, 0xb8, 0xba, 0xab, 0xb3, 0xba, 0x87, 0xc0, 0x0f, 0xc2, 0x8f, 0x32, 0x11, 0xa1, 0x20,
-	0xb4, 0x46, 0x68, 0x8f, 0x85, 0x42, 0xb3, 0xba, 0xd4, 0x43, 0xa5, 0x8c, 0xb6, 0x87, 0xde, 0x46,
-	0x9d, 0xc6, 0x61, 0x63, 0x46, 0x26, 0x93, 0x96, 0xbd, 0xf5, 0xda, 0x5b, 0xff, 0x8c, 0xd2, 0xbf,
-	0x64, 0x8f, 0x1e, 0x3d, 0xa5, 0x35, 0x5e, 0x4a, 0x4e, 0xfb, 0x27, 0x94, 0x79, 0xd9, 0xac, 0x16,
-	0x7a, 0x79, 0xf9, 0xbe, 0x6f, 0x1e, 0xf3, 0xe6, 0x7d, 0x1f, 0xc1, 0x98, 0xc7, 0x0b, 0xed, 0xad,
-	0x95, 0xd4, 0xd2, 0xfe, 0x0f, 0x3e, 0x7e, 0x22, 0x42, 0x3d, 0x8a, 0xae, 0x92, 0x68, 0xae, 0x85,
-	0x8c, 0xe2, 0xff, 0x7b, 0x81, 0xd0, 0xcb, 0x64, 0xe6, 0xcd, 0xe5, 0xaa, 0x1f, 0xc8, 0x40, 0xf6,
-	0xa1, 0x6d, 0x96, 0x7c, 0x04, 0x06, 0x04, 0x50, 0x71, 0x4b, 0xe7, 0xb6, 0x82, 0x2f, 0x86, 0x93,
-	0x81, 0x08, 0x84, 0x66, 0xe1, 0x54, 0x5e, 0xf3, 0xc8, 0x7e, 0x84, 0xab, 0xd3, 0x9b, 0x35, 0x77,
-	0x50, 0x1b, 0x75, 0x5b, 0x7e, 0x3d, 0x4f, 0x5d, 0xe0, 0x14, 0xaa, 0x2d, 0x70, 0xed, 0x3d, 0x0b,
-	0x13, 0xee, 0x54, 0xda, 0xa8, 0xdb, 0xf4, 0x27, 0x79, 0xea, 0x16, 0xc2, 0x8f, 0x9f, 0xee, 0xd5,
-	0x8a, 0xe9, 0x65, 0x7f, 0x26, 0x02, 0x6f, 0x14, 0xe9, 0x17, 0x47, 0x0f, 0x19, 0x86, 0x4a, 0x46,
-	0x8b, 0x31, 0xd7, 0x9f, 0xa5, 0xba, 0xee, 0x73, 0x60, 0xbd, 0x40, 0xf6, 0xe6, 0x52, 0xf1, 0xfe,
-	0x82, 0x69, 0xe6, 0xf9, 0x22, 0x18, 0x45, 0xfa, 0x92, 0xc5, 0x9a, 0x2b, 0x5a, 0x5c, 0x68, 0x7b,
-	0x18, 0xbf, 0x55, 0x72, 0xcd, 0x95, 0x16, 0x3c, 0x76, 0x4e, 0x60, 0xde, 0x45, 0x9e, 0xba, 0x47,
-	0x2a, 0x3d, 0xc2, 0xf6, 0x04, 0xb7, 0x60, 0x83, 0x37, 0x5c, 0xb3, 0x01, 0xd3, 0xcc, 0xa9, 0xb6,
-	0x51, 0xf7, 0xfc, 0x99, 0xeb, 0xfd, 0xd3, 0x29, 0xaf, 0x6c, 0xf3, 0x9b, 0x79, 0xea, 0xd6, 0x4b,
-	0x46, 0xff, 0xbe, 0xc3, 0xee, 0xe2, 0x3a, 0xe5, 0x31, 0x57, 0x9f, 0xf8, 0xc2, 0xa9, 0xc1, 0x13,
-	0xa0, 0xbd, 0xd4, 0xe8, 0x03, 0xea, 0x3c, 0xc5, 0x8d, 0xe1, 0x64, 0x30, 0xa5, 0x32, 0xe4, 0xb1,
-	0xed, 0xe2, 0x1a, 0x00, 0x07, 0xb5, 0x4f, 0xba, 0x4d, 0xbf, 0x61, 0x6c, 0x52, 0x46, 0xa0, 0x85,
-	0xde, 0xf9, 0x5a, 0xc1, 0x0f, 0x33, 0x4d, 0xf7, 0x58, 0x46, 0xf3, 0xc2, 0xf3, 0x6a, 0xd1, 0x0d,
-	0x02, 0x2d, 0x3e, 0x26, 0x93, 0x31, 0x5b, 0x95, 0xa6, 0x43, 0x26, 0x86, 0x53, 0xa8, 0xf6, 0x63,
-	0x7c, 0x76, 0xa9, 0x38, 0xd3, 0x52, 0xdd, 0xbb, 0x74, 0x9e, 0xa7, 0x6e, 0x29, 0xd1, 0x12, 0xd8,
-	0x4f, 0x70, 0x83, 0xca, 0x1b, 0x16, 0x82, 0x9d, 0x55, 0x48, 0xb7, 0x95, 0xa7, 0xee, 0x41, 0xa4,
-	0x07, 0x68, 0x26, 0xbe, 0x66, 0xf1, 0xf2, 0x7e, 0x67, 0x98, 0x68, 0x38, 0x85, 0x6a, 0x4e, 0xdf,
-	0xd1, 0x51, 0xec, 0x9c, 0xc2, 0x76, 0x70, 0x6a, 0x38, 0x85, 0x6a, 0x82, 0x7b, 0xa5, 0xb5, 0x12,
-	0xb3, 0x44, 0xf3, 0xd8, 0x39, 0x3b, 0x04, 0x77, 0x50, 0xe9, 0x11, 0xf6, 0x5f, 0x6e, 0x76, 0xc4,
-	0xda, 0xee, 0x88, 0x75, 0xb7, 0x23, 0xe8, 0x4b, 0x46, 0xd0, 0xf7, 0x8c, 0xa0, 0xdb, 0x8c, 0xa0,
-	0x4d, 0x46, 0xd0, 0x36, 0x23, 0xe8, 0x57, 0x46, 0xd0, 0xef, 0x8c, 0x58, 0x77, 0x19, 0x41, 0xdf,
-	0xf6, 0xc4, 0xda, 0xec, 0x89, 0xb5, 0xdd, 0x13, 0xeb, 0x43, 0xd5, 0xfc, 0x10, 0xb3, 0x53, 0x08,
-	0xf8, 0xf9, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2a, 0x30, 0x1c, 0xe3, 0x1f, 0x03, 0x00, 0x00,
+	// 513 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0x41, 0x8b, 0xd3, 0x40,
+	0x14, 0xce, 0x74, 0xdb, 0xdd, 0x76, 0xb6, 0xdd, 0x43, 0x40, 0x08, 0x22, 0x93, 0x52, 0x10, 0x0a,
+	0xda, 0x14, 0xf4, 0x28, 0x08, 0x66, 0x5b, 0xb1, 0x07, 0x17, 0x99, 0x56, 0x0f, 0xde, 0xa6, 0xed,
+	0x98, 0x0e, 0xa6, 0x99, 0x32, 0x99, 0x2c, 0xbb, 0x37, 0xaf, 0xde, 0xfc, 0x19, 0xe2, 0x1f, 0xd1,
+	0x63, 0x8f, 0x3d, 0x45, 0x9b, 0x5e, 0x24, 0xa7, 0xfd, 0x09, 0x32, 0x2f, 0x9b, 0x6d, 0x85, 0xbd,
+	0xbc, 0x7c, 0xdf, 0x37, 0x8f, 0x79, 0xf3, 0xbe, 0x8f, 0x60, 0xcc, 0xe3, 0xb9, 0xf6, 0x56, 0x4a,
+	0x6a, 0x69, 0x3f, 0x80, 0x8f, 0x9f, 0x88, 0x50, 0x8f, 0xa2, 0xd7, 0x49, 0x34, 0xd3, 0x42, 0x46,
+	0xf1, 0xc3, 0x5e, 0x20, 0xf4, 0x22, 0x99, 0x7a, 0x33, 0xb9, 0xec, 0x07, 0x32, 0x90, 0x7d, 0x68,
+	0x9b, 0x26, 0x9f, 0x80, 0x01, 0x01, 0x54, 0xdc, 0xd2, 0xf9, 0x59, 0xc1, 0x67, 0xc3, 0xf1, 0x40,
+	0x04, 0x42, 0xb3, 0x70, 0x22, 0x3f, 0xf3, 0xc8, 0x7e, 0x84, 0xab, 0x93, 0xeb, 0x15, 0x77, 0x50,
+	0x1b, 0x75, 0x5b, 0x7e, 0x3d, 0x4f, 0x5d, 0xe0, 0x14, 0xaa, 0xbd, 0xc0, 0xb5, 0x0f, 0x2c, 0x4c,
+	0xb8, 0x53, 0x69, 0xa3, 0x6e, 0xd3, 0xa7, 0x79, 0xea, 0x16, 0xc2, 0x8f, 0xdf, 0xee, 0x70, 0xc9,
+	0xf4, 0xa2, 0x3f, 0x15, 0x81, 0x37, 0x8a, 0xf4, 0x8b, 0x83, 0x87, 0x2c, 0x93, 0x50, 0x8b, 0x4b,
+	0xae, 0xe2, 0xab, 0xfe, 0xf2, 0xaa, 0x37, 0x5b, 0x30, 0x11, 0xf5, 0x66, 0x52, 0xf1, 0x5e, 0x20,
+	0xfb, 0x73, 0xa6, 0x99, 0xe7, 0x8b, 0x60, 0x14, 0xe9, 0x73, 0x16, 0x6b, 0xae, 0x68, 0x71, 0x9f,
+	0xed, 0x61, 0xfc, 0x4e, 0xc9, 0x15, 0x57, 0x5a, 0xf0, 0xd8, 0x39, 0x82, 0x71, 0x67, 0x79, 0xea,
+	0x1e, 0xa8, 0xf4, 0x00, 0xdb, 0x63, 0xdc, 0x82, 0x05, 0xde, 0x72, 0xcd, 0x06, 0x4c, 0x33, 0xa7,
+	0xda, 0x46, 0xdd, 0xd3, 0x67, 0xae, 0x77, 0xaf, 0x51, 0x5e, 0xd9, 0xe6, 0x37, 0xf3, 0xd4, 0xad,
+	0x97, 0x8c, 0xfe, 0x7f, 0x87, 0xdd, 0xc5, 0x75, 0xca, 0x63, 0xae, 0x2e, 0xf9, 0xdc, 0xa9, 0xc1,
+	0x13, 0xa0, 0xbd, 0xd4, 0xe8, 0x1d, 0xea, 0x3c, 0xc5, 0x8d, 0xe1, 0x78, 0x30, 0xa1, 0x32, 0xe4,
+	0xb1, 0xed, 0xe2, 0x1a, 0x00, 0x07, 0xb5, 0x8f, 0xba, 0x4d, 0xbf, 0x61, 0x5c, 0x52, 0x46, 0xa0,
+	0x85, 0xde, 0xf9, 0x5a, 0xc1, 0x77, 0x33, 0x4d, 0xf7, 0x85, 0x8c, 0x66, 0x85, 0xe5, 0xd5, 0xa2,
+	0x1b, 0x04, 0x5a, 0x7c, 0x4c, 0x24, 0x17, 0x6c, 0x59, 0x7a, 0x0e, 0x91, 0x18, 0x4e, 0xa1, 0xda,
+	0x8f, 0xf1, 0xc9, 0xb9, 0xe2, 0x4c, 0x4b, 0x75, 0xeb, 0xd2, 0x69, 0x9e, 0xba, 0xa5, 0x44, 0x4b,
+	0x60, 0x3f, 0xc1, 0x0d, 0x2a, 0xaf, 0x59, 0x08, 0x76, 0x56, 0x21, 0xdc, 0x56, 0x9e, 0xba, 0x7b,
+	0x91, 0xee, 0xa1, 0x99, 0xf8, 0x86, 0xc5, 0x8b, 0xdb, 0x9d, 0x61, 0xa2, 0xe1, 0x14, 0xaa, 0x39,
+	0x7d, 0x4f, 0x47, 0xb1, 0x73, 0x0c, 0xdb, 0xc1, 0xa9, 0xe1, 0x14, 0xaa, 0x09, 0xee, 0x95, 0xd6,
+	0x4a, 0x4c, 0x13, 0xcd, 0x63, 0xe7, 0x64, 0x1f, 0xdc, 0x5e, 0xa5, 0x07, 0xd8, 0x7f, 0xb9, 0xde,
+	0x12, 0x6b, 0xb3, 0x25, 0xd6, 0xcd, 0x96, 0xa0, 0x2f, 0x19, 0x41, 0xdf, 0x33, 0x82, 0x7e, 0x65,
+	0x04, 0xad, 0x33, 0x82, 0x36, 0x19, 0x41, 0x7f, 0x32, 0x82, 0xfe, 0x66, 0xc4, 0xba, 0xc9, 0x08,
+	0xfa, 0xb6, 0x23, 0xd6, 0x7a, 0x47, 0xac, 0xcd, 0x8e, 0x58, 0x1f, 0xab, 0xe6, 0x7f, 0x98, 0x1e,
+	0x43, 0xc0, 0xcf, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xb8, 0x8c, 0x59, 0x17, 0x1e, 0x03, 0x00,
+	0x00,
 }
 
 func (this *ESDigitalToken) Equal(that interface{}) bool {
@@ -295,7 +296,7 @@ func (this *ESDigitalToken) Equal(that interface{}) bool {
 		return false
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.Value, that1.Value) {
 			return false
 		}
@@ -484,7 +485,7 @@ func (m *ESDigitalToken) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		dAtA[i] = 0x1a
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.Value)
 		i -= size
 		if _, err := __caster.MarshalTo(m.Value, dAtA[i:]); err != nil {
@@ -625,7 +626,7 @@ func (m *ESDigitalToken) Size() (n int) {
 		n += 1 + sovEsdt(uint64(m.Type))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.Value)
 		n += 1 + l + sovEsdt(uint64(l))
 	}
@@ -828,7 +829,7 @@ func (m *ESDigitalToken) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
diff --git a/data/esdt/proto/esdt.proto b/data/esdt/proto/esdt.proto
index 48d99570b..0583bb166 100644
--- a/data/esdt/proto/esdt.proto
+++ b/data/esdt/proto/esdt.proto
@@ -8,10 +8,10 @@ option (gogoproto.stable_marshaler_all) = true;
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
-// ESDigitalToken holds the data for a Elrond standard digital token transaction
+// ESDigitalToken holds the data for a electronic standard digital token transaction
 message ESDigitalToken {
 	uint32 Type            = 1 [(gogoproto.jsontag) = "Type"];
-	bytes  Value           = 2 [(gogoproto.jsontag) = "Value", (gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
+	bytes  Value           = 2 [(gogoproto.jsontag) = "Value", (gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
 	bytes  Properties      = 3 [(gogoproto.jsontag) = "Properties"];
 	MetaData TokenMetaData = 4 [(gogoproto.jsontag) = "MetaData"];
 	bytes  Reserved        = 5 [(gogoproto.jsontag) = "Reserved"];
diff --git a/data/generatedCode.md b/data/generatedCode.md
index 3a58b00b0..fa499220b 100644
--- a/data/generatedCode.md
+++ b/data/generatedCode.md
@@ -19,14 +19,14 @@ Contains the protobuf message definition (with gogo/protobuf extensions)
 Should contain the go generate directive
 
 ```
-//go:generate protoc -I=proto -I=$GOPATH/src -I=$GOPATH/src/github.com/ElrondNetwork/protobuf/protobuf  --gogoslick_out=. message.proto
+//go:generate protoc -I=proto -I=$GOPATH/src -I=$GOPATH/src/github.com/multiversx/protobuf/protobuf  --gogoslick_out=. message.proto
 ```
 
 And any necessary methods that are not generated.
 
 #### Generating code ####
 
-Check [gogo protobuf geting started](https://github.com/ElrondNetwork/protobuf#getting-started) for initial setup.
+Check [gogo protobuf geting started](https://github.com/multiversx/protobuf#getting-started) for initial setup.
 
 To regenerate all the data structures run:
 ```
diff --git a/data/guardians/guardians.go b/data/guardians/guardians.go
index 9960da059..87f684ec6 100644
--- a/data/guardians/guardians.go
+++ b/data/guardians/guardians.go
@@ -1,2 +1,2 @@
-//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/ElrondNetwork/protobuf/protobuf --gogoslick_out=. guardians.proto
+//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/multiversx/protobuf/protobuf --gogoslick_out=. guardians.proto
 package guardians
diff --git a/data/interface.go b/data/interface.go
index ee9cb7089..b8cb0d54e 100644
--- a/data/interface.go
+++ b/data/interface.go
@@ -3,7 +3,7 @@ package data
 import (
 	"math/big"
 
-	"github.com/ElrondNetwork/elrond-go-core/data/headerVersionData"
+	"github.com/multiversx/mx-chain-core-go/data/headerVersionData"
 )
 
 // TriggerRegistryHandler defines getters and setters for the trigger registry
diff --git a/data/metrics/metrics.go b/data/metrics/metrics.go
index 50bd26191..aa4ce4b6c 100644
--- a/data/metrics/metrics.go
+++ b/data/metrics/metrics.go
@@ -1,4 +1,4 @@
-//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/ElrondNetwork/protobuf/protobuf  --gogoslick_out=. metrics.proto
+//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/multiversx/protobuf/protobuf  --gogoslick_out=. metrics.proto
 package metrics
 
 // ListFromMap returns a list of values from the provided map
diff --git a/data/mock/shardCoordinatorMock.go b/data/mock/shardCoordinatorMock.go
index 431057c97..ed6bd5539 100644
--- a/data/mock/shardCoordinatorMock.go
+++ b/data/mock/shardCoordinatorMock.go
@@ -1,7 +1,7 @@
 package mock
 
 import (
-	"github.com/ElrondNetwork/elrond-go-core/core"
+	"github.com/multiversx/mx-chain-core-go/core"
 )
 
 // ShardCoordinatorMock -
diff --git a/data/outport/dtos.go b/data/outport/dtos.go
index f32188ff6..69641f648 100644
--- a/data/outport/dtos.go
+++ b/data/outport/dtos.go
@@ -3,7 +3,7 @@ package outport
 import (
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/data"
+	"github.com/multiversx/mx-chain-core-go/data"
 )
 
 // TokenMetaData is the api metaData struct for tokens
@@ -38,8 +38,11 @@ type AlteredAccount struct {
 
 // AdditionalAccountData holds the additional data for an altered account
 type AdditionalAccountData struct {
-	IsSender       bool `json:"isSender,omitempty"`
-	BalanceChanged bool `json:"balanceChanged,omitempty"`
+	IsSender         bool   `json:"isSender,omitempty"`
+	BalanceChanged   bool   `json:"balanceChanged,omitempty"`
+	CurrentOwner     string `json:"currentOwner,omitempty"`
+	UserName         string `json:"userName,omitempty"`
+	DeveloperRewards string `json:"developerRewards,omitempty"`
 }
 
 // AdditionalAccountTokenData holds the additional data for indexing a token of an altered account
diff --git a/data/outport/txWithFee.go b/data/outport/txWithFee.go
index d8c71c576..c515d1a82 100644
--- a/data/outport/txWithFee.go
+++ b/data/outport/txWithFee.go
@@ -3,7 +3,7 @@ package outport
 import (
 	"math/big"
 
-	"github.com/ElrondNetwork/elrond-go-core/data"
+	"github.com/multiversx/mx-chain-core-go/data"
 )
 
 // FeeInfo holds information about the fee and gas used
diff --git a/data/outport/txWithFee_test.go b/data/outport/txWithFee_test.go
index 68fb4a5d3..d24724455 100644
--- a/data/outport/txWithFee_test.go
+++ b/data/outport/txWithFee_test.go
@@ -4,7 +4,7 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/data/transaction"
+	"github.com/multiversx/mx-chain-core-go/data/transaction"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/data/receipt/receipt.go b/data/receipt/receipt.go
index d96bef783..decc94d8f 100644
--- a/data/receipt/receipt.go
+++ b/data/receipt/receipt.go
@@ -1,10 +1,10 @@
-//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/ElrondNetwork/protobuf/protobuf  --gogoslick_out=. receipt.proto
+//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/multiversx/protobuf/protobuf  --gogoslick_out=. receipt.proto
 package receipt
 
 import (
 	"math/big"
 
-	"github.com/ElrondNetwork/elrond-go-core/data"
+	"github.com/multiversx/mx-chain-core-go/data"
 )
 
 var _ = data.TransactionHandler(&Receipt{})
diff --git a/data/receipt/receipt.pb.go b/data/receipt/receipt.pb.go
index 93238c104..9c235d0cf 100644
--- a/data/receipt/receipt.pb.go
+++ b/data/receipt/receipt.pb.go
@@ -6,9 +6,9 @@ package receipt
 import (
 	bytes "bytes"
 	fmt "fmt"
-	github_com_ElrondNetwork_elrond_go_core_data "github.com/ElrondNetwork/elrond-go-core/data"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
+	github_com_multiversx_mx_chain_core_go_data "github.com/multiversx/mx-chain-core-go/data"
 	io "io"
 	math "math"
 	math_big "math/big"
@@ -30,7 +30,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 // Receipt holds all the data needed for a transaction receipt
 type Receipt struct {
-	Value   *math_big.Int `protobuf:"bytes,1,opt,name=Value,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"value"`
+	Value   *math_big.Int `protobuf:"bytes,1,opt,name=Value,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"value"`
 	SndAddr []byte        `protobuf:"bytes,2,opt,name=SndAddr,proto3" json:"sender"`
 	Data    []byte        `protobuf:"bytes,3,opt,name=Data,proto3" json:"data,omitempty"`
 	TxHash  []byte        `protobuf:"bytes,4,opt,name=TxHash,proto3" json:"txHash"`
@@ -99,27 +99,27 @@ func init() {
 func init() { proto.RegisterFile("receipt.proto", fileDescriptor_ace1d6eb38fad2c8) }
 
 var fileDescriptor_ace1d6eb38fad2c8 = []byte{
-	// 318 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x50, 0xbd, 0x4e, 0x33, 0x31,
-	0x10, 0x3c, 0x7f, 0x5f, 0x7e, 0x24, 0x0b, 0x28, 0x5c, 0x9d, 0x28, 0xf6, 0x50, 0x84, 0x10, 0x05,
-	0xb9, 0x2b, 0x28, 0xa9, 0x12, 0x7e, 0x44, 0x1a, 0x8a, 0x0b, 0xa2, 0xa0, 0xf3, 0xc5, 0xc6, 0xb1,
-	0xc8, 0x9d, 0x23, 0x67, 0xc3, 0x4f, 0xc7, 0x23, 0xf0, 0x18, 0x88, 0x27, 0xa1, 0x4c, 0x99, 0x2a,
-	0x10, 0x47, 0x42, 0x28, 0x55, 0x1e, 0x01, 0xc5, 0x09, 0x82, 0x6a, 0x77, 0x66, 0x76, 0x67, 0xa4,
-	0xa1, 0x9b, 0x56, 0x76, 0xa4, 0xee, 0x63, 0xdc, 0xb7, 0x06, 0x0d, 0x2b, 0xfb, 0xb1, 0x5d, 0x57,
-	0x1a, 0xbb, 0xc3, 0x2c, 0xee, 0x98, 0x3c, 0x51, 0x46, 0x99, 0xc4, 0xd3, 0xd9, 0xf0, 0xc6, 0x23,
-	0x0f, 0xfc, 0xb6, 0xfa, 0xaa, 0x7d, 0x12, 0x5a, 0x4d, 0x57, 0x3e, 0x4c, 0xd3, 0xf2, 0x15, 0xef,
-	0x0d, 0x65, 0x48, 0x76, 0xc8, 0xfe, 0x46, 0xb3, 0x3d, 0x9f, 0x44, 0xe5, 0xbb, 0x25, 0xf1, 0xfa,
-	0x1e, 0x9d, 0xe5, 0x1c, 0xbb, 0x49, 0xa6, 0x55, 0xdc, 0x2a, 0xf0, 0xe8, 0x4f, 0xc6, 0x69, 0xcf,
-	0x9a, 0x42, 0x5c, 0x48, 0xbc, 0x37, 0xf6, 0x36, 0x91, 0x1e, 0xd5, 0x95, 0xa9, 0x77, 0x8c, 0x95,
-	0x89, 0xe0, 0xc8, 0xe3, 0xa6, 0x56, 0xad, 0x02, 0x8f, 0xf9, 0x00, 0xa5, 0x4d, 0x57, 0x09, 0x6c,
-	0x97, 0x56, 0xdb, 0x85, 0x68, 0x08, 0x61, 0xc3, 0x7f, 0x3e, 0x8c, 0xce, 0x27, 0x51, 0x65, 0x20,
-	0x0b, 0x21, 0x6d, 0xfa, 0x23, 0xb1, 0x3d, 0x5a, 0x3a, 0xe1, 0xc8, 0xc3, 0xff, 0xfe, 0x84, 0xcd,
-	0x27, 0xd1, 0xd6, 0xd2, 0xf1, 0xc0, 0xe4, 0x1a, 0x65, 0xde, 0xc7, 0xc7, 0xd4, 0xeb, 0xac, 0x46,
-	0x2b, 0x97, 0x0f, 0xe7, 0x7c, 0xd0, 0x0d, 0x4b, 0xbf, 0x66, 0xe8, 0x99, 0x74, 0xad, 0x34, 0x1b,
-	0xa3, 0x29, 0x04, 0xe3, 0x29, 0x04, 0x8b, 0x29, 0x90, 0x27, 0x07, 0xe4, 0xc5, 0x01, 0x79, 0x73,
-	0x40, 0x46, 0x0e, 0xc8, 0xd8, 0x01, 0xf9, 0x70, 0x40, 0xbe, 0x1c, 0x04, 0x0b, 0x07, 0xe4, 0x79,
-	0x06, 0xc1, 0x68, 0x06, 0xc1, 0x78, 0x06, 0xc1, 0x75, 0x75, 0xdd, 0x73, 0x56, 0xf1, 0x95, 0x1d,
-	0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0x65, 0xec, 0xc7, 0x7c, 0x79, 0x01, 0x00, 0x00,
+	// 317 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x50, 0xbb, 0x4e, 0xc3, 0x40,
+	0x10, 0xf4, 0x41, 0x1e, 0xd2, 0x09, 0x28, 0x5c, 0x59, 0x14, 0x6b, 0x14, 0x21, 0x44, 0x81, 0xed,
+	0x82, 0x92, 0x2a, 0x01, 0x24, 0xd2, 0x1a, 0x44, 0x41, 0x77, 0xb6, 0x0f, 0xfb, 0xa4, 0x9c, 0x2f,
+	0x3a, 0xaf, 0xa3, 0xd0, 0xf1, 0x09, 0x7c, 0x06, 0xe2, 0x4b, 0x28, 0x53, 0xa6, 0x0a, 0xe4, 0x22,
+	0x24, 0x94, 0x2a, 0x9f, 0x80, 0x72, 0x09, 0x82, 0x6a, 0x77, 0x66, 0x76, 0x67, 0xa4, 0xa1, 0xfb,
+	0x9a, 0xa7, 0x5c, 0x0c, 0x31, 0x1c, 0x6a, 0x85, 0xca, 0x6d, 0xda, 0x71, 0x18, 0xe4, 0x02, 0x8b,
+	0x3a, 0x09, 0x53, 0x25, 0xa3, 0x5c, 0xe5, 0x2a, 0xb2, 0x74, 0x52, 0x3f, 0x5a, 0x64, 0x81, 0xdd,
+	0x36, 0x5f, 0x9d, 0x2f, 0x42, 0xdb, 0xf1, 0xc6, 0xc7, 0x2d, 0x68, 0xf3, 0x9e, 0x0d, 0x6a, 0xee,
+	0x91, 0x23, 0x72, 0xba, 0xd7, 0x8b, 0x97, 0x33, 0xbf, 0x39, 0x5a, 0x13, 0x6f, 0x1f, 0xfe, 0xb5,
+	0x64, 0x58, 0x44, 0x89, 0xc8, 0xc3, 0x7e, 0x89, 0x17, 0xff, 0x32, 0x64, 0x3d, 0x40, 0x31, 0xe2,
+	0xba, 0x1a, 0x47, 0x72, 0x1c, 0xa4, 0x05, 0x13, 0x65, 0x90, 0x2a, 0xcd, 0x83, 0x5c, 0x45, 0x19,
+	0x43, 0x16, 0xf6, 0x44, 0xde, 0x2f, 0xf1, 0x92, 0x55, 0xc8, 0x75, 0xbc, 0x09, 0x70, 0x8f, 0x69,
+	0xfb, 0xb6, 0xcc, 0xba, 0x59, 0xa6, 0xbd, 0x1d, 0x9b, 0x45, 0x97, 0x33, 0xbf, 0x55, 0xf1, 0x32,
+	0xe3, 0x3a, 0xfe, 0x95, 0xdc, 0x13, 0xda, 0xb8, 0x62, 0xc8, 0xbc, 0x5d, 0x7b, 0xe2, 0x2e, 0x67,
+	0xfe, 0xc1, 0xda, 0xf1, 0x4c, 0x49, 0x81, 0x5c, 0x0e, 0xf1, 0x29, 0xb6, 0xba, 0xdb, 0xa1, 0xad,
+	0xbb, 0xf1, 0x0d, 0xab, 0x0a, 0xaf, 0xf1, 0x67, 0x86, 0x96, 0x89, 0xb7, 0x4a, 0xaf, 0x3b, 0x99,
+	0x83, 0x33, 0x9d, 0x83, 0xb3, 0x9a, 0x03, 0x79, 0x36, 0x40, 0x5e, 0x0d, 0x90, 0x77, 0x03, 0x64,
+	0x62, 0x80, 0x4c, 0x0d, 0x90, 0x4f, 0x03, 0xe4, 0xdb, 0x80, 0xb3, 0x32, 0x40, 0x5e, 0x16, 0xe0,
+	0x4c, 0x16, 0xe0, 0x4c, 0x17, 0xe0, 0x3c, 0xb4, 0xb7, 0x35, 0x27, 0x2d, 0xdb, 0xd8, 0xf9, 0x4f,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0xfd, 0xfd, 0x03, 0xf6, 0x78, 0x01, 0x00, 0x00,
 }
 
 func (this *Receipt) Equal(that interface{}) bool {
@@ -142,7 +142,7 @@ func (this *Receipt) Equal(that interface{}) bool {
 		return false
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.Value, that1.Value) {
 			return false
 		}
@@ -221,7 +221,7 @@ func (m *Receipt) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		dAtA[i] = 0x12
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.Value)
 		i -= size
 		if _, err := __caster.MarshalTo(m.Value, dAtA[i:]); err != nil {
@@ -252,7 +252,7 @@ func (m *Receipt) Size() (n int) {
 	var l int
 	_ = l
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.Value)
 		n += 1 + l + sovReceipt(uint64(l))
 	}
@@ -357,7 +357,7 @@ func (m *Receipt) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
diff --git a/data/receipt/receipt.proto b/data/receipt/receipt.proto
index 15158bdd1..0fbe44c12 100644
--- a/data/receipt/receipt.proto
+++ b/data/receipt/receipt.proto
@@ -10,7 +10,7 @@ import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
 // Receipt holds all the data needed for a transaction receipt
 message Receipt {
-	bytes    Value     = 1 [(gogoproto.jsontag) = "value", (gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
+	bytes    Value     = 1 [(gogoproto.jsontag) = "value", (gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
 	bytes    SndAddr   = 2 [(gogoproto.jsontag) = "sender"];
 	bytes    Data      = 3 [(gogoproto.jsontag) = "data,omitempty"];
 	bytes    TxHash    = 4 [(gogoproto.jsontag) = "txHash"];
diff --git a/data/receipt/receipt_test.go b/data/receipt/receipt_test.go
index 8cc17375a..84f689413 100644
--- a/data/receipt/receipt_test.go
+++ b/data/receipt/receipt_test.go
@@ -4,7 +4,7 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/data/receipt"
+	"github.com/multiversx/mx-chain-core-go/data/receipt"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/data/rewardTx/rewardTx.go b/data/rewardTx/rewardTx.go
index 024fc4fcf..0e4a3ed43 100644
--- a/data/rewardTx/rewardTx.go
+++ b/data/rewardTx/rewardTx.go
@@ -1,10 +1,10 @@
-//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/ElrondNetwork/protobuf/protobuf  --gogoslick_out=. rewardTx.proto
+//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/multiversx/protobuf/protobuf  --gogoslick_out=. rewardTx.proto
 package rewardTx
 
 import (
 	"math/big"
 
-	"github.com/ElrondNetwork/elrond-go-core/data"
+	"github.com/multiversx/mx-chain-core-go/data"
 )
 
 var _ = data.TransactionHandler(&RewardTx{})
diff --git a/data/rewardTx/rewardTx.pb.go b/data/rewardTx/rewardTx.pb.go
index 7eae9cabf..ab1910274 100644
--- a/data/rewardTx/rewardTx.pb.go
+++ b/data/rewardTx/rewardTx.pb.go
@@ -6,9 +6,9 @@ package rewardTx
 import (
 	bytes "bytes"
 	fmt "fmt"
-	github_com_ElrondNetwork_elrond_go_core_data "github.com/ElrondNetwork/elrond-go-core/data"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
+	github_com_multiversx_mx_chain_core_go_data "github.com/multiversx/mx-chain-core-go/data"
 	io "io"
 	math "math"
 	math_big "math/big"
@@ -71,7 +71,7 @@ func (Type) EnumDescriptor() ([]byte, []int) {
 // RewardTx holds the data for a reward transaction
 type RewardTx struct {
 	Round   uint64        `protobuf:"varint,1,opt,name=Round,proto3" json:"round"`
-	Value   *math_big.Int `protobuf:"bytes,3,opt,name=Value,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"value"`
+	Value   *math_big.Int `protobuf:"bytes,3,opt,name=Value,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"value"`
 	RcvAddr []byte        `protobuf:"bytes,4,opt,name=RcvAddr,proto3" json:"receiver"`
 	Epoch   uint32        `protobuf:"varint,2,opt,name=Epoch,proto3" json:"epoch"`
 }
@@ -141,32 +141,32 @@ func init() { proto.RegisterFile("rewardTx.proto", fileDescriptor_25dbfb608d6bad
 
 var fileDescriptor_25dbfb608d6baddf = []byte{
 	// 409 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0xc1, 0x8a, 0xd3, 0x40,
-	0x1c, 0xc6, 0x33, 0xbb, 0xc9, 0x9a, 0x1d, 0x5a, 0x89, 0x03, 0x42, 0x10, 0x99, 0x14, 0x0f, 0x52,
-	0x84, 0x26, 0x07, 0x8f, 0x9e, 0x8c, 0xec, 0xc2, 0x82, 0x8a, 0x64, 0xa3, 0x07, 0x6f, 0x93, 0x64,
-	0x4c, 0x87, 0xcd, 0xce, 0x94, 0xe9, 0xa4, 0xcd, 0xde, 0xc4, 0x27, 0xf0, 0x31, 0xc4, 0x27, 0xf1,
-	0xd8, 0x63, 0x4f, 0xbb, 0x76, 0x7a, 0x91, 0x9e, 0xfa, 0x08, 0x92, 0x49, 0x03, 0x3d, 0x25, 0xdf,
-	0xef, 0x9b, 0x8f, 0xff, 0xc7, 0xff, 0x0f, 0x1f, 0x4b, 0xba, 0x24, 0xb2, 0x48, 0x9b, 0x70, 0x26,
-	0x85, 0x12, 0x68, 0x68, 0x3e, 0xc9, 0x01, 0x3e, 0x9b, 0x94, 0x4c, 0x4d, 0xeb, 0x2c, 0xcc, 0xc5,
-	0x6d, 0x54, 0x8a, 0x52, 0x44, 0xc6, 0xce, 0xea, 0x6f, 0x46, 0x19, 0x61, 0xfe, 0xba, 0xf4, 0x8b,
-	0x07, 0x00, 0xdd, 0x3e, 0x8b, 0x02, 0xe8, 0x24, 0xa2, 0xe6, 0x85, 0x0f, 0x46, 0x60, 0x6c, 0xc7,
-	0xe7, 0xbb, 0xfb, 0xc0, 0x91, 0x2d, 0x48, 0x3a, 0x8e, 0x18, 0x74, 0xbe, 0x90, 0xaa, 0xa6, 0xfe,
-	0xe9, 0x08, 0x8c, 0x07, 0xf1, 0x75, 0xfb, 0x60, 0xd1, 0x82, 0xdf, 0x0f, 0xc1, 0xe5, 0x2d, 0x51,
-	0xd3, 0x28, 0x63, 0x65, 0x78, 0xc5, 0xd5, 0x9b, 0xa3, 0x16, 0x17, 0x95, 0x14, 0xbc, 0xf8, 0x48,
-	0xd5, 0x52, 0xc8, 0x9b, 0x88, 0x1a, 0x35, 0x29, 0xc5, 0x24, 0x17, 0x92, 0x46, 0x05, 0x51, 0x24,
-	0x8c, 0x59, 0x79, 0xc5, 0xd5, 0x3b, 0x32, 0x57, 0x54, 0x26, 0xdd, 0x04, 0xf4, 0x12, 0x3e, 0x4a,
-	0xf2, 0xc5, 0xdb, 0xa2, 0x90, 0xbe, 0x6d, 0x86, 0x0d, 0x76, 0xf7, 0x81, 0x2b, 0x69, 0x4e, 0xd9,
-	0x82, 0xca, 0xa4, 0x37, 0xdb, 0xce, 0x17, 0x33, 0x91, 0x4f, 0xfd, 0x93, 0x11, 0x18, 0x0f, 0xbb,
-	0xce, 0xb4, 0x05, 0x49, 0xc7, 0x5f, 0xfd, 0x00, 0xd0, 0x4e, 0xef, 0x66, 0x14, 0x0d, 0xe1, 0xf9,
-	0x67, 0x7e, 0xc3, 0xc5, 0x92, 0xa7, 0x8d, 0x67, 0xa1, 0x01, 0x74, 0xdf, 0x53, 0x52, 0x50, 0x99,
-	0x36, 0x1e, 0x40, 0x10, 0x9e, 0xc5, 0xb5, 0x6c, 0x9d, 0x13, 0xf4, 0x1c, 0xfa, 0x9f, 0xda, 0xe5,
-	0xe4, 0xa2, 0xba, 0xae, 0xe7, 0x8a, 0x30, 0x4e, 0x32, 0x56, 0x31, 0x75, 0x97, 0x36, 0xde, 0x29,
-	0x7a, 0x0a, 0x9f, 0xf4, 0x6e, 0xb7, 0xb8, 0x79, 0xda, 0x78, 0xf6, 0x71, 0xe8, 0x80, 0x2f, 0x85,
-	0xfc, 0x40, 0x15, 0x49, 0x1b, 0xcf, 0x89, 0xe3, 0xd5, 0x06, 0x5b, 0xeb, 0x0d, 0xb6, 0xf6, 0x1b,
-	0x0c, 0xbe, 0x6b, 0x0c, 0x7e, 0x69, 0x0c, 0xfe, 0x68, 0x0c, 0x56, 0x1a, 0x83, 0xb5, 0xc6, 0xe0,
-	0xaf, 0xc6, 0xe0, 0x9f, 0xc6, 0xd6, 0x5e, 0x63, 0xf0, 0x73, 0x8b, 0xad, 0xd5, 0x16, 0x5b, 0xeb,
-	0x2d, 0xb6, 0xbe, 0xba, 0xfd, 0xb9, 0xb3, 0x33, 0x73, 0xb1, 0xd7, 0xff, 0x03, 0x00, 0x00, 0xff,
-	0xff, 0xcf, 0xe7, 0x20, 0x17, 0x01, 0x02, 0x00, 0x00,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0xc1, 0x8a, 0x13, 0x31,
+	0x18, 0xc7, 0x27, 0xbb, 0xed, 0xda, 0x0d, 0xad, 0x8c, 0x01, 0x61, 0x10, 0x49, 0x8b, 0x07, 0x29,
+	0x42, 0x3b, 0x07, 0x8f, 0x9e, 0x1c, 0x59, 0x61, 0x41, 0x41, 0xe2, 0xe8, 0xc1, 0x5b, 0x66, 0x26,
+	0xce, 0x04, 0x67, 0x92, 0x92, 0xc9, 0x74, 0xb3, 0x37, 0xf1, 0x09, 0x7c, 0x0c, 0xf1, 0x49, 0x3c,
+	0xf6, 0xd8, 0x53, 0xb5, 0xe9, 0x45, 0xf6, 0xb4, 0x8f, 0xb0, 0x64, 0x66, 0x07, 0x7a, 0x4a, 0xbe,
+	0xdf, 0x3f, 0xff, 0x7c, 0x7f, 0xbe, 0x0f, 0x3e, 0x54, 0xec, 0x8a, 0xaa, 0x2c, 0x36, 0xcb, 0x95,
+	0x92, 0x5a, 0xa2, 0x49, 0x7b, 0x90, 0x7b, 0xf8, 0x64, 0x91, 0x73, 0x5d, 0x34, 0xc9, 0x32, 0x95,
+	0x55, 0x98, 0xcb, 0x5c, 0x86, 0xad, 0x9c, 0x34, 0x5f, 0xdb, 0xaa, 0x2d, 0xda, 0x5b, 0xe7, 0x7e,
+	0xb6, 0x03, 0x70, 0xd4, 0x7b, 0xd1, 0x14, 0x0e, 0x89, 0x6c, 0x44, 0x16, 0x80, 0x19, 0x98, 0x0f,
+	0xa2, 0xf3, 0x9b, 0xdd, 0x74, 0xa8, 0x1c, 0x20, 0x1d, 0x47, 0x05, 0x1c, 0x7e, 0xa6, 0x65, 0xc3,
+	0x82, 0xd3, 0x19, 0x98, 0x8f, 0x23, 0xe2, 0x1e, 0xac, 0x1d, 0xf8, 0xfd, 0x77, 0x7a, 0x51, 0x51,
+	0x5d, 0x84, 0x09, 0xcf, 0x97, 0x97, 0x42, 0xbf, 0x3a, 0x4a, 0x51, 0x35, 0xa5, 0xe6, 0x6b, 0xa6,
+	0x6a, 0x13, 0x56, 0x66, 0x91, 0x16, 0x94, 0x8b, 0x45, 0x2a, 0x15, 0x5b, 0xe4, 0x32, 0xcc, 0xa8,
+	0xa6, 0xcb, 0x88, 0xe7, 0x97, 0x42, 0xbf, 0xa1, 0xb5, 0x66, 0x8a, 0x74, 0x0d, 0xd0, 0x73, 0xf8,
+	0x80, 0xa4, 0xeb, 0xd7, 0x59, 0xa6, 0x82, 0x41, 0xdb, 0x6b, 0x7c, 0xb3, 0x9b, 0x8e, 0x14, 0x4b,
+	0x99, 0xfb, 0x8a, 0xf4, 0xa2, 0x8b, 0x7c, 0xb1, 0x92, 0x69, 0x11, 0x9c, 0xcc, 0xc0, 0x7c, 0xd2,
+	0x45, 0x66, 0x0e, 0x90, 0x8e, 0xbf, 0xf8, 0x01, 0xe0, 0x20, 0xbe, 0x5e, 0x31, 0x34, 0x81, 0xe7,
+	0x9f, 0xc4, 0x37, 0x21, 0xaf, 0x44, 0x6c, 0x7c, 0x0f, 0x8d, 0xe1, 0xe8, 0x1d, 0xa3, 0x19, 0x53,
+	0xb1, 0xf1, 0x01, 0x82, 0xf0, 0x2c, 0x6a, 0x94, 0x53, 0x4e, 0xd0, 0x53, 0x18, 0x7c, 0x70, 0xb3,
+	0x49, 0x65, 0xf9, 0xb1, 0xa9, 0x35, 0xe5, 0x82, 0x26, 0xbc, 0xe4, 0xfa, 0x3a, 0x36, 0xfe, 0x29,
+	0x7a, 0x0c, 0x1f, 0xf5, 0x6a, 0x37, 0xb7, 0x3a, 0x36, 0xfe, 0xe0, 0xd8, 0x74, 0x8f, 0xdf, 0x4a,
+	0xf5, 0x9e, 0x69, 0x1a, 0x1b, 0x7f, 0x18, 0x45, 0x9b, 0x3d, 0xf6, 0xb6, 0x7b, 0xec, 0xdd, 0xee,
+	0x31, 0xf8, 0x6e, 0x31, 0xf8, 0x65, 0x31, 0xf8, 0x63, 0x31, 0xd8, 0x58, 0x0c, 0xb6, 0x16, 0x83,
+	0x7f, 0x16, 0x83, 0xff, 0x16, 0x7b, 0xb7, 0x16, 0x83, 0x9f, 0x07, 0xec, 0x6d, 0x0e, 0xd8, 0xdb,
+	0x1e, 0xb0, 0xf7, 0x65, 0xd4, 0x6f, 0x3b, 0x39, 0x6b, 0x17, 0xf6, 0xf2, 0x2e, 0x00, 0x00, 0xff,
+	0xff, 0x42, 0x42, 0x5b, 0x64, 0x00, 0x02, 0x00, 0x00,
 }
 
 func (x Type) String() string {
@@ -199,7 +199,7 @@ func (this *RewardTx) Equal(that interface{}) bool {
 		return false
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.Value, that1.Value) {
 			return false
 		}
@@ -261,7 +261,7 @@ func (m *RewardTx) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		dAtA[i] = 0x22
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.Value)
 		i -= size
 		if _, err := __caster.MarshalTo(m.Value, dAtA[i:]); err != nil {
@@ -308,7 +308,7 @@ func (m *RewardTx) Size() (n int) {
 		n += 1 + sovRewardTx(uint64(m.Epoch))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.Value)
 		n += 1 + l + sovRewardTx(uint64(l))
 	}
@@ -443,7 +443,7 @@ func (m *RewardTx) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
diff --git a/data/rewardTx/rewardTx.proto b/data/rewardTx/rewardTx.proto
index 6d7cbf82b..f74966c79 100644
--- a/data/rewardTx/rewardTx.proto
+++ b/data/rewardTx/rewardTx.proto
@@ -27,7 +27,7 @@ enum Type {
 // RewardTx holds the data for a reward transaction
 message RewardTx {
 	uint64   Round     = 1 [(gogoproto.jsontag) = "round"];
-	bytes    Value     = 3 [(gogoproto.jsontag) = "value", (gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
+	bytes    Value     = 3 [(gogoproto.jsontag) = "value", (gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
 	bytes    RcvAddr   = 4 [(gogoproto.jsontag) = "receiver"];
 	uint32   Epoch     = 2 [(gogoproto.jsontag) = "epoch"];
 }
diff --git a/data/rewardTx/rewardTx_test.go b/data/rewardTx/rewardTx_test.go
index 7db4df9ea..2f8680e26 100644
--- a/data/rewardTx/rewardTx_test.go
+++ b/data/rewardTx/rewardTx_test.go
@@ -4,8 +4,8 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/data/rewardTx"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/rewardTx"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/data/scheduled/scheduled.go b/data/scheduled/scheduled.go
index f830132c3..9f8e95142 100644
--- a/data/scheduled/scheduled.go
+++ b/data/scheduled/scheduled.go
@@ -1,11 +1,11 @@
-//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/ElrondNetwork/protobuf/protobuf  --gogoslick_out=. scheduled.proto
+//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/multiversx/protobuf/protobuf  --gogoslick_out=. scheduled.proto
 package scheduled
 
 import (
-	"github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/data/block"
-	"github.com/ElrondNetwork/elrond-go-core/data/smartContractResult"
-	"github.com/ElrondNetwork/elrond-go-core/data/transaction"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/block"
+	"github.com/multiversx/mx-chain-core-go/data/smartContractResult"
+	"github.com/multiversx/mx-chain-core-go/data/transaction"
 )
 
 // GetTransactionHandlersMap returns the smart contract results as a map of transaction handlers
diff --git a/data/scheduled/scheduled.pb.go b/data/scheduled/scheduled.pb.go
index 040e5e0b2..6cf07afbb 100644
--- a/data/scheduled/scheduled.pb.go
+++ b/data/scheduled/scheduled.pb.go
@@ -6,12 +6,12 @@ package scheduled
 import (
 	bytes "bytes"
 	fmt "fmt"
-	github_com_ElrondNetwork_elrond_go_core_data "github.com/ElrondNetwork/elrond-go-core/data"
-	block "github.com/ElrondNetwork/elrond-go-core/data/block"
-	smartContractResult "github.com/ElrondNetwork/elrond-go-core/data/smartContractResult"
-	transaction "github.com/ElrondNetwork/elrond-go-core/data/transaction"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
+	github_com_multiversx_mx_chain_core_go_data "github.com/multiversx/mx-chain-core-go/data"
+	block "github.com/multiversx/mx-chain-core-go/data/block"
+	smartContractResult "github.com/multiversx/mx-chain-core-go/data/smartContractResult"
+	transaction "github.com/multiversx/mx-chain-core-go/data/transaction"
 	io "io"
 	math "math"
 	math_big "math/big"
@@ -32,8 +32,8 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 type GasAndFees struct {
-	AccumulatedFees *math_big.Int `protobuf:"bytes,1,opt,name=AccumulatedFees,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"AccumulatedFees,omitempty"`
-	DeveloperFees   *math_big.Int `protobuf:"bytes,2,opt,name=DeveloperFees,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"DeveloperFees,omitempty"`
+	AccumulatedFees *math_big.Int `protobuf:"bytes,1,opt,name=AccumulatedFees,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"AccumulatedFees,omitempty"`
+	DeveloperFees   *math_big.Int `protobuf:"bytes,2,opt,name=DeveloperFees,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"DeveloperFees,omitempty"`
 	GasProvided     uint64        `protobuf:"varint,3,opt,name=GasProvided,proto3" json:"GasProvided,omitempty"`
 	GasPenalized    uint64        `protobuf:"varint,4,opt,name=GasPenalized,proto3" json:"GasPenalized,omitempty"`
 	GasRefunded     uint64        `protobuf:"varint,5,opt,name=GasRefunded,proto3" json:"GasRefunded,omitempty"`
@@ -182,37 +182,37 @@ func init() { proto.RegisterFile("scheduled.proto", fileDescriptor_f80076f37bd30
 
 var fileDescriptor_f80076f37bd30c16 = []byte{
 	// 491 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0x41, 0x6f, 0xd3, 0x30,
-	0x18, 0x8d, 0xdb, 0x0e, 0x81, 0xbb, 0x69, 0xe0, 0x5d, 0xa2, 0x1e, 0x4c, 0xd5, 0x53, 0x2f, 0x4d,
-	0xc4, 0x38, 0x22, 0x21, 0x2d, 0x1d, 0x1b, 0x9b, 0x04, 0x42, 0x2e, 0xa7, 0xdd, 0x9c, 0xc4, 0x4b,
-	0xad, 0xa5, 0x76, 0x65, 0x3b, 0x45, 0xe2, 0xc4, 0x4f, 0xe0, 0xc8, 0x4f, 0x40, 0xfc, 0x12, 0x8e,
-	0x3d, 0xf6, 0x80, 0x04, 0x4d, 0x2f, 0x1c, 0xf7, 0x13, 0x50, 0x9d, 0x2c, 0x4b, 0xa1, 0x97, 0x4a,
-	0x5c, 0x12, 0x7f, 0xcf, 0xef, 0xbd, 0xcf, 0xf1, 0xf7, 0x02, 0x0f, 0x75, 0x34, 0x66, 0x71, 0x96,
-	0xb2, 0xd8, 0x9b, 0x2a, 0x69, 0x24, 0xda, 0xb3, 0xaf, 0xce, 0x20, 0xe1, 0x66, 0x9c, 0x85, 0x5e,
-	0x24, 0x27, 0x7e, 0x22, 0x13, 0xe9, 0x5b, 0x38, 0xcc, 0xae, 0x6d, 0x65, 0x0b, 0xbb, 0x2a, 0x54,
-	0x9d, 0xab, 0x1a, 0xfd, 0x55, 0xaa, 0xa4, 0x88, 0xdf, 0x32, 0xf3, 0x41, 0xaa, 0x1b, 0x9f, 0xd9,
-	0x6a, 0x90, 0xc8, 0x41, 0x24, 0x15, 0xf3, 0x63, 0x6a, 0xa8, 0xaf, 0x27, 0x54, 0x99, 0xa1, 0x14,
-	0x46, 0xd1, 0xc8, 0x10, 0xa6, 0xb3, 0xd4, 0x6c, 0xc3, 0x4a, 0xef, 0x97, 0x3b, 0x79, 0x87, 0xa9,
-	0x8c, 0x6e, 0x8a, 0x67, 0xa9, 0xbf, 0xdc, 0x49, 0x6f, 0x14, 0x15, 0x9a, 0x46, 0x86, 0x4b, 0x51,
-	0x5f, 0x17, 0x5e, 0xbd, 0x1f, 0x0d, 0x08, 0xcf, 0xa9, 0x3e, 0x11, 0xf1, 0x19, 0x63, 0x1a, 0x19,
-	0x78, 0x78, 0x12, 0x45, 0xd9, 0x24, 0x4b, 0xa9, 0x61, 0x16, 0x72, 0x41, 0x17, 0xf4, 0xf7, 0x83,
-	0xcb, 0x6f, 0x3f, 0x9f, 0x9e, 0x4d, 0xa8, 0x19, 0xfb, 0x21, 0x4f, 0xbc, 0x0b, 0x61, 0x5e, 0xec,
-	0x72, 0x08, 0x2f, 0xe0, 0xc9, 0x85, 0x30, 0x43, 0xaa, 0x0d, 0x53, 0xe4, 0xef, 0x16, 0x68, 0x0a,
-	0x0f, 0x4e, 0xd9, 0x8c, 0xa5, 0x72, 0xca, 0x94, 0xed, 0xd9, 0xf8, 0xef, 0x3d, 0x37, 0x1b, 0xa0,
-	0x2e, 0x6c, 0x9f, 0x53, 0xfd, 0x4e, 0xc9, 0x19, 0x8f, 0x59, 0xec, 0x36, 0xbb, 0xa0, 0xdf, 0x22,
-	0x75, 0x08, 0xf5, 0xe0, 0xfe, 0xba, 0x64, 0x82, 0xa6, 0xfc, 0x23, 0x8b, 0xdd, 0x96, 0xa5, 0x6c,
-	0x60, 0xa5, 0x0b, 0x61, 0xd7, 0x99, 0x58, 0xbb, 0xec, 0x55, 0x2e, 0x77, 0x50, 0xef, 0x4b, 0x03,
-	0x1e, 0x8c, 0xee, 0x02, 0x39, 0x1a, 0x12, 0x8d, 0x3a, 0xf0, 0xa1, 0x92, 0xd2, 0xbc, 0xa6, 0x7a,
-	0x5c, 0x5c, 0x2d, 0xa9, 0x6a, 0xe4, 0xc1, 0x96, 0x8e, 0xd4, 0xfa, 0xf3, 0x9b, 0xfd, 0xf6, 0x71,
-	0xa7, 0x18, 0x91, 0x37, 0xfa, 0x37, 0x48, 0xc4, 0xf2, 0xd0, 0x29, 0x3c, 0xe2, 0x62, 0x46, 0x53,
-	0x1e, 0xbf, 0xbf, 0x1f, 0xac, 0x76, 0x9b, 0x56, 0x8e, 0x4a, 0x79, 0x6d, 0x8b, 0x6c, 0xa3, 0xa3,
-	0x00, 0x1e, 0x55, 0xff, 0xcc, 0x1b, 0x2e, 0x78, 0xb0, 0x8e, 0x9a, 0x76, 0x5b, 0xd6, 0xe5, 0x71,
-	0xe9, 0x52, 0x6d, 0x90, 0x6d, 0x64, 0xf4, 0x0c, 0xc2, 0xa4, 0x4a, 0x91, 0xbd, 0x88, 0xf6, 0xf1,
-	0x93, 0x52, 0x7a, 0x1f, 0x2f, 0x52, 0x23, 0x05, 0xc3, 0xf9, 0x12, 0x3b, 0x8b, 0x25, 0x76, 0x6e,
-	0x97, 0x18, 0x7c, 0xca, 0x31, 0xf8, 0x9a, 0x63, 0xf0, 0x3d, 0xc7, 0x60, 0x9e, 0x63, 0xb0, 0xc8,
-	0x31, 0xf8, 0x95, 0x63, 0xf0, 0x3b, 0xc7, 0xce, 0x6d, 0x8e, 0xc1, 0xe7, 0x15, 0x76, 0xe6, 0x2b,
-	0xec, 0x2c, 0x56, 0xd8, 0xb9, 0x7a, 0x54, 0x9d, 0x20, 0x7c, 0x60, 0x5b, 0x3c, 0xff, 0x13, 0x00,
-	0x00, 0xff, 0xff, 0x69, 0x95, 0xb6, 0x40, 0xf6, 0x03, 0x00, 0x00,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0x31, 0x8f, 0xd3, 0x30,
+	0x18, 0x8d, 0xaf, 0x3d, 0x04, 0xee, 0x9d, 0x0e, 0x7c, 0x4b, 0xd5, 0xc1, 0x54, 0x9d, 0xba, 0x34,
+	0x11, 0xc7, 0x88, 0x18, 0xae, 0x3d, 0x38, 0x3a, 0x20, 0x21, 0x97, 0x05, 0x36, 0xc7, 0xf1, 0x25,
+	0x16, 0x89, 0x7d, 0xb2, 0x9d, 0xea, 0xc4, 0xc4, 0x4f, 0x60, 0xe4, 0x27, 0x20, 0x7e, 0x09, 0x63,
+	0xc7, 0x8a, 0x05, 0x9a, 0x2e, 0x8c, 0xf7, 0x13, 0x50, 0x9d, 0x5c, 0x2e, 0x07, 0x5d, 0x2a, 0xb1,
+	0x24, 0xfe, 0x9e, 0xdf, 0x7b, 0x9f, 0xe3, 0xef, 0x05, 0x1e, 0x19, 0x96, 0xf0, 0x28, 0x4f, 0x79,
+	0xe4, 0x5f, 0x6a, 0x65, 0x15, 0xda, 0x77, 0xaf, 0xde, 0x28, 0x16, 0x36, 0xc9, 0x43, 0x9f, 0xa9,
+	0x2c, 0x88, 0x55, 0xac, 0x02, 0x07, 0x87, 0xf9, 0x85, 0xab, 0x5c, 0xe1, 0x56, 0xa5, 0xaa, 0xf7,
+	0xae, 0x41, 0xcf, 0xf2, 0xd4, 0x8a, 0x39, 0xd7, 0xe6, 0x2a, 0xc8, 0xae, 0x46, 0x2c, 0xa1, 0x42,
+	0x8e, 0x98, 0xd2, 0x7c, 0x14, 0xab, 0x20, 0xa2, 0x96, 0x06, 0x26, 0xa3, 0xda, 0x4e, 0x94, 0xb4,
+	0x9a, 0x32, 0x4b, 0xb8, 0xc9, 0x53, 0xbb, 0x0d, 0xab, 0xac, 0x9f, 0xef, 0x62, 0x1d, 0xa6, 0x8a,
+	0x7d, 0x28, 0x9f, 0x95, 0x7c, 0xba, 0x8b, 0xdc, 0x6a, 0x2a, 0x0d, 0x65, 0x56, 0x28, 0xd9, 0x5c,
+	0x97, 0x56, 0x83, 0x1f, 0x7b, 0x10, 0x9e, 0x53, 0x73, 0x2a, 0xa3, 0x97, 0x9c, 0x1b, 0x64, 0xe0,
+	0xd1, 0x29, 0x63, 0x79, 0x96, 0xa7, 0xd4, 0x72, 0x07, 0x75, 0x41, 0x1f, 0x0c, 0x0f, 0xc6, 0xd3,
+	0x6f, 0x3f, 0x1f, 0xbf, 0xc8, 0xa8, 0x4d, 0x82, 0x50, 0xc4, 0xfe, 0x54, 0xda, 0x67, 0x3b, 0x9c,
+	0xc1, 0x1f, 0x8b, 0x78, 0x2a, 0xed, 0x84, 0x1a, 0xcb, 0x35, 0xf9, 0xbb, 0x03, 0x52, 0xf0, 0xf0,
+	0x8c, 0xcf, 0x79, 0xaa, 0x2e, 0xb9, 0x76, 0x2d, 0xf7, 0xfe, 0x77, 0xcb, 0xbb, 0xfe, 0xa8, 0x0f,
+	0x3b, 0xe7, 0xd4, 0xbc, 0xd1, 0x6a, 0x2e, 0x22, 0x1e, 0x75, 0x5b, 0x7d, 0x30, 0x6c, 0x93, 0x26,
+	0x84, 0x06, 0xf0, 0x60, 0x53, 0x72, 0x49, 0x53, 0xf1, 0x91, 0x47, 0xdd, 0xb6, 0xa3, 0xdc, 0xc1,
+	0x2a, 0x17, 0xc2, 0x2f, 0x72, 0xb9, 0x71, 0xd9, 0xaf, 0x5d, 0x6e, 0xa0, 0xc1, 0x97, 0x3d, 0x78,
+	0x38, 0xbb, 0xc9, 0xe2, 0x6c, 0x42, 0x0c, 0xea, 0xc1, 0xfb, 0x5a, 0x29, 0xfb, 0x8a, 0x9a, 0xa4,
+	0xbc, 0x58, 0x52, 0xd7, 0xc8, 0x87, 0x6d, 0xc3, 0xf4, 0xe6, 0xeb, 0x5b, 0xc3, 0xce, 0x49, 0xaf,
+	0x1c, 0x90, 0x3f, 0xfb, 0x37, 0x44, 0xc4, 0xf1, 0xd0, 0x19, 0x3c, 0x16, 0x72, 0x4e, 0x53, 0x11,
+	0xbd, 0xbd, 0x1d, 0xab, 0xe9, 0xb6, 0x9c, 0x1c, 0x55, 0xf2, 0xc6, 0x16, 0xd9, 0x46, 0x47, 0x63,
+	0x78, 0x5c, 0xff, 0x2e, 0xaf, 0x85, 0x14, 0xe3, 0x4d, 0xce, 0x4c, 0xb7, 0xed, 0x5c, 0x1e, 0x56,
+	0x2e, 0xf5, 0x06, 0xd9, 0x46, 0x46, 0x4f, 0x20, 0x8c, 0xeb, 0x0c, 0xb9, 0x8b, 0xe8, 0x9c, 0x3c,
+	0xaa, 0xa4, 0xb7, 0xe1, 0x22, 0x0d, 0xd2, 0x78, 0xb2, 0x58, 0x61, 0x6f, 0xb9, 0xc2, 0xde, 0xf5,
+	0x0a, 0x83, 0x4f, 0x05, 0x06, 0x5f, 0x0b, 0x0c, 0xbe, 0x17, 0x18, 0x2c, 0x0a, 0x0c, 0x96, 0x05,
+	0x06, 0xbf, 0x0a, 0x0c, 0x7e, 0x17, 0xd8, 0xbb, 0x2e, 0x30, 0xf8, 0xbc, 0xc6, 0xde, 0x62, 0x8d,
+	0xbd, 0xe5, 0x1a, 0x7b, 0xef, 0x1f, 0xd4, 0x27, 0x08, 0xef, 0xb9, 0x16, 0x4f, 0xff, 0x04, 0x00,
+	0x00, 0xff, 0xff, 0x81, 0x81, 0x3b, 0xd5, 0xf1, 0x03, 0x00, 0x00,
 }
 
 func (this *GasAndFees) Equal(that interface{}) bool {
@@ -235,13 +235,13 @@ func (this *GasAndFees) Equal(that interface{}) bool {
 		return false
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.AccumulatedFees, that1.AccumulatedFees) {
 			return false
 		}
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.DeveloperFees, that1.DeveloperFees) {
 			return false
 		}
@@ -388,7 +388,7 @@ func (m *GasAndFees) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		dAtA[i] = 0x18
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.DeveloperFees)
 		i -= size
 		if _, err := __caster.MarshalTo(m.DeveloperFees, dAtA[i:]); err != nil {
@@ -399,7 +399,7 @@ func (m *GasAndFees) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i--
 	dAtA[i] = 0x12
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.AccumulatedFees)
 		i -= size
 		if _, err := __caster.MarshalTo(m.AccumulatedFees, dAtA[i:]); err != nil {
@@ -514,12 +514,12 @@ func (m *GasAndFees) Size() (n int) {
 	var l int
 	_ = l
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.AccumulatedFees)
 		n += 1 + l + sovScheduled(uint64(l))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.DeveloperFees)
 		n += 1 + l + sovScheduled(uint64(l))
 	}
@@ -686,7 +686,7 @@ func (m *GasAndFees) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
@@ -724,7 +724,7 @@ func (m *GasAndFees) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
diff --git a/data/scheduled/scheduled.proto b/data/scheduled/scheduled.proto
index 65ef42d9b..2949edb80 100644
--- a/data/scheduled/scheduled.proto
+++ b/data/scheduled/scheduled.proto
@@ -6,13 +6,13 @@ option go_package = "scheduled";
 option (gogoproto.stable_marshaler_all) = true;
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
-import "github.com/ElrondNetwork/elrond-go-core/data/smartContractResult/smartContractResult.proto";
-import "github.com/ElrondNetwork/elrond-go-core/data/block/block.proto";
-import "github.com/ElrondNetwork/elrond-go-core/data/transaction/transaction.proto";
+import "github.com/multiversx/mx-chain-core-go/data/smartContractResult/smartContractResult.proto";
+import "github.com/multiversx/mx-chain-core-go/data/block/block.proto";
+import "github.com/multiversx/mx-chain-core-go/data/transaction/transaction.proto";
 
 message GasAndFees {
-  bytes AccumulatedFees = 1 [(gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
-  bytes DeveloperFees = 2 [(gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
+  bytes AccumulatedFees = 1 [(gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
+  bytes DeveloperFees = 2 [(gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
   uint64 GasProvided = 3;
   uint64 GasPenalized = 4;
   uint64 GasRefunded = 5;
diff --git a/data/scheduled/scheduled_test.go b/data/scheduled/scheduled_test.go
index 84ec12f7a..81c952109 100644
--- a/data/scheduled/scheduled_test.go
+++ b/data/scheduled/scheduled_test.go
@@ -3,11 +3,11 @@ package scheduled_test
 import (
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/data/block"
-	"github.com/ElrondNetwork/elrond-go-core/data/scheduled"
-	"github.com/ElrondNetwork/elrond-go-core/data/smartContractResult"
-	"github.com/ElrondNetwork/elrond-go-core/data/transaction"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/block"
+	"github.com/multiversx/mx-chain-core-go/data/scheduled"
+	"github.com/multiversx/mx-chain-core-go/data/smartContractResult"
+	"github.com/multiversx/mx-chain-core-go/data/transaction"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/data/smartContractResult/smartContractResult.go b/data/smartContractResult/smartContractResult.go
index 22ca32668..c6ab0f8a6 100644
--- a/data/smartContractResult/smartContractResult.go
+++ b/data/smartContractResult/smartContractResult.go
@@ -1,10 +1,10 @@
-//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/ElrondNetwork/protobuf/protobuf  --gogoslick_out=. smartContractResult.proto
+//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/multiversx/protobuf/protobuf  --gogoslick_out=. smartContractResult.proto
 package smartContractResult
 
 import (
 	"math/big"
 
-	"github.com/ElrondNetwork/elrond-go-core/data"
+	"github.com/multiversx/mx-chain-core-go/data"
 )
 
 var _ = data.TransactionHandler(&SmartContractResult{})
diff --git a/data/smartContractResult/smartContractResult.pb.go b/data/smartContractResult/smartContractResult.pb.go
index 7d21b11ea..45422ffd6 100644
--- a/data/smartContractResult/smartContractResult.pb.go
+++ b/data/smartContractResult/smartContractResult.pb.go
@@ -6,10 +6,10 @@ package smartContractResult
 import (
 	bytes "bytes"
 	fmt "fmt"
-	github_com_ElrondNetwork_elrond_go_core_data "github.com/ElrondNetwork/elrond-go-core/data"
-	github_com_ElrondNetwork_elrond_go_core_data_vm "github.com/ElrondNetwork/elrond-go-core/data/vm"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
+	github_com_multiversx_mx_chain_core_go_data "github.com/multiversx/mx-chain-core-go/data"
+	github_com_multiversx_mx_chain_core_go_data_vm "github.com/multiversx/mx-chain-core-go/data/vm"
 	io "io"
 	math "math"
 	math_big "math/big"
@@ -30,22 +30,22 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 type SmartContractResult struct {
-	Nonce          uint64                                                   `protobuf:"varint,1,opt,name=Nonce,proto3" json:"nonce"`
-	Value          *math_big.Int                                            `protobuf:"bytes,2,opt,name=Value,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"value"`
-	RcvAddr        []byte                                                   `protobuf:"bytes,3,opt,name=RcvAddr,proto3" json:"receiver"`
-	SndAddr        []byte                                                   `protobuf:"bytes,4,opt,name=SndAddr,proto3" json:"sender"`
-	RelayerAddr    []byte                                                   `protobuf:"bytes,5,opt,name=RelayerAddr,proto3" json:"relayer"`
-	RelayedValue   *math_big.Int                                            `protobuf:"bytes,6,opt,name=RelayedValue,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"relayedValue"`
-	Code           []byte                                                   `protobuf:"bytes,7,opt,name=Code,proto3" json:"code,omitempty"`
-	Data           []byte                                                   `protobuf:"bytes,8,opt,name=Data,proto3" json:"data,omitempty"`
-	PrevTxHash     []byte                                                   `protobuf:"bytes,9,opt,name=PrevTxHash,proto3" json:"prevTxHash"`
-	OriginalTxHash []byte                                                   `protobuf:"bytes,10,opt,name=OriginalTxHash,proto3" json:"originalTxHash"`
-	GasLimit       uint64                                                   `protobuf:"varint,11,opt,name=GasLimit,proto3" json:"gasLimit"`
-	GasPrice       uint64                                                   `protobuf:"varint,12,opt,name=GasPrice,proto3" json:"gasPrice"`
-	CallType       github_com_ElrondNetwork_elrond_go_core_data_vm.CallType `protobuf:"varint,13,opt,name=CallType,proto3,casttype=github.com/ElrondNetwork/elrond-go-core/data/vm.CallType" json:"callType"`
-	CodeMetadata   []byte                                                   `protobuf:"bytes,14,opt,name=CodeMetadata,proto3" json:"codeMetadata,omitempty"`
-	ReturnMessage  []byte                                                   `protobuf:"bytes,15,opt,name=ReturnMessage,proto3" json:"returnMessage,omitempty"`
-	OriginalSender []byte                                                   `protobuf:"bytes,16,opt,name=OriginalSender,proto3" json:"originalSender,omitempty"`
+	Nonce          uint64                                                  `protobuf:"varint,1,opt,name=Nonce,proto3" json:"nonce"`
+	Value          *math_big.Int                                           `protobuf:"bytes,2,opt,name=Value,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"value"`
+	RcvAddr        []byte                                                  `protobuf:"bytes,3,opt,name=RcvAddr,proto3" json:"receiver"`
+	SndAddr        []byte                                                  `protobuf:"bytes,4,opt,name=SndAddr,proto3" json:"sender"`
+	RelayerAddr    []byte                                                  `protobuf:"bytes,5,opt,name=RelayerAddr,proto3" json:"relayer"`
+	RelayedValue   *math_big.Int                                           `protobuf:"bytes,6,opt,name=RelayedValue,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"relayedValue"`
+	Code           []byte                                                  `protobuf:"bytes,7,opt,name=Code,proto3" json:"code,omitempty"`
+	Data           []byte                                                  `protobuf:"bytes,8,opt,name=Data,proto3" json:"data,omitempty"`
+	PrevTxHash     []byte                                                  `protobuf:"bytes,9,opt,name=PrevTxHash,proto3" json:"prevTxHash"`
+	OriginalTxHash []byte                                                  `protobuf:"bytes,10,opt,name=OriginalTxHash,proto3" json:"originalTxHash"`
+	GasLimit       uint64                                                  `protobuf:"varint,11,opt,name=GasLimit,proto3" json:"gasLimit"`
+	GasPrice       uint64                                                  `protobuf:"varint,12,opt,name=GasPrice,proto3" json:"gasPrice"`
+	CallType       github_com_multiversx_mx_chain_core_go_data_vm.CallType `protobuf:"varint,13,opt,name=CallType,proto3,casttype=github.com/multiversx/mx-chain-core-go/data/vm.CallType" json:"callType"`
+	CodeMetadata   []byte                                                  `protobuf:"bytes,14,opt,name=CodeMetadata,proto3" json:"codeMetadata,omitempty"`
+	ReturnMessage  []byte                                                  `protobuf:"bytes,15,opt,name=ReturnMessage,proto3" json:"returnMessage,omitempty"`
+	OriginalSender []byte                                                  `protobuf:"bytes,16,opt,name=OriginalSender,proto3" json:"originalSender,omitempty"`
 }
 
 func (m *SmartContractResult) Reset()      { *m = SmartContractResult{} }
@@ -160,7 +160,7 @@ func (m *SmartContractResult) GetGasPrice() uint64 {
 	return 0
 }
 
-func (m *SmartContractResult) GetCallType() github_com_ElrondNetwork_elrond_go_core_data_vm.CallType {
+func (m *SmartContractResult) GetCallType() github_com_multiversx_mx_chain_core_go_data_vm.CallType {
 	if m != nil {
 		return m.CallType
 	}
@@ -195,46 +195,46 @@ func init() {
 func init() { proto.RegisterFile("smartContractResult.proto", fileDescriptor_edc1605de0d3d805) }
 
 var fileDescriptor_edc1605de0d3d805 = []byte{
-	// 610 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x41, 0x6f, 0xd3, 0x30,
-	0x14, 0xc7, 0x6b, 0xb6, 0xae, 0x9d, 0xd7, 0x15, 0xe4, 0x49, 0x60, 0x06, 0xb2, 0x27, 0x84, 0xa6,
-	0x1e, 0x68, 0x72, 0xe0, 0x82, 0x40, 0x42, 0x5a, 0x3b, 0x60, 0x93, 0xd8, 0x98, 0xdc, 0x89, 0xc3,
-	0x6e, 0x6e, 0x62, 0xb2, 0x88, 0x24, 0xae, 0x1c, 0xb7, 0xb0, 0x0b, 0xe2, 0x23, 0xf0, 0x31, 0x10,
-	0x9f, 0x84, 0xe3, 0x8e, 0xbb, 0x10, 0x58, 0x76, 0x41, 0x39, 0xed, 0xcc, 0x09, 0xc5, 0xe9, 0xba,
-	0x64, 0x70, 0x41, 0xe2, 0xd4, 0xbe, 0xff, 0xff, 0xf7, 0xfe, 0xaf, 0x7e, 0xb5, 0x0c, 0x6f, 0xc7,
-	0x21, 0x57, 0xba, 0x2f, 0x23, 0xad, 0xb8, 0xa3, 0x99, 0x88, 0xc7, 0x81, 0xb6, 0x46, 0x4a, 0x6a,
-	0x89, 0xea, 0xe6, 0x63, 0xb5, 0xeb, 0xf9, 0xfa, 0x70, 0x3c, 0xb4, 0x1c, 0x19, 0xda, 0x9e, 0xf4,
-	0xa4, 0x6d, 0xe4, 0xe1, 0xf8, 0x8d, 0xa9, 0x4c, 0x61, 0xbe, 0x15, 0x5d, 0xf7, 0xbe, 0x35, 0xe0,
-	0xca, 0xe0, 0xcf, 0x4c, 0x44, 0x61, 0x7d, 0x57, 0x46, 0x8e, 0xc0, 0x60, 0x0d, 0x74, 0xe6, 0x7b,
-	0x8b, 0x59, 0x42, 0xeb, 0x51, 0x2e, 0xb0, 0x42, 0x47, 0x3e, 0xac, 0xbf, 0xe6, 0xc1, 0x58, 0xe0,
-	0x6b, 0x6b, 0xa0, 0xd3, 0xea, 0x0d, 0x72, 0x60, 0x92, 0x0b, 0x5f, 0xbe, 0xd3, 0xe7, 0x21, 0xd7,
-	0x87, 0xf6, 0xd0, 0xf7, 0xac, 0xed, 0x48, 0x3f, 0x29, 0xfd, 0xa0, 0x67, 0x81, 0x92, 0x91, 0xbb,
-	0x2b, 0xf4, 0x3b, 0xa9, 0xde, 0xda, 0xc2, 0x54, 0x5d, 0x4f, 0x76, 0x1d, 0xa9, 0x84, 0xed, 0x72,
-	0xcd, 0xad, 0x9e, 0xef, 0x6d, 0x47, 0xba, 0xcf, 0x63, 0x2d, 0x14, 0x2b, 0x26, 0xa0, 0x75, 0xd8,
-	0x60, 0xce, 0x64, 0xc3, 0x75, 0x15, 0x9e, 0x33, 0xc3, 0x5a, 0x59, 0x42, 0x9b, 0x4a, 0x38, 0xc2,
-	0x9f, 0x08, 0xc5, 0x2e, 0x4c, 0x74, 0x1f, 0x36, 0x06, 0x91, 0x6b, 0xb8, 0x79, 0xc3, 0xc1, 0x2c,
-	0xa1, 0x0b, 0xb1, 0x88, 0xdc, 0x9c, 0x9a, 0x5a, 0xa8, 0x0b, 0x97, 0x98, 0x08, 0xf8, 0x91, 0x50,
-	0x86, 0xac, 0x1b, 0x72, 0x29, 0x4b, 0x68, 0x43, 0x15, 0x32, 0x2b, 0xfb, 0xe8, 0x03, 0x6c, 0x15,
-	0xa5, 0x5b, 0x1c, 0x77, 0xc1, 0xf0, 0x07, 0x59, 0x42, 0x5b, 0xaa, 0xa4, 0xff, 0xc7, 0x53, 0x57,
-	0xe6, 0xa1, 0x75, 0x38, 0xdf, 0x97, 0xae, 0xc0, 0x0d, 0x33, 0x17, 0x65, 0x09, 0x6d, 0x3b, 0xd2,
-	0x15, 0x0f, 0x64, 0xe8, 0x6b, 0x11, 0x8e, 0xf4, 0x11, 0x33, 0x7e, 0xce, 0x6d, 0x72, 0xcd, 0x71,
-	0xf3, 0x92, 0xcb, 0xa3, 0xcb, 0x5c, 0xee, 0x23, 0x0b, 0xc2, 0x3d, 0x25, 0x26, 0xfb, 0xef, 0xb7,
-	0x78, 0x7c, 0x88, 0x17, 0x0d, 0xdd, 0xce, 0x12, 0x0a, 0x47, 0x33, 0x95, 0x95, 0x08, 0xf4, 0x18,
-	0xb6, 0x5f, 0x29, 0xdf, 0xf3, 0x23, 0x1e, 0x4c, 0x7b, 0xe0, 0xe5, 0x04, 0x59, 0x71, 0xd8, 0x15,
-	0x12, 0x75, 0x60, 0xf3, 0x05, 0x8f, 0x5f, 0xfa, 0xa1, 0xaf, 0xf1, 0x92, 0xb9, 0x47, 0xe6, 0x9f,
-	0xf3, 0xa6, 0x1a, 0x9b, 0xb9, 0x53, 0x72, 0x4f, 0xf9, 0x8e, 0xc0, 0xad, 0x0a, 0x69, 0x34, 0x36,
-	0x73, 0x91, 0x0b, 0x9b, 0x7d, 0x1e, 0x04, 0xfb, 0x47, 0x23, 0x81, 0x97, 0xd7, 0x40, 0x67, 0xae,
-	0xb7, 0x95, 0x93, 0xce, 0x54, 0xfb, 0x95, 0xd0, 0x47, 0xff, 0xb2, 0x7a, 0x7b, 0x12, 0x5a, 0x17,
-	0x79, 0x6c, 0x96, 0x8c, 0x9e, 0xc2, 0x56, 0xbe, 0xd5, 0x1d, 0xa1, 0x79, 0x4e, 0xe1, 0xb6, 0x39,
-	0xf3, 0x6a, 0x96, 0xd0, 0x9b, 0x4e, 0x49, 0x2f, 0x6d, 0xb7, 0xc2, 0xa3, 0x0d, 0xb8, 0xcc, 0x84,
-	0x1e, 0xab, 0x68, 0x47, 0xc4, 0x31, 0xf7, 0x04, 0xbe, 0x6e, 0x02, 0xee, 0x64, 0x09, 0xbd, 0xa5,
-	0xca, 0x46, 0x29, 0xa1, 0xda, 0x81, 0x36, 0x2f, 0x17, 0x3f, 0x30, 0x57, 0x18, 0xdf, 0x30, 0x19,
-	0x77, 0xb3, 0x84, 0x62, 0x59, 0x71, 0x4a, 0x21, 0x57, 0x7a, 0x7a, 0x3b, 0xc7, 0xa7, 0xa4, 0x76,
-	0x72, 0x4a, 0x6a, 0xe7, 0xa7, 0x04, 0x7c, 0x4c, 0x09, 0xf8, 0x9c, 0x12, 0xf0, 0x35, 0x25, 0xe0,
-	0x38, 0x25, 0xe0, 0x24, 0x25, 0xe0, 0x47, 0x4a, 0xc0, 0xcf, 0x94, 0xd4, 0xce, 0x53, 0x02, 0x3e,
-	0x9d, 0x91, 0xda, 0xf1, 0x19, 0xa9, 0x9d, 0x9c, 0x91, 0xda, 0xc1, 0xca, 0x5f, 0x9e, 0x9a, 0xe1,
-	0x82, 0x79, 0x35, 0x1e, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xb4, 0x81, 0x4c, 0xd3, 0x88, 0x04,
-	0x00, 0x00,
+	// 613 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x41, 0x6f, 0xd3, 0x3e,
+	0x18, 0xc6, 0xeb, 0xff, 0xd6, 0xb5, 0xf3, 0xba, 0xfe, 0x91, 0x27, 0x81, 0x19, 0xc8, 0x9e, 0x10,
+	0x9a, 0x7a, 0xa0, 0xed, 0x81, 0x03, 0x12, 0x48, 0x48, 0x6b, 0x87, 0xc6, 0x24, 0x06, 0x93, 0x37,
+	0x21, 0xc1, 0xcd, 0x75, 0x4c, 0x1a, 0x29, 0x89, 0x2b, 0xc7, 0xa9, 0xb6, 0x03, 0x12, 0x1f, 0x81,
+	0x8f, 0x81, 0xf8, 0x24, 0x1c, 0x77, 0x9c, 0x38, 0x04, 0x96, 0x5d, 0x50, 0x4e, 0x3b, 0x73, 0x42,
+	0x71, 0xba, 0x2e, 0x19, 0x5c, 0x90, 0x38, 0x25, 0x7e, 0x9e, 0xdf, 0xfb, 0xbc, 0xf1, 0x1b, 0xcb,
+	0xf0, 0x76, 0x14, 0x70, 0x6d, 0x86, 0x2a, 0x34, 0x9a, 0x0b, 0xc3, 0x64, 0x14, 0xfb, 0xa6, 0x37,
+	0xd1, 0xca, 0x28, 0x54, 0xb7, 0x8f, 0xf5, 0xae, 0xeb, 0x99, 0x71, 0x3c, 0xea, 0x09, 0x15, 0xf4,
+	0x5d, 0xe5, 0xaa, 0xbe, 0x95, 0x47, 0xf1, 0x3b, 0xbb, 0xb2, 0x0b, 0xfb, 0x56, 0x54, 0xdd, 0xfb,
+	0xda, 0x80, 0x6b, 0x07, 0xbf, 0x67, 0x22, 0x0a, 0xeb, 0x2f, 0x55, 0x28, 0x24, 0x06, 0x1b, 0xa0,
+	0xb3, 0x38, 0x58, 0xce, 0x12, 0x5a, 0x0f, 0x73, 0x81, 0x15, 0x3a, 0x1a, 0xc3, 0xfa, 0x6b, 0xee,
+	0xc7, 0x12, 0xff, 0xb7, 0x01, 0x3a, 0xad, 0x01, 0xcb, 0x81, 0x69, 0x2e, 0x7c, 0xfe, 0x46, 0x9f,
+	0x05, 0xdc, 0x8c, 0xfb, 0x23, 0xcf, 0xed, 0xed, 0x86, 0xe6, 0x49, 0xe9, 0x83, 0x82, 0xd8, 0x37,
+	0xde, 0x54, 0xea, 0xe8, 0xa8, 0x1f, 0x1c, 0x75, 0xc5, 0x98, 0x7b, 0x61, 0x57, 0x28, 0x2d, 0xbb,
+	0xae, 0xea, 0x3b, 0xdc, 0xf0, 0xde, 0xc0, 0x73, 0x77, 0x43, 0x33, 0xe4, 0x91, 0x91, 0x9a, 0x15,
+	0x0d, 0xd0, 0x26, 0x6c, 0x30, 0x31, 0xdd, 0x72, 0x1c, 0x8d, 0x17, 0x6c, 0xaf, 0x56, 0x96, 0xd0,
+	0xa6, 0x96, 0x42, 0xe6, 0x51, 0xec, 0xd2, 0x44, 0xf7, 0x61, 0xe3, 0x20, 0x74, 0x2c, 0xb7, 0x68,
+	0x39, 0x98, 0x25, 0x74, 0x29, 0x92, 0xa1, 0x93, 0x53, 0x33, 0x0b, 0x75, 0xe1, 0x0a, 0x93, 0x3e,
+	0x3f, 0x96, 0xda, 0x92, 0x75, 0x4b, 0xae, 0x64, 0x09, 0x6d, 0xe8, 0x42, 0x66, 0x65, 0x1f, 0xbd,
+	0x87, 0xad, 0x62, 0xe9, 0x14, 0xbb, 0x5d, 0xb2, 0xfc, 0x9b, 0x2c, 0xa1, 0x2d, 0x5d, 0xd2, 0xff,
+	0xdd, 0xa6, 0x2b, 0xed, 0xd0, 0x26, 0x5c, 0x1c, 0x2a, 0x47, 0xe2, 0x86, 0x6d, 0x8b, 0xb2, 0x84,
+	0xb6, 0x85, 0x72, 0xe4, 0x03, 0x15, 0x78, 0x46, 0x06, 0x13, 0x73, 0xcc, 0xac, 0x9f, 0x73, 0xdb,
+	0xdc, 0x70, 0xdc, 0xbc, 0xe2, 0xf2, 0xe8, 0x32, 0x97, 0xfb, 0xa8, 0x07, 0xe1, 0xbe, 0x96, 0xd3,
+	0xc3, 0xa3, 0xe7, 0x3c, 0x1a, 0xe3, 0x65, 0x4b, 0xb7, 0xb3, 0x84, 0xc2, 0xc9, 0x5c, 0x65, 0x25,
+	0x02, 0x3d, 0x86, 0xed, 0x57, 0xda, 0x73, 0xbd, 0x90, 0xfb, 0xb3, 0x1a, 0x78, 0xd5, 0x41, 0x55,
+	0x1c, 0x76, 0x8d, 0x44, 0x1d, 0xd8, 0xdc, 0xe1, 0xd1, 0x0b, 0x2f, 0xf0, 0x0c, 0x5e, 0xb1, 0xa7,
+	0xc8, 0xfe, 0x38, 0x77, 0xa6, 0xb1, 0xb9, 0x3b, 0x23, 0xf7, 0xb5, 0x27, 0x24, 0x6e, 0x55, 0x48,
+	0xab, 0xb1, 0xb9, 0x8b, 0x04, 0x6c, 0x0e, 0xb9, 0xef, 0x1f, 0x1e, 0x4f, 0x24, 0x5e, 0xdd, 0x00,
+	0x9d, 0x85, 0xc1, 0x4e, 0x4e, 0x8a, 0x99, 0xf6, 0x33, 0xa1, 0x8f, 0xfe, 0x62, 0xf2, 0xfd, 0x69,
+	0xd0, 0xbb, 0x8c, 0x63, 0xf3, 0x60, 0xf4, 0x14, 0xb6, 0xf2, 0xa1, 0xee, 0x49, 0xc3, 0x73, 0x0a,
+	0xb7, 0xed, 0x96, 0xd7, 0xb3, 0x84, 0xde, 0x14, 0x25, 0xbd, 0x34, 0xdc, 0x0a, 0x8f, 0xb6, 0xe0,
+	0x2a, 0x93, 0x26, 0xd6, 0xe1, 0x9e, 0x8c, 0x22, 0xee, 0x4a, 0xfc, 0xbf, 0x0d, 0xb8, 0x93, 0x25,
+	0xf4, 0x96, 0x2e, 0x1b, 0xa5, 0x84, 0x6a, 0x05, 0xda, 0xbe, 0x9a, 0xfb, 0x81, 0x3d, 0xc0, 0xf8,
+	0x86, 0xcd, 0xb8, 0x9b, 0x25, 0x14, 0xab, 0x8a, 0x53, 0x0a, 0xb9, 0x56, 0x33, 0xd8, 0x3b, 0x39,
+	0x23, 0xb5, 0xd3, 0x33, 0x52, 0xbb, 0x38, 0x23, 0xe0, 0x43, 0x4a, 0xc0, 0xa7, 0x94, 0x80, 0x2f,
+	0x29, 0x01, 0x27, 0x29, 0x01, 0xa7, 0x29, 0x01, 0xdf, 0x53, 0x02, 0x7e, 0xa4, 0xa4, 0x76, 0x91,
+	0x12, 0xf0, 0xf1, 0x9c, 0xd4, 0x4e, 0xce, 0x49, 0xed, 0xf4, 0x9c, 0xd4, 0xde, 0xae, 0xfd, 0xe1,
+	0x9e, 0x19, 0x2d, 0xd9, 0x2b, 0xe3, 0xe1, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xee, 0x08, 0xc4,
+	0x90, 0x85, 0x04, 0x00, 0x00,
 }
 
 func (this *SmartContractResult) Equal(that interface{}) bool {
@@ -260,7 +260,7 @@ func (this *SmartContractResult) Equal(that interface{}) bool {
 		return false
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.Value, that1.Value) {
 			return false
 		}
@@ -275,7 +275,7 @@ func (this *SmartContractResult) Equal(that interface{}) bool {
 		return false
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.RelayedValue, that1.RelayedValue) {
 			return false
 		}
@@ -432,7 +432,7 @@ func (m *SmartContractResult) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		dAtA[i] = 0x3a
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.RelayedValue)
 		i -= size
 		if _, err := __caster.MarshalTo(m.RelayedValue, dAtA[i:]); err != nil {
@@ -464,7 +464,7 @@ func (m *SmartContractResult) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		dAtA[i] = 0x1a
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.Value)
 		i -= size
 		if _, err := __caster.MarshalTo(m.Value, dAtA[i:]); err != nil {
@@ -503,7 +503,7 @@ func (m *SmartContractResult) Size() (n int) {
 		n += 1 + sovSmartContractResult(uint64(m.Nonce))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.Value)
 		n += 1 + l + sovSmartContractResult(uint64(l))
 	}
@@ -520,7 +520,7 @@ func (m *SmartContractResult) Size() (n int) {
 		n += 1 + l + sovSmartContractResult(uint64(l))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.RelayedValue)
 		n += 1 + l + sovSmartContractResult(uint64(l))
 	}
@@ -681,7 +681,7 @@ func (m *SmartContractResult) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
@@ -821,7 +821,7 @@ func (m *SmartContractResult) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
@@ -1017,7 +1017,7 @@ func (m *SmartContractResult) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				m.CallType |= github_com_ElrondNetwork_elrond_go_core_data_vm.CallType(b&0x7F) << shift
+				m.CallType |= github_com_multiversx_mx_chain_core_go_data_vm.CallType(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
diff --git a/data/smartContractResult/smartContractResult.proto b/data/smartContractResult/smartContractResult.proto
index 0827559eb..4f074fc73 100644
--- a/data/smartContractResult/smartContractResult.proto
+++ b/data/smartContractResult/smartContractResult.proto
@@ -10,18 +10,18 @@ import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
 message SmartContractResult  {
 	uint64   Nonce          = 1  [(gogoproto.jsontag) = "nonce"];
-	bytes    Value          = 2  [(gogoproto.jsontag) = "value", (gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
+	bytes    Value          = 2  [(gogoproto.jsontag) = "value", (gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
 	bytes    RcvAddr        = 3  [(gogoproto.jsontag) = "receiver"];
 	bytes    SndAddr        = 4  [(gogoproto.jsontag) = "sender"];
 	bytes    RelayerAddr    = 5  [(gogoproto.jsontag) = "relayer"];
-	bytes    RelayedValue   = 6  [(gogoproto.jsontag) = "relayedValue", (gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
+	bytes    RelayedValue   = 6  [(gogoproto.jsontag) = "relayedValue", (gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
 	bytes    Code           = 7  [(gogoproto.jsontag) = "code,omitempty"];
 	bytes    Data           = 8  [(gogoproto.jsontag) = "data,omitempty"];
 	bytes    PrevTxHash     = 9  [(gogoproto.jsontag) = "prevTxHash"];
 	bytes    OriginalTxHash = 10 [(gogoproto.jsontag) = "originalTxHash"];
 	uint64   GasLimit       = 11 [(gogoproto.jsontag) = "gasLimit"];
 	uint64   GasPrice       = 12 [(gogoproto.jsontag) = "gasPrice"];
-	int64    CallType       = 13 [(gogoproto.jsontag) = "callType", (gogoproto.casttype) = "github.com/ElrondNetwork/elrond-go-core/data/vm.CallType"];
+	int64    CallType       = 13 [(gogoproto.jsontag) = "callType", (gogoproto.casttype) = "github.com/multiversx/mx-chain-core-go/data/vm.CallType"];
 	bytes    CodeMetadata   = 14 [(gogoproto.jsontag) = "codeMetadata,omitempty"];
 	bytes    ReturnMessage  = 15 [(gogoproto.jsontag) = "returnMessage,omitempty"];
 	bytes    OriginalSender = 16 [(gogoproto.jsontag) = "originalSender,omitempty"];
diff --git a/data/smartContractResult/smartContractResult_test.go b/data/smartContractResult/smartContractResult_test.go
index 4e02e9a21..75eba8287 100644
--- a/data/smartContractResult/smartContractResult_test.go
+++ b/data/smartContractResult/smartContractResult_test.go
@@ -4,8 +4,8 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/data/smartContractResult"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/smartContractResult"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/data/transaction/apiTransactionResult.go b/data/transaction/apiTransactionResult.go
index eda0349c0..20bdfcfa4 100644
--- a/data/transaction/apiTransactionResult.go
+++ b/data/transaction/apiTransactionResult.go
@@ -3,8 +3,8 @@ package transaction
 import (
 	"math/big"
 
-	"github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/data/vm"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/vm"
 )
 
 // ApiTransactionResult is the data transfer object which will be returned on the get transaction by hash endpoint
@@ -25,6 +25,7 @@ type ApiTransactionResult struct {
 	ReceiverUsername                  []byte                    `json:"receiverUsername,omitempty"`
 	GasPrice                          uint64                    `json:"gasPrice,omitempty"`
 	GasLimit                          uint64                    `json:"gasLimit,omitempty"`
+	GasUsed                           uint64                    `json:"gasUsed,omitempty"`
 	Data                              []byte                    `json:"data,omitempty"`
 	CodeMetadata                      []byte                    `json:"codeMetadata,omitempty"`
 	Code                              string                    `json:"code,omitempty"`
@@ -57,6 +58,7 @@ type ApiTransactionResult struct {
 	Operation                         string                    `json:"operation,omitempty"`
 	Function                          string                    `json:"function,omitempty"`
 	InitiallyPaidFee                  string                    `json:"initiallyPaidFee,omitempty"`
+	Fee                               string                    `json:"fee,omitempty"`
 	IsRelayed                         bool                      `json:"isRelayed,omitempty"`
 	IsRefund                          bool                      `json:"isRefund,omitempty"`
 	CallType                          string                    `json:"callType,omitempty"`
diff --git a/data/transaction/interface.go b/data/transaction/interface.go
index 5948f2dfa..cbc0bb1c6 100644
--- a/data/transaction/interface.go
+++ b/data/transaction/interface.go
@@ -1,6 +1,6 @@
 package transaction
 
-import "github.com/ElrondNetwork/elrond-go-core/data/block"
+import "github.com/multiversx/mx-chain-core-go/data/block"
 
 // StatusComputerHandler computes a transaction status
 type StatusComputerHandler interface {
diff --git a/data/transaction/log.go b/data/transaction/log.go
index 2bd9b6d17..3f917c0f3 100644
--- a/data/transaction/log.go
+++ b/data/transaction/log.go
@@ -1,8 +1,8 @@
-//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/ElrondNetwork/protobuf/protobuf  --gogoslick_out=. log.proto
+//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/multiversx/protobuf/protobuf  --gogoslick_out=. log.proto
 package transaction
 
 import (
-	"github.com/ElrondNetwork/elrond-go-core/data"
+	"github.com/multiversx/mx-chain-core-go/data"
 )
 
 // GetLogEvents returns the interface for the underlying events of the log structure
diff --git a/data/transaction/log_test.go b/data/transaction/log_test.go
index 148892e9a..34f88c687 100644
--- a/data/transaction/log_test.go
+++ b/data/transaction/log_test.go
@@ -3,8 +3,8 @@ package transaction_test
 import (
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/data/transaction"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/data/transaction"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/data/transaction/transaction.go b/data/transaction/transaction.go
index a4b663a52..921226220 100644
--- a/data/transaction/transaction.go
+++ b/data/transaction/transaction.go
@@ -1,12 +1,12 @@
-//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/ElrondNetwork/protobuf/protobuf  --gogoslick_out=. transaction.proto
+//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/multiversx/protobuf/protobuf  --gogoslick_out=. transaction.proto
 package transaction
 
 import (
 	"math/big"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/data"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/data"
 )
 
 var _ = data.TransactionHandler(&Transaction{})
diff --git a/data/transaction/transaction.pb.go b/data/transaction/transaction.pb.go
index a738f30e3..f663d0ada 100644
--- a/data/transaction/transaction.pb.go
+++ b/data/transaction/transaction.pb.go
@@ -6,9 +6,9 @@ package transaction
 import (
 	bytes "bytes"
 	fmt "fmt"
-	github_com_ElrondNetwork_elrond_go_core_data "github.com/ElrondNetwork/elrond-go-core/data"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
+	github_com_multiversx_mx_chain_core_go_data "github.com/multiversx/mx-chain-core-go/data"
 	io "io"
 	math "math"
 	math_big "math/big"
@@ -31,7 +31,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // Transaction holds all the data needed for a value transfer or SC call
 type Transaction struct {
 	Nonce             uint64        `protobuf:"varint,1,opt,name=Nonce,proto3" json:"nonce"`
-	Value             *math_big.Int `protobuf:"bytes,2,opt,name=Value,proto3,casttypewith=math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster" json:"value"`
+	Value             *math_big.Int `protobuf:"bytes,2,opt,name=Value,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"value"`
 	RcvAddr           []byte        `protobuf:"bytes,3,opt,name=RcvAddr,proto3" json:"receiver"`
 	RcvUserName       []byte        `protobuf:"bytes,4,opt,name=RcvUserName,proto3" json:"rcvUserName,omitempty"`
 	SndAddr           []byte        `protobuf:"bytes,5,opt,name=SndAddr,proto3" json:"sender"`
@@ -249,7 +249,7 @@ func (this *Transaction) Equal(that interface{}) bool {
 		return false
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		if !__caster.Equal(this.Value, that1.Value) {
 			return false
 		}
@@ -431,7 +431,7 @@ func (m *Transaction) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		dAtA[i] = 0x1a
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		size := __caster.Size(m.Value)
 		i -= size
 		if _, err := __caster.MarshalTo(m.Value, dAtA[i:]); err != nil {
@@ -470,7 +470,7 @@ func (m *Transaction) Size() (n int) {
 		n += 1 + sovTransaction(uint64(m.Nonce))
 	}
 	{
-		__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+		__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 		l = __caster.Size(m.Value)
 		n += 1 + l + sovTransaction(uint64(l))
 	}
@@ -641,7 +641,7 @@ func (m *Transaction) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			{
-				__caster := &github_com_ElrondNetwork_elrond_go_core_data.BigIntCaster{}
+				__caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{}
 				if tmp, err := __caster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				} else {
diff --git a/data/transaction/transaction.proto b/data/transaction/transaction.proto
index b2377173e..e99597d18 100644
--- a/data/transaction/transaction.proto
+++ b/data/transaction/transaction.proto
@@ -16,7 +16,7 @@ import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 // Transaction holds all the data needed for a value transfer or SC call
 message Transaction {
 	uint64   Nonce             = 1  [(gogoproto.jsontag) = "nonce"];
-	bytes    Value             = 2  [(gogoproto.jsontag) = "value", (gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go-core/data.BigIntCaster"];
+	bytes    Value             = 2  [(gogoproto.jsontag) = "value", (gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
 	bytes    RcvAddr           = 3  [(gogoproto.jsontag) = "receiver"];
 	bytes    RcvUserName       = 4  [(gogoproto.jsontag) = "rcvUserName,omitempty"];
 	bytes    SndAddr           = 5  [(gogoproto.jsontag) = "sender"];
diff --git a/data/transaction/transaction_test.go b/data/transaction/transaction_test.go
index e38d1f1c4..ed76b2a4d 100644
--- a/data/transaction/transaction_test.go
+++ b/data/transaction/transaction_test.go
@@ -6,10 +6,10 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/data/mock"
-	"github.com/ElrondNetwork/elrond-go-core/data/transaction"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/mock"
+	"github.com/multiversx/mx-chain-core-go/data/transaction"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/data/typeConverters/uint64ByteSlice/bigEndianConverter.go b/data/typeConverters/uint64ByteSlice/bigEndianConverter.go
index dac99af0f..fcca54cf9 100644
--- a/data/typeConverters/uint64ByteSlice/bigEndianConverter.go
+++ b/data/typeConverters/uint64ByteSlice/bigEndianConverter.go
@@ -3,7 +3,7 @@ package uint64ByteSlice
 import (
 	"encoding/binary"
 
-	"github.com/ElrondNetwork/elrond-go-core/data/typeConverters"
+	"github.com/multiversx/mx-chain-core-go/data/typeConverters"
 )
 
 type bigEndianConverter struct {
diff --git a/data/typeConverters/uint64ByteSlice/bigEndianConverter_test.go b/data/typeConverters/uint64ByteSlice/bigEndianConverter_test.go
index f05dcf9bf..20b6c1bcf 100644
--- a/data/typeConverters/uint64ByteSlice/bigEndianConverter_test.go
+++ b/data/typeConverters/uint64ByteSlice/bigEndianConverter_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/data/typeConverters"
-	"github.com/ElrondNetwork/elrond-go-core/data/typeConverters/uint64ByteSlice"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/data/typeConverters"
+	"github.com/multiversx/mx-chain-core-go/data/typeConverters/uint64ByteSlice"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/display/placeholders_test.go b/display/placeholders_test.go
index b0d0d2772..f176fd058 100644
--- a/display/placeholders_test.go
+++ b/display/placeholders_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/display"
+	"github.com/multiversx/mx-chain-core-go/display"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go.mod b/go.mod
index 22eb60163..75abb36b0 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/ElrondNetwork/elrond-go-core
+module github.com/multiversx/mx-chain-core-go
 
 go 1.17
 
@@ -25,4 +25,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
 )
 
-replace github.com/gogo/protobuf => github.com/ElrondNetwork/protobuf v1.3.2
+replace github.com/gogo/protobuf => github.com/multiversx/protobuf v1.3.2
diff --git a/go.sum b/go.sum
index 72281b735..c3c008783 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,3 @@
-github.com/ElrondNetwork/protobuf v1.3.2 h1:qoCSYiO+8GtXBEZWEjw0WPcZfM3g7QuuJrwpN+y6Mvg=
-github.com/ElrondNetwork/protobuf v1.3.2/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
@@ -64,6 +62,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
 github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
+github.com/multiversx/protobuf v1.3.2 h1:RaNkxvGTGbA0lMcnHAN24qE1G1i+Xs5yHA6MDvQ4mSM=
+github.com/multiversx/protobuf v1.3.2/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
diff --git a/hashing/blake2b/blake2b.go b/hashing/blake2b/blake2b.go
index 270a3c6c9..2a6b843ef 100644
--- a/hashing/blake2b/blake2b.go
+++ b/hashing/blake2b/blake2b.go
@@ -3,7 +3,7 @@ package blake2b
 import (
 	"hash"
 
-	"github.com/ElrondNetwork/elrond-go-core/hashing"
+	"github.com/multiversx/mx-chain-core-go/hashing"
 	blake2bLib "golang.org/x/crypto/blake2b"
 )
 
diff --git a/hashing/blake2b/blake2b_test.go b/hashing/blake2b/blake2b_test.go
index 44bc3ce4b..cd6200c69 100644
--- a/hashing/blake2b/blake2b_test.go
+++ b/hashing/blake2b/blake2b_test.go
@@ -3,7 +3,7 @@ package blake2b_test
 import (
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/hashing/blake2b"
+	"github.com/multiversx/mx-chain-core-go/hashing/blake2b"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	blake2bLib "golang.org/x/crypto/blake2b"
diff --git a/hashing/factory/hasherFactory.go b/hashing/factory/hasherFactory.go
index e6b188a83..64b5d63ad 100644
--- a/hashing/factory/hasherFactory.go
+++ b/hashing/factory/hasherFactory.go
@@ -1,10 +1,10 @@
 package factory
 
 import (
-	"github.com/ElrondNetwork/elrond-go-core/hashing"
-	"github.com/ElrondNetwork/elrond-go-core/hashing/blake2b"
-	"github.com/ElrondNetwork/elrond-go-core/hashing/keccak"
-	"github.com/ElrondNetwork/elrond-go-core/hashing/sha256"
+	"github.com/multiversx/mx-chain-core-go/hashing"
+	"github.com/multiversx/mx-chain-core-go/hashing/blake2b"
+	"github.com/multiversx/mx-chain-core-go/hashing/keccak"
+	"github.com/multiversx/mx-chain-core-go/hashing/sha256"
 )
 
 // NewHasher will return a new instance of hasher based on the value stored in config
diff --git a/hashing/factory/hasherFactory_test.go b/hashing/factory/hasherFactory_test.go
index 8a70838dd..6ea9fa90a 100644
--- a/hashing/factory/hasherFactory_test.go
+++ b/hashing/factory/hasherFactory_test.go
@@ -3,9 +3,9 @@ package factory
 import (
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/hashing"
-	"github.com/ElrondNetwork/elrond-go-core/hashing/blake2b"
-	"github.com/ElrondNetwork/elrond-go-core/hashing/sha256"
+	"github.com/multiversx/mx-chain-core-go/hashing"
+	"github.com/multiversx/mx-chain-core-go/hashing/blake2b"
+	"github.com/multiversx/mx-chain-core-go/hashing/sha256"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/hashing/fnv/fnv.go b/hashing/fnv/fnv.go
index 300007c29..9361095d9 100644
--- a/hashing/fnv/fnv.go
+++ b/hashing/fnv/fnv.go
@@ -3,7 +3,7 @@ package fnv
 import (
 	fnvLib "hash/fnv"
 
-	"github.com/ElrondNetwork/elrond-go-core/hashing"
+	"github.com/multiversx/mx-chain-core-go/hashing"
 )
 
 var _ hashing.Hasher = (*fnv)(nil)
diff --git a/hashing/hasher_test.go b/hashing/hasher_test.go
index 746fab8c2..ec7245b10 100644
--- a/hashing/hasher_test.go
+++ b/hashing/hasher_test.go
@@ -4,11 +4,11 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/hashing"
-	"github.com/ElrondNetwork/elrond-go-core/hashing/blake2b"
-	"github.com/ElrondNetwork/elrond-go-core/hashing/fnv"
-	"github.com/ElrondNetwork/elrond-go-core/hashing/keccak"
-	"github.com/ElrondNetwork/elrond-go-core/hashing/sha256"
+	"github.com/multiversx/mx-chain-core-go/hashing"
+	"github.com/multiversx/mx-chain-core-go/hashing/blake2b"
+	"github.com/multiversx/mx-chain-core-go/hashing/fnv"
+	"github.com/multiversx/mx-chain-core-go/hashing/keccak"
+	"github.com/multiversx/mx-chain-core-go/hashing/sha256"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/hashing/keccak/keccak.go b/hashing/keccak/keccak.go
index 1712f8ca2..c39920d2b 100644
--- a/hashing/keccak/keccak.go
+++ b/hashing/keccak/keccak.go
@@ -1,7 +1,7 @@
 package keccak
 
 import (
-	"github.com/ElrondNetwork/elrond-go-core/hashing"
+	"github.com/multiversx/mx-chain-core-go/hashing"
 	"golang.org/x/crypto/sha3"
 )
 
diff --git a/hashing/sha256/sha256.go b/hashing/sha256/sha256.go
index 9517ead9e..079782e8b 100644
--- a/hashing/sha256/sha256.go
+++ b/hashing/sha256/sha256.go
@@ -3,7 +3,7 @@ package sha256
 import (
 	sha256Lib "crypto/sha256"
 
-	"github.com/ElrondNetwork/elrond-go-core/hashing"
+	"github.com/multiversx/mx-chain-core-go/hashing"
 )
 
 var _ hashing.Hasher = (*sha256)(nil)
diff --git a/marshal/benchmarks_test.go b/marshal/benchmarks_test.go
index 4f1b6b829..78405c328 100644
--- a/marshal/benchmarks_test.go
+++ b/marshal/benchmarks_test.go
@@ -6,9 +6,9 @@ import (
 	"math/rand"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/data/block"
-	"github.com/ElrondNetwork/elrond-go-core/data/transaction"
-	"github.com/ElrondNetwork/elrond-go-core/marshal"
+	"github.com/multiversx/mx-chain-core-go/data/block"
+	"github.com/multiversx/mx-chain-core-go/data/transaction"
+	"github.com/multiversx/mx-chain-core-go/marshal"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/marshal/factory/marshalizerFactory.go b/marshal/factory/marshalizerFactory.go
index a27ab8cce..4f8387475 100644
--- a/marshal/factory/marshalizerFactory.go
+++ b/marshal/factory/marshalizerFactory.go
@@ -3,7 +3,7 @@ package factory
 import (
 	"fmt"
 
-	"github.com/ElrondNetwork/elrond-go-core/marshal"
+	"github.com/multiversx/mx-chain-core-go/marshal"
 )
 
 // JsonMarshalizer is the name reserved for the json marshalizer
diff --git a/marshal/factory/marshalizerFactory_test.go b/marshal/factory/marshalizerFactory_test.go
index 0b9e94ec7..1c8e9a091 100644
--- a/marshal/factory/marshalizerFactory_test.go
+++ b/marshal/factory/marshalizerFactory_test.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/marshal"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/marshal"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/marshal/gogoProtoMarshalizer_test.go b/marshal/gogoProtoMarshalizer_test.go
index 8f2b08fba..2ceb9f423 100644
--- a/marshal/gogoProtoMarshalizer_test.go
+++ b/marshal/gogoProtoMarshalizer_test.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/data/block"
-	"github.com/ElrondNetwork/elrond-go-core/marshal"
+	"github.com/multiversx/mx-chain-core-go/data/block"
+	"github.com/multiversx/mx-chain-core-go/marshal"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -49,7 +49,7 @@ func TestGogoProtoMarshalizer_Marshal(t *testing.T) {
 
 func TestGogoProtoMarshalizer_MarshalWrongObj(t *testing.T) {
 
-	obj := "elrond"
+	obj := "multiversx"
 	encNode, err := recovedMarshal(obj)
 	assert.Nil(t, encNode)
 	assert.NotNil(t, err)
diff --git a/marshal/marshalizer_test.go b/marshal/marshalizer_test.go
index 7fce104e7..5ae9b8fde 100644
--- a/marshal/marshalizer_test.go
+++ b/marshal/marshalizer_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/marshal"
+	"github.com/multiversx/mx-chain-core-go/marshal"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/marshal/testSizeCheckUnmarshal/testStructs_test.go b/marshal/testSizeCheckUnmarshal/testStructs_test.go
index fbe2a92c2..cac76ae93 100644
--- a/marshal/testSizeCheckUnmarshal/testStructs_test.go
+++ b/marshal/testSizeCheckUnmarshal/testStructs_test.go
@@ -1,11 +1,11 @@
-//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/ElrondNetwork/protobuf/protobuf  --gogoslick_out=. testStruct.proto
+//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/multiversx/protobuf/protobuf  --gogoslick_out=. testStruct.proto
 
 package testSizeCheckUnmarshal
 
 import (
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/marshal"
+	"github.com/multiversx/mx-chain-core-go/marshal"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/storage/lrucache/capacity/capacityLRUCache.go b/storage/lrucache/capacity/capacityLRUCache.go
index cbb5f476e..275a440d6 100644
--- a/storage/lrucache/capacity/capacityLRUCache.go
+++ b/storage/lrucache/capacity/capacityLRUCache.go
@@ -4,7 +4,7 @@ import (
 	"container/list"
 	"sync"
 
-	"github.com/ElrondNetwork/elrond-go-core/storage"
+	"github.com/multiversx/mx-chain-core-go/storage"
 )
 
 // capacityLRU implements a non thread safe LRU Cache with a max capacity size
diff --git a/storage/lrucache/capacity/capacityLRUCache_test.go b/storage/lrucache/capacity/capacityLRUCache_test.go
index b9a6bf070..c59d4877e 100644
--- a/storage/lrucache/capacity/capacityLRUCache_test.go
+++ b/storage/lrucache/capacity/capacityLRUCache_test.go
@@ -3,8 +3,8 @@ package capacity
 import (
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/storage"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/storage"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/storage/lrucache/lrucache.go b/storage/lrucache/lrucache.go
index b8d0c44ba..93a8d767c 100644
--- a/storage/lrucache/lrucache.go
+++ b/storage/lrucache/lrucache.go
@@ -3,9 +3,9 @@ package lrucache
 import (
 	"sync"
 
-	"github.com/ElrondNetwork/elrond-go-core/storage"
-	"github.com/ElrondNetwork/elrond-go-core/storage/lrucache/capacity"
 	lru "github.com/hashicorp/golang-lru"
+	"github.com/multiversx/mx-chain-core-go/storage"
+	"github.com/multiversx/mx-chain-core-go/storage/lrucache/capacity"
 )
 
 var _ storage.Cacher = (*lruCache)(nil)
diff --git a/storage/lrucache/lrucache_test.go b/storage/lrucache/lrucache_test.go
index 7e34bdcaa..8265b00cf 100644
--- a/storage/lrucache/lrucache_test.go
+++ b/storage/lrucache/lrucache_test.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/storage"
-	"github.com/ElrondNetwork/elrond-go-core/storage/lrucache"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/storage"
+	"github.com/multiversx/mx-chain-core-go/storage/lrucache"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/storage/lrucache/simpleLRUCacheAdapter.go b/storage/lrucache/simpleLRUCacheAdapter.go
index 6affa266b..82b481bd3 100644
--- a/storage/lrucache/simpleLRUCacheAdapter.go
+++ b/storage/lrucache/simpleLRUCacheAdapter.go
@@ -1,6 +1,6 @@
 package lrucache
 
-import "github.com/ElrondNetwork/elrond-go-core/storage"
+import "github.com/multiversx/mx-chain-core-go/storage"
 
 // simpleLRUCacheAdapter provides an adapter between LRUCacheHandler and SizeLRUCacheHandler
 type simpleLRUCacheAdapter struct {
diff --git a/websocketOutportDriver/data/shared.go b/websocketOutportDriver/data/shared.go
index 5c4809538..414a98cf2 100644
--- a/websocketOutportDriver/data/shared.go
+++ b/websocketOutportDriver/data/shared.go
@@ -1,9 +1,9 @@
 package data
 
 import (
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/data/outport"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/outport"
 )
 
 // WsSendArgs holds the arguments needed for performing a web socket request
diff --git a/websocketOutportDriver/factory/factory.go b/websocketOutportDriver/factory/factory.go
index 2d532fc6e..2bdf8a8dd 100644
--- a/websocketOutportDriver/factory/factory.go
+++ b/websocketOutportDriver/factory/factory.go
@@ -3,14 +3,14 @@ package factory
 import (
 	"net/http"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/marshal"
-	"github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver"
-	outportData "github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/data"
-	"github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/sender"
 	"github.com/gorilla/mux"
 	"github.com/gorilla/websocket"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/marshal"
+	"github.com/multiversx/mx-chain-core-go/websocketOutportDriver"
+	outportData "github.com/multiversx/mx-chain-core-go/websocketOutportDriver/data"
+	"github.com/multiversx/mx-chain-core-go/websocketOutportDriver/sender"
 )
 
 // OutportDriverWebSocketSenderFactoryArgs holds the arguments needed for creating a outportDriverWebSocketSenderFactory
diff --git a/websocketOutportDriver/interface.go b/websocketOutportDriver/interface.go
index ab98af7c3..10c31c76f 100644
--- a/websocketOutportDriver/interface.go
+++ b/websocketOutportDriver/interface.go
@@ -1,9 +1,9 @@
 package websocketOutportDriver
 
 import (
-	"github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/data/outport"
-	outportSenderData "github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/data"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/outport"
+	outportSenderData "github.com/multiversx/mx-chain-core-go/websocketOutportDriver/data"
 )
 
 // Driver is an interface for saving node specific data to other storage.
diff --git a/websocketOutportDriver/mock/webSocketSenderStub.go b/websocketOutportDriver/mock/webSocketSenderStub.go
index 0c8aef277..e475245d6 100644
--- a/websocketOutportDriver/mock/webSocketSenderStub.go
+++ b/websocketOutportDriver/mock/webSocketSenderStub.go
@@ -1,7 +1,7 @@
 package mock
 
 import (
-	"github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/data"
+	"github.com/multiversx/mx-chain-core-go/websocketOutportDriver/data"
 )
 
 // WebSocketSenderStub -
diff --git a/websocketOutportDriver/payloadParser.go b/websocketOutportDriver/payloadParser.go
index f2ca7b7d9..43f682243 100644
--- a/websocketOutportDriver/payloadParser.go
+++ b/websocketOutportDriver/payloadParser.go
@@ -5,10 +5,10 @@ import (
 	"encoding/hex"
 	"fmt"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	dataCore "github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/data/outport"
-	"github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/data"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	dataCore "github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/outport"
+	"github.com/multiversx/mx-chain-core-go/websocketOutportDriver/data"
 )
 
 const (
@@ -106,7 +106,8 @@ func padUint32ByteSlice(initial []byte) []byte {
 	return append(padding, initial...)
 }
 
-func prepareArgsSaveBlock(args outport.ArgsSaveBlockData) outport.ArgsSaveBlockData {
+// PrepareArgsSaveBlock will prepare save block data
+func PrepareArgsSaveBlock(args outport.ArgsSaveBlockData) outport.ArgsSaveBlockData {
 	var pool *outport.Pool
 	if args.TransactionsPool != nil {
 		pool = &outport.Pool{
diff --git a/websocketOutportDriver/payloadParser_test.go b/websocketOutportDriver/payloadParser_test.go
index 3d099809b..7a97ca7d6 100644
--- a/websocketOutportDriver/payloadParser_test.go
+++ b/websocketOutportDriver/payloadParser_test.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/data/typeConverters/uint64ByteSlice"
-	"github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/data"
-	"github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/mock"
+	"github.com/multiversx/mx-chain-core-go/data/typeConverters/uint64ByteSlice"
+	"github.com/multiversx/mx-chain-core-go/websocketOutportDriver/data"
+	"github.com/multiversx/mx-chain-core-go/websocketOutportDriver/mock"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/websocketOutportDriver/sender/webSocketSender.go b/websocketOutportDriver/sender/webSocketSender.go
index 9236a9666..9bbfd2730 100644
--- a/websocketOutportDriver/sender/webSocketSender.go
+++ b/websocketOutportDriver/sender/webSocketSender.go
@@ -7,10 +7,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	outportData "github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/data"
 	"github.com/gorilla/websocket"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	outportData "github.com/multiversx/mx-chain-core-go/websocketOutportDriver/data"
 )
 
 var (
diff --git a/websocketOutportDriver/sender/webSocketSender_test.go b/websocketOutportDriver/sender/webSocketSender_test.go
index 6be062823..b150f733c 100644
--- a/websocketOutportDriver/sender/webSocketSender_test.go
+++ b/websocketOutportDriver/sender/webSocketSender_test.go
@@ -5,10 +5,10 @@ import (
 	"testing"
 	"time"
 
-	coreMock "github.com/ElrondNetwork/elrond-go-core/core/mock"
-	"github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/data"
-	"github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/mock"
 	"github.com/gorilla/websocket"
+	coreMock "github.com/multiversx/mx-chain-core-go/core/mock"
+	"github.com/multiversx/mx-chain-core-go/websocketOutportDriver/data"
+	"github.com/multiversx/mx-chain-core-go/websocketOutportDriver/mock"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/websocketOutportDriver/sender/websocketClientsHolder.go b/websocketOutportDriver/sender/websocketClientsHolder.go
index baa623f3b..2e2060087 100644
--- a/websocketOutportDriver/sender/websocketClientsHolder.go
+++ b/websocketOutportDriver/sender/websocketClientsHolder.go
@@ -3,7 +3,7 @@ package sender
 import (
 	"sync"
 
-	"github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/data"
+	"github.com/multiversx/mx-chain-core-go/websocketOutportDriver/data"
 )
 
 type websocketClientsHolder struct {
diff --git a/websocketOutportDriver/sender/websocketClientsHolder_test.go b/websocketOutportDriver/sender/websocketClientsHolder_test.go
index 18fa5ba27..8c06f4e3f 100644
--- a/websocketOutportDriver/sender/websocketClientsHolder_test.go
+++ b/websocketOutportDriver/sender/websocketClientsHolder_test.go
@@ -3,8 +3,8 @@ package sender
 import (
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/data"
-	"github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/mock"
+	"github.com/multiversx/mx-chain-core-go/websocketOutportDriver/data"
+	"github.com/multiversx/mx-chain-core-go/websocketOutportDriver/mock"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/websocketOutportDriver/tests/realtest/client/bin/main.go b/websocketOutportDriver/tests/realtest/client/bin/main.go
index d6dc4f487..b77f2ebb7 100644
--- a/websocketOutportDriver/tests/realtest/client/bin/main.go
+++ b/websocketOutportDriver/tests/realtest/client/bin/main.go
@@ -4,8 +4,8 @@ import (
 	"flag"
 	"log"
 
-	"github.com/ElrondNetwork/elrond-go-core/marshal"
-	"github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/tests/realtest/client"
+	"github.com/multiversx/mx-chain-core-go/marshal"
+	"github.com/multiversx/mx-chain-core-go/websocketOutportDriver/tests/realtest/client"
 )
 
 var (
diff --git a/websocketOutportDriver/tests/realtest/client/client.go b/websocketOutportDriver/tests/realtest/client/client.go
index aa62cab12..730502f63 100644
--- a/websocketOutportDriver/tests/realtest/client/client.go
+++ b/websocketOutportDriver/tests/realtest/client/client.go
@@ -9,14 +9,14 @@ import (
 	"os/signal"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/core/mock"
-	"github.com/ElrondNetwork/elrond-go-core/data/outport"
-	"github.com/ElrondNetwork/elrond-go-core/data/typeConverters/uint64ByteSlice"
-	"github.com/ElrondNetwork/elrond-go-core/marshal"
-	"github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver"
-	"github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/data"
 	"github.com/gorilla/websocket"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/core/mock"
+	"github.com/multiversx/mx-chain-core-go/data/outport"
+	"github.com/multiversx/mx-chain-core-go/data/typeConverters/uint64ByteSlice"
+	"github.com/multiversx/mx-chain-core-go/marshal"
+	"github.com/multiversx/mx-chain-core-go/websocketOutportDriver"
+	"github.com/multiversx/mx-chain-core-go/websocketOutportDriver/data"
 )
 
 // WSConn defines what a sender shall do
diff --git a/websocketOutportDriver/tests/realtest/server/interface.go b/websocketOutportDriver/tests/realtest/server/interface.go
index 758dad71a..df1393f71 100644
--- a/websocketOutportDriver/tests/realtest/server/interface.go
+++ b/websocketOutportDriver/tests/realtest/server/interface.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/data/outport"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/outport"
 )
 
 // Driver is an interface for saving node specific data to other storage.
diff --git a/websocketOutportDriver/tests/realtest/server/server.go b/websocketOutportDriver/tests/realtest/server/server.go
index ae33e7b17..29641eedb 100644
--- a/websocketOutportDriver/tests/realtest/server/server.go
+++ b/websocketOutportDriver/tests/realtest/server/server.go
@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/mock"
-	"github.com/ElrondNetwork/elrond-go-core/data/outport"
-	"github.com/ElrondNetwork/elrond-go-core/data/typeConverters/uint64ByteSlice"
-	"github.com/ElrondNetwork/elrond-go-core/marshal"
-	"github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/data"
-	"github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/factory"
+	"github.com/multiversx/mx-chain-core-go/core/mock"
+	"github.com/multiversx/mx-chain-core-go/data/outport"
+	"github.com/multiversx/mx-chain-core-go/data/typeConverters/uint64ByteSlice"
+	"github.com/multiversx/mx-chain-core-go/marshal"
+	"github.com/multiversx/mx-chain-core-go/websocketOutportDriver/data"
+	"github.com/multiversx/mx-chain-core-go/websocketOutportDriver/factory"
 )
 
 var jsonMarshaller = &marshal.JsonMarshalizer{}
diff --git a/websocketOutportDriver/websocketOutportDriverNodePart.go b/websocketOutportDriver/websocketOutportDriverNodePart.go
index 46e5556ec..dd374fd63 100644
--- a/websocketOutportDriver/websocketOutportDriverNodePart.go
+++ b/websocketOutportDriver/websocketOutportDriverNodePart.go
@@ -3,13 +3,13 @@ package websocketOutportDriver
 import (
 	"fmt"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	"github.com/ElrondNetwork/elrond-go-core/core/atomic"
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	"github.com/ElrondNetwork/elrond-go-core/data"
-	"github.com/ElrondNetwork/elrond-go-core/data/outport"
-	"github.com/ElrondNetwork/elrond-go-core/marshal"
-	outportSenderData "github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/data"
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/atomic"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/outport"
+	"github.com/multiversx/mx-chain-core-go/marshal"
+	outportSenderData "github.com/multiversx/mx-chain-core-go/websocketOutportDriver/data"
 )
 
 // WebsocketOutportDriverNodePartArgs holds the arguments needed for creating a new websocketOutportDriverNodePart
@@ -61,7 +61,7 @@ func NewWebsocketOutportDriverNodePart(args WebsocketOutportDriverNodePartArgs)
 func (o *websocketOutportDriverNodePart) SaveBlock(args *outport.ArgsSaveBlockData) error {
 	argsSaveBlock := outportSenderData.ArgsSaveBlock{
 		HeaderType:        core.GetHeaderType(args.Header),
-		ArgsSaveBlockData: prepareArgsSaveBlock(*args),
+		ArgsSaveBlockData: PrepareArgsSaveBlock(*args),
 	}
 
 	return o.handleAction(argsSaveBlock, outportSenderData.OperationSaveBlock)
diff --git a/websocketOutportDriver/websocketOutportDriverNodePart_test.go b/websocketOutportDriver/websocketOutportDriverNodePart_test.go
index 82f6fcd4c..441f84934 100644
--- a/websocketOutportDriver/websocketOutportDriverNodePart_test.go
+++ b/websocketOutportDriver/websocketOutportDriverNodePart_test.go
@@ -4,14 +4,14 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core"
-	coreMock "github.com/ElrondNetwork/elrond-go-core/core/mock"
-	"github.com/ElrondNetwork/elrond-go-core/data/block"
-	"github.com/ElrondNetwork/elrond-go-core/data/outport"
-	"github.com/ElrondNetwork/elrond-go-core/data/typeConverters/uint64ByteSlice"
-	"github.com/ElrondNetwork/elrond-go-core/marshal"
-	"github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/data"
-	"github.com/ElrondNetwork/elrond-go-core/websocketOutportDriver/mock"
+	"github.com/multiversx/mx-chain-core-go/core"
+	coreMock "github.com/multiversx/mx-chain-core-go/core/mock"
+	"github.com/multiversx/mx-chain-core-go/data/block"
+	"github.com/multiversx/mx-chain-core-go/data/outport"
+	"github.com/multiversx/mx-chain-core-go/data/typeConverters/uint64ByteSlice"
+	"github.com/multiversx/mx-chain-core-go/marshal"
+	"github.com/multiversx/mx-chain-core-go/websocketOutportDriver/data"
+	"github.com/multiversx/mx-chain-core-go/websocketOutportDriver/mock"
 	"github.com/stretchr/testify/require"
 )