diff --git a/x/registry/client/cli/tx_update_top_level_domain_registration_policy.go b/x/registry/client/cli/tx_update_top_level_domain_registration_policy.go
index c5735f5b..ed778850 100644
--- a/x/registry/client/cli/tx_update_top_level_domain_registration_policy.go
+++ b/x/registry/client/cli/tx_update_top_level_domain_registration_policy.go
@@ -3,11 +3,13 @@ package cli
 import (
 	"strconv"
 
+	"github.com/spf13/cobra"
+
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
+
 	"github.com/mycel-domain/mycel/x/registry/types"
-	"github.com/spf13/cobra"
 )
 
 var _ = strconv.Itoa(0)
diff --git a/x/registry/keeper/msg_server_update_top_level_domain_registration_policy.go b/x/registry/keeper/msg_server_update_top_level_domain_registration_policy.go
index 17e99cb8..1018a792 100644
--- a/x/registry/keeper/msg_server_update_top_level_domain_registration_policy.go
+++ b/x/registry/keeper/msg_server_update_top_level_domain_registration_policy.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/mycel-domain/mycel/x/registry/types"
 )
 
diff --git a/x/registry/module_simulation.go b/x/registry/module_simulation.go
index 283b3833..e609d9ff 100644
--- a/x/registry/module_simulation.go
+++ b/x/registry/module_simulation.go
@@ -48,7 +48,7 @@ const (
 	// TODO: Determine the simulation weight value
 	defaultWeightMsgUpdateTextRecord int = 100
 
-	opWeightMsgUpdateTopLevelDomainRegistrationPolicy = "op_weight_msg_update_top_level_domain_registration_policy"
+	opWeightMsgUpdateTopLevelDomainRegistrationPolicy = "op_weight_msg_update_top_level_domain_registration_policy" //#nosec G101
 	// TODO: Determine the simulation weight value
 	defaultWeightMsgUpdateTopLevelDomainRegistrationPolicy int = 100
 
diff --git a/x/registry/simulation/update_top_level_domain_registration_policy.go b/x/registry/simulation/update_top_level_domain_registration_policy.go
index f99c7588..c2e6fb83 100644
--- a/x/registry/simulation/update_top_level_domain_registration_policy.go
+++ b/x/registry/simulation/update_top_level_domain_registration_policy.go
@@ -6,6 +6,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
+
 	"github.com/mycel-domain/mycel/x/registry/keeper"
 	"github.com/mycel-domain/mycel/x/registry/types"
 )
diff --git a/x/registry/types/message_update_top_level_domain_registration_policy.go b/x/registry/types/message_update_top_level_domain_registration_policy.go
index f00eef8b..27e2bb07 100644
--- a/x/registry/types/message_update_top_level_domain_registration_policy.go
+++ b/x/registry/types/message_update_top_level_domain_registration_policy.go
@@ -1,6 +1,8 @@
 package types
 
 import (
+	errorsmod "cosmossdk.io/errors"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
@@ -41,7 +43,7 @@ func (msg *MsgUpdateTopLevelDomainRegistrationPolicy) GetSignBytes() []byte {
 func (msg *MsgUpdateTopLevelDomainRegistrationPolicy) ValidateBasic() error {
 	_, err := sdk.AccAddressFromBech32(msg.Creator)
 	if err != nil {
-		return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err)
+		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err)
 	}
 	return nil
 }
diff --git a/x/registry/types/message_update_top_level_domain_registration_policy_test.go b/x/registry/types/message_update_top_level_domain_registration_policy_test.go
index 53061989..88edd0e0 100644
--- a/x/registry/types/message_update_top_level_domain_registration_policy_test.go
+++ b/x/registry/types/message_update_top_level_domain_registration_policy_test.go
@@ -3,9 +3,11 @@ package types
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
 	"github.com/mycel-domain/mycel/testutil/sample"
-	"github.com/stretchr/testify/require"
 )
 
 func TestMsgUpdateTopLevelDomainRegistrationPolicy_ValidateBasic(t *testing.T) {