diff --git a/docs/how-to-guides/creating-dao.md b/docs/how-to-guides/creating-dao.md
index 590ad7763a0..458a7302043 100644
--- a/docs/how-to-guides/creating-dao.md
+++ b/docs/how-to-guides/creating-dao.md
@@ -38,11 +38,11 @@ type IDAOCore interface {
 }
 ```
 
-A default implementation is provided in the package `gno.land/p/demo/dao-maker/dao_core`, and custom implementations are generally not required.
+A default implementation is provided in the package `gno.land/p/demo/dao_maker/dao_core`, and custom implementations are generally not required.
 
 ### Voting Module
 
-The `gno.land/p/demo/dao-maker/dao_interfaces.IVotingModule` interface defines how voting power is allocated to addresses within the DAO.
+The `gno.land/p/demo/dao_maker/dao_interfaces.IVotingModule` interface defines how voting power is allocated to addresses within the DAO.
 
 **Interface Definition:**
 
@@ -56,11 +56,11 @@ type IVotingModule interface {
 }
 ```
 
-There is only one implementation currently, `gno.land/p/demo/dao-maker/dao_voting_group`, providing a membership-based voting power definition.
+There is only one implementation currently, `gno.land/p/demo/dao_maker/dao_voting_group`, providing a membership-based voting power definition.
 
 ### Proposal Modules
 
-A proposal module (`gno.land/p/demo/dao-maker/dao_interfaces.IProposalModule`) is responsible for:
+A proposal module (`gno.land/p/demo/dao_maker/dao_interfaces.IProposalModule`) is responsible for:
 - Receiving proposals, the proposal type is defined by the module
 - Managing the proposals lifecycle
 - Tallying votes, the vote type is defined by the module and the associated voting power is queried from the voting module
@@ -81,11 +81,11 @@ type IProposalModule interface {
 }
 ```
 
-There is only one implementation currently, `gno.land/p/demo/dao-maker/dao_proposal_single`, providing a yes/no/abstain vote model with quorum and threshold.
+There is only one implementation currently, `gno.land/p/demo/dao_maker/dao_proposal_single`, providing a yes/no/abstain vote model with quorum and threshold.
 
 ### Message handlers
 
-Proposals actions are encoded as objects implementing `gno.land/p/demo/dao-maker/dao_interfaces.ExecutableMessage`.
+Proposals actions are encoded as objects implementing `gno.land/p/demo/dao_maker/dao_interfaces.ExecutableMessage`.
 ```go
 type ExecutableMessage interface {
 	ToJSON() *json.Node
@@ -96,7 +96,7 @@ type ExecutableMessage interface {
 }
 ```
 
-They are deserialized and executed by message handlers implementing `gno.land/p/demo/dao-maker/dao_interfaces.MessageHandler`.
+They are deserialized and executed by message handlers implementing `gno.land/p/demo/dao_maker/dao_interfaces.MessageHandler`.
 ```go
 type MessageHandler interface {
 	Execute(message ExecutableMessage)
@@ -133,7 +133,7 @@ Modules instantiation uses the factory pattern in case the module needs to acces
 package my_dao
 
 import (
-    "gno.land/p/demo/dao-maker/dao_interfaces"
+    "gno.land/p/demo/dao_maker/dao_interfaces"
 )
 
 func init() {
@@ -150,8 +150,8 @@ func init() {
 package my_dao
 
 import (
-    "gno.land/p/demo/dao-maker/dao_interfaces"
-    "gno.land/p/demo/dao-maker/dao_voting_group" // <- new
+    "gno.land/p/demo/dao_maker/dao_interfaces"
+    "gno.land/p/demo/dao_maker/dao_voting_group" // <- new
 )
 
 func init() {
@@ -206,9 +206,9 @@ func init() {
 package my_dao
 
 import (
-    "gno.land/p/demo/dao-maker/dao_interfaces"
-    "gno.land/p/demo/dao-maker/dao_voting_group"
-    "gno.land/p/demo/dao-maker/dao_proposal_single" // <- new
+    "gno.land/p/demo/dao_maker/dao_interfaces"
+    "gno.land/p/demo/dao_maker/dao_voting_group"
+    "gno.land/p/demo/dao_maker/dao_proposal_single" // <- new
 )
 
 func init() {
@@ -242,9 +242,9 @@ Add message handlers to allow your DAO to perform specific actions when proposal
 package my_dao
 
 import (
-    "gno.land/p/demo/dao-maker/dao_interfaces"
-    "gno.land/p/demo/dao-maker/dao_voting_group"
-    "gno.land/p/demo/dao-maker/dao_proposal_single"
+    "gno.land/p/demo/dao_maker/dao_interfaces"
+    "gno.land/p/demo/dao_maker/dao_voting_group"
+    "gno.land/p/demo/dao_maker/dao_proposal_single"
 )
 
 func init() {
@@ -270,10 +270,10 @@ Now we can create the actual DAO.
 package my_dao
 
 import (
-    "gno.land/p/demo/dao-maker/dao_interfaces"
-    "gno.land/p/demo/dao-maker/dao_voting_group"
-    "gno.land/p/demo/dao-maker/dao_proposal_single"
-    "gno.land/p/demo/dao-maker/dao_core" // <- new
+    "gno.land/p/demo/dao_maker/dao_interfaces"
+    "gno.land/p/demo/dao_maker/dao_voting_group"
+    "gno.land/p/demo/dao_maker/dao_proposal_single"
+    "gno.land/p/demo/dao_maker/dao_core" // <- new
 )
 
 var (
diff --git a/examples/gno.land/p/demo/dao-maker/dao_core/gno.mod b/examples/gno.land/p/demo/dao-maker/dao_core/gno.mod
deleted file mode 100644
index 696fd7ef429..00000000000
--- a/examples/gno.land/p/demo/dao-maker/dao_core/gno.mod
+++ /dev/null
@@ -1,6 +0,0 @@
-module gno.land/p/demo/dao-maker/dao_core
-
-require (
-	gno.land/p/demo/dao-maker/dao_interfaces v0.0.0-latest
-	gno.land/p/demo/json v0.0.0-latest
-)
diff --git a/examples/gno.land/p/demo/dao-maker/dao_proposal_single/gno.mod b/examples/gno.land/p/demo/dao-maker/dao_proposal_single/gno.mod
deleted file mode 100644
index 59edcf8a3bd..00000000000
--- a/examples/gno.land/p/demo/dao-maker/dao_proposal_single/gno.mod
+++ /dev/null
@@ -1,9 +0,0 @@
-module gno.land/p/demo/dao-maker/dao_proposal_single
-
-require (
-	gno.land/p/demo/avl v0.0.0-latest
-	gno.land/p/demo/dao-maker/dao_interfaces v0.0.0-latest
-	gno.land/p/demo/dao-maker/dao_utils v0.0.0-latest
-	gno.land/p/demo/dao-maker/jsonutil v0.0.0-latest
-	gno.land/p/demo/json v0.0.0-latest
-)
diff --git a/examples/gno.land/p/demo/dao-maker/dao_utils/gno.mod b/examples/gno.land/p/demo/dao-maker/dao_utils/gno.mod
deleted file mode 100644
index 3d770200bce..00000000000
--- a/examples/gno.land/p/demo/dao-maker/dao_utils/gno.mod
+++ /dev/null
@@ -1,6 +0,0 @@
-module gno.land/p/demo/dao-maker/dao_utils
-
-require (
-	gno.land/p/demo/dao-maker/jsonutil v0.0.0-latest
-	gno.land/p/demo/json v0.0.0-latest
-)
diff --git a/examples/gno.land/p/demo/dao-maker/dao_voting_group/gno.mod b/examples/gno.land/p/demo/dao-maker/dao_voting_group/gno.mod
deleted file mode 100644
index 72393ccbbea..00000000000
--- a/examples/gno.land/p/demo/dao-maker/dao_voting_group/gno.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-module gno.land/p/demo/dao-maker/dao_voting_group
-
-require (
-	gno.land/p/demo/dao-maker/dao_interfaces v0.0.0-latest
-	gno.land/p/demo/dao-maker/havl v0.0.0-latest
-	gno.land/p/demo/dao-maker/jsonutil v0.0.0-latest
-	gno.land/p/demo/json v0.0.0-latest
-)
diff --git a/examples/gno.land/p/demo/dao-maker/dao_core/dao_core.gno b/examples/gno.land/p/demo/dao_maker/dao_core/dao_core.gno
similarity index 98%
rename from examples/gno.land/p/demo/dao-maker/dao_core/dao_core.gno
rename to examples/gno.land/p/demo/dao_maker/dao_core/dao_core.gno
index 7a3574444b8..5df2d68c63d 100644
--- a/examples/gno.land/p/demo/dao-maker/dao_core/dao_core.gno
+++ b/examples/gno.land/p/demo/dao_maker/dao_core/dao_core.gno
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	dao_interfaces "gno.land/p/demo/dao-maker/dao_interfaces"
+	dao_interfaces "gno.land/p/demo/dao_maker/dao_interfaces"
 )
 
 // TODO: add wrapper message handler to handle multiple proposal modules messages
diff --git a/examples/gno.land/p/demo/dao-maker/dao_core/dao_core_test.gno b/examples/gno.land/p/demo/dao_maker/dao_core/dao_core_test.gno
similarity index 98%
rename from examples/gno.land/p/demo/dao-maker/dao_core/dao_core_test.gno
rename to examples/gno.land/p/demo/dao_maker/dao_core/dao_core_test.gno
index 375c9922e01..6daf3f75790 100644
--- a/examples/gno.land/p/demo/dao-maker/dao_core/dao_core_test.gno
+++ b/examples/gno.land/p/demo/dao_maker/dao_core/dao_core_test.gno
@@ -4,7 +4,7 @@ import (
 	"std"
 	"testing"
 
-	dao_interfaces "gno.land/p/demo/dao-maker/dao_interfaces"
+	dao_interfaces "gno.land/p/demo/dao_maker/dao_interfaces"
 )
 
 type votingModule struct {
diff --git a/examples/gno.land/p/demo/dao-maker/dao_core/errors.gno b/examples/gno.land/p/demo/dao_maker/dao_core/errors.gno
similarity index 100%
rename from examples/gno.land/p/demo/dao-maker/dao_core/errors.gno
rename to examples/gno.land/p/demo/dao_maker/dao_core/errors.gno
diff --git a/examples/gno.land/p/demo/dao_maker/dao_core/gno.mod b/examples/gno.land/p/demo/dao_maker/dao_core/gno.mod
new file mode 100644
index 00000000000..b5b3817968f
--- /dev/null
+++ b/examples/gno.land/p/demo/dao_maker/dao_core/gno.mod
@@ -0,0 +1,6 @@
+module gno.land/p/demo/dao_maker/dao_core
+
+require (
+	gno.land/p/demo/dao_maker/dao_interfaces v0.0.0-latest
+	gno.land/p/demo/json v0.0.0-latest
+)
diff --git a/examples/gno.land/p/demo/dao-maker/dao_core/messages.gno b/examples/gno.land/p/demo/dao_maker/dao_core/messages.gno
similarity index 93%
rename from examples/gno.land/p/demo/dao-maker/dao_core/messages.gno
rename to examples/gno.land/p/demo/dao_maker/dao_core/messages.gno
index 7a27ff4ac33..eb217604c10 100644
--- a/examples/gno.land/p/demo/dao-maker/dao_core/messages.gno
+++ b/examples/gno.land/p/demo/dao_maker/dao_core/messages.gno
@@ -1,7 +1,7 @@
 package core
 
 import (
-	dao_interfaces "gno.land/p/demo/dao-maker/dao_interfaces"
+	dao_interfaces "gno.land/p/demo/dao_maker/dao_interfaces"
 	"gno.land/p/demo/json"
 )
 
@@ -15,7 +15,7 @@ type UpdateProposalModulesExecutableMessage struct {
 var _ dao_interfaces.ExecutableMessage = &UpdateProposalModulesExecutableMessage{}
 
 func (msg UpdateProposalModulesExecutableMessage) Type() string {
-	return "gno.land/p/demo/dao-maker/dao_core.UpdateProposalModules"
+	return "gno.land/p/demo/dao_maker/dao_core.UpdateProposalModules"
 }
 
 func (msg *UpdateProposalModulesExecutableMessage) String() string {
@@ -62,7 +62,7 @@ type UpdateVotingModuleExecutableMessage struct {
 var _ dao_interfaces.ExecutableMessage = &UpdateVotingModuleExecutableMessage{}
 
 func (msg UpdateVotingModuleExecutableMessage) Type() string {
-	return "gno.land/p/demo/dao-maker/dao_core.UpdateVotingModule"
+	return "gno.land/p/demo/dao_maker/dao_core.UpdateVotingModule"
 }
 
 func (msg *UpdateVotingModuleExecutableMessage) String() string {
diff --git a/examples/gno.land/p/demo/dao-maker/dao_interfaces/core.gno b/examples/gno.land/p/demo/dao_maker/dao_interfaces/core.gno
similarity index 100%
rename from examples/gno.land/p/demo/dao-maker/dao_interfaces/core.gno
rename to examples/gno.land/p/demo/dao_maker/dao_interfaces/core.gno
diff --git a/examples/gno.land/p/demo/dao-maker/dao_interfaces/core_testing.gno b/examples/gno.land/p/demo/dao_maker/dao_interfaces/core_testing.gno
similarity index 100%
rename from examples/gno.land/p/demo/dao-maker/dao_interfaces/core_testing.gno
rename to examples/gno.land/p/demo/dao_maker/dao_interfaces/core_testing.gno
diff --git a/examples/gno.land/p/demo/dao-maker/dao_interfaces/gno.mod b/examples/gno.land/p/demo/dao_maker/dao_interfaces/gno.mod
similarity index 63%
rename from examples/gno.land/p/demo/dao-maker/dao_interfaces/gno.mod
rename to examples/gno.land/p/demo/dao_maker/dao_interfaces/gno.mod
index f0e6a747386..9392cb9b9c9 100644
--- a/examples/gno.land/p/demo/dao-maker/dao_interfaces/gno.mod
+++ b/examples/gno.land/p/demo/dao_maker/dao_interfaces/gno.mod
@@ -1,4 +1,4 @@
-module gno.land/p/demo/dao-maker/dao_interfaces
+module gno.land/p/demo/dao_maker/dao_interfaces
 
 require (
 	gno.land/p/demo/avl v0.0.0-latest
diff --git a/examples/gno.land/p/demo/dao-maker/dao_interfaces/messages.gno b/examples/gno.land/p/demo/dao_maker/dao_interfaces/messages.gno
similarity index 100%
rename from examples/gno.land/p/demo/dao-maker/dao_interfaces/messages.gno
rename to examples/gno.land/p/demo/dao_maker/dao_interfaces/messages.gno
diff --git a/examples/gno.land/p/demo/dao-maker/dao_interfaces/messages_registry.gno b/examples/gno.land/p/demo/dao_maker/dao_interfaces/messages_registry.gno
similarity index 97%
rename from examples/gno.land/p/demo/dao-maker/dao_interfaces/messages_registry.gno
rename to examples/gno.land/p/demo/dao_maker/dao_interfaces/messages_registry.gno
index f3afbc503d5..07228ccb921 100644
--- a/examples/gno.land/p/demo/dao-maker/dao_interfaces/messages_registry.gno
+++ b/examples/gno.land/p/demo/dao_maker/dao_interfaces/messages_registry.gno
@@ -78,7 +78,7 @@ type RegisterHandlerExecutableMessage struct {
 var _ ExecutableMessage = &RegisterHandlerExecutableMessage{}
 
 func (m RegisterHandlerExecutableMessage) Type() string {
-	return "gno.land/p/demo/dao-maker/dao_interfaces.RegisterHandler"
+	return "gno.land/p/demo/dao_maker/dao_interfaces.RegisterHandler"
 }
 
 func (m *RegisterHandlerExecutableMessage) FromJSON(ast *json.Node) {
@@ -122,7 +122,7 @@ type RemoveHandlerExecutableMessage struct {
 var _ ExecutableMessage = &RemoveHandlerExecutableMessage{}
 
 func (m RemoveHandlerExecutableMessage) Type() string {
-	return "gno.land/p/demo/dao-maker/dao_interfaces.RemoveHandler"
+	return "gno.land/p/demo/dao_maker/dao_interfaces.RemoveHandler"
 }
 
 func (m *RemoveHandlerExecutableMessage) FromJSON(ast *json.Node) {
diff --git a/examples/gno.land/p/demo/dao-maker/dao_interfaces/messages_registry_test.gno b/examples/gno.land/p/demo/dao_maker/dao_interfaces/messages_registry_test.gno
similarity index 100%
rename from examples/gno.land/p/demo/dao-maker/dao_interfaces/messages_registry_test.gno
rename to examples/gno.land/p/demo/dao_maker/dao_interfaces/messages_registry_test.gno
diff --git a/examples/gno.land/p/demo/dao-maker/dao_interfaces/messages_testing.gno b/examples/gno.land/p/demo/dao_maker/dao_interfaces/messages_testing.gno
similarity index 100%
rename from examples/gno.land/p/demo/dao-maker/dao_interfaces/messages_testing.gno
rename to examples/gno.land/p/demo/dao_maker/dao_interfaces/messages_testing.gno
diff --git a/examples/gno.land/p/demo/dao-maker/dao_interfaces/modules.gno b/examples/gno.land/p/demo/dao_maker/dao_interfaces/modules.gno
similarity index 100%
rename from examples/gno.land/p/demo/dao-maker/dao_interfaces/modules.gno
rename to examples/gno.land/p/demo/dao_maker/dao_interfaces/modules.gno
diff --git a/examples/gno.land/p/demo/dao-maker/dao_proposal_single/dao_proposal_single.gno b/examples/gno.land/p/demo/dao_maker/dao_proposal_single/dao_proposal_single.gno
similarity index 98%
rename from examples/gno.land/p/demo/dao-maker/dao_proposal_single/dao_proposal_single.gno
rename to examples/gno.land/p/demo/dao_maker/dao_proposal_single/dao_proposal_single.gno
index 04ac234422a..71fa629b3c5 100644
--- a/examples/gno.land/p/demo/dao-maker/dao_proposal_single/dao_proposal_single.gno
+++ b/examples/gno.land/p/demo/dao_maker/dao_proposal_single/dao_proposal_single.gno
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"gno.land/p/demo/avl"
-	"gno.land/p/demo/dao-maker/dao_interfaces"
-	"gno.land/p/demo/dao-maker/dao_utils"
+	"gno.land/p/demo/dao_maker/dao_interfaces"
+	"gno.land/p/demo/dao_maker/dao_utils"
 	"gno.land/p/demo/json"
 )
 
@@ -244,7 +244,7 @@ func (d *DAOProposalSingle) Core() dao_interfaces.IDAOCore {
 
 func (d *DAOProposalSingle) Info() dao_interfaces.ModuleInfo {
 	return dao_interfaces.ModuleInfo{
-		Kind:    "gno.land/p/demo/dao-maker/dao_proposal_single",
+		Kind:    "gno.land/p/demo/dao_maker/dao_proposal_single",
 		Version: "0.1.0",
 	}
 }
diff --git a/examples/gno.land/p/demo/dao_maker/dao_proposal_single/gno.mod b/examples/gno.land/p/demo/dao_maker/dao_proposal_single/gno.mod
new file mode 100644
index 00000000000..ca038169c21
--- /dev/null
+++ b/examples/gno.land/p/demo/dao_maker/dao_proposal_single/gno.mod
@@ -0,0 +1,9 @@
+module gno.land/p/demo/dao_maker/dao_proposal_single
+
+require (
+	gno.land/p/demo/avl v0.0.0-latest
+	gno.land/p/demo/dao_maker/dao_interfaces v0.0.0-latest
+	gno.land/p/demo/dao_maker/dao_utils v0.0.0-latest
+	gno.land/p/demo/dao_maker/jsonutil v0.0.0-latest
+	gno.land/p/demo/json v0.0.0-latest
+)
diff --git a/examples/gno.land/p/demo/dao-maker/dao_proposal_single/proposal_test.gno b/examples/gno.land/p/demo/dao_maker/dao_proposal_single/proposal_test.gno
similarity index 97%
rename from examples/gno.land/p/demo/dao-maker/dao_proposal_single/proposal_test.gno
rename to examples/gno.land/p/demo/dao_maker/dao_proposal_single/proposal_test.gno
index 9c717e5c8c1..2794ff9dc9e 100644
--- a/examples/gno.land/p/demo/dao-maker/dao_proposal_single/proposal_test.gno
+++ b/examples/gno.land/p/demo/dao_maker/dao_proposal_single/proposal_test.gno
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"gno.land/p/demo/avl"
-	dao_interfaces "gno.land/p/demo/dao-maker/dao_interfaces"
-	"gno.land/p/demo/dao-maker/dao_utils"
+	dao_interfaces "gno.land/p/demo/dao_maker/dao_interfaces"
+	"gno.land/p/demo/dao_maker/dao_utils"
 	"gno.land/p/demo/json"
 )
 
diff --git a/examples/gno.land/p/demo/dao-maker/dao_proposal_single/threshold.gno b/examples/gno.land/p/demo/dao_maker/dao_proposal_single/threshold.gno
similarity index 98%
rename from examples/gno.land/p/demo/dao-maker/dao_proposal_single/threshold.gno
rename to examples/gno.land/p/demo/dao_maker/dao_proposal_single/threshold.gno
index 554bc21fda1..80919d47ce9 100644
--- a/examples/gno.land/p/demo/dao-maker/dao_proposal_single/threshold.gno
+++ b/examples/gno.land/p/demo/dao_maker/dao_proposal_single/threshold.gno
@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"strings"
 
-	"gno.land/p/demo/dao-maker/jsonutil"
+	"gno.land/p/demo/dao_maker/jsonutil"
 	"gno.land/p/demo/json"
 )
 
diff --git a/examples/gno.land/p/demo/dao-maker/dao_proposal_single/types.gno b/examples/gno.land/p/demo/dao_maker/dao_proposal_single/types.gno
similarity index 96%
rename from examples/gno.land/p/demo/dao-maker/dao_proposal_single/types.gno
rename to examples/gno.land/p/demo/dao_maker/dao_proposal_single/types.gno
index 5cc214b168c..f93f15c41b5 100644
--- a/examples/gno.land/p/demo/dao-maker/dao_proposal_single/types.gno
+++ b/examples/gno.land/p/demo/dao_maker/dao_proposal_single/types.gno
@@ -5,9 +5,9 @@ import (
 	"strconv"
 
 	"gno.land/p/demo/avl"
-	dao_interfaces "gno.land/p/demo/dao-maker/dao_interfaces"
-	"gno.land/p/demo/dao-maker/dao_utils"
-	"gno.land/p/demo/dao-maker/jsonutil"
+	dao_interfaces "gno.land/p/demo/dao_maker/dao_interfaces"
+	"gno.land/p/demo/dao_maker/dao_utils"
+	"gno.land/p/demo/dao_maker/jsonutil"
 	"gno.land/p/demo/json"
 )
 
diff --git a/examples/gno.land/p/demo/dao-maker/dao_proposal_single/update_settings.gno b/examples/gno.land/p/demo/dao_maker/dao_proposal_single/update_settings.gno
similarity index 94%
rename from examples/gno.land/p/demo/dao-maker/dao_proposal_single/update_settings.gno
rename to examples/gno.land/p/demo/dao_maker/dao_proposal_single/update_settings.gno
index fbe184bf1ee..1ea247a8335 100644
--- a/examples/gno.land/p/demo/dao-maker/dao_proposal_single/update_settings.gno
+++ b/examples/gno.land/p/demo/dao_maker/dao_proposal_single/update_settings.gno
@@ -3,7 +3,7 @@ package dao_proposal_single
 import (
 	"strings"
 
-	"gno.land/p/demo/dao-maker/dao_interfaces"
+	"gno.land/p/demo/dao_maker/dao_interfaces"
 	"gno.land/p/demo/json"
 )
 
@@ -16,7 +16,7 @@ type UpdateSettingsMessage struct {
 var _ dao_interfaces.ExecutableMessage = (*UpdateSettingsMessage)(nil)
 
 func (usm UpdateSettingsMessage) Type() string {
-	return "gno.land/p/demo/dao-maker/dao_proposal_single.UpdateSettings"
+	return "gno.land/p/demo/dao_maker/dao_proposal_single.UpdateSettings"
 }
 
 func (usm *UpdateSettingsMessage) String() string {
diff --git a/examples/gno.land/p/demo/dao-maker/dao_utils/expiration.gno b/examples/gno.land/p/demo/dao_maker/dao_utils/expiration.gno
similarity index 98%
rename from examples/gno.land/p/demo/dao-maker/dao_utils/expiration.gno
rename to examples/gno.land/p/demo/dao_maker/dao_utils/expiration.gno
index ed9684249d6..5cf55b98612 100644
--- a/examples/gno.land/p/demo/dao-maker/dao_utils/expiration.gno
+++ b/examples/gno.land/p/demo/dao_maker/dao_utils/expiration.gno
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"time"
 
-	"gno.land/p/demo/dao-maker/jsonutil"
+	"gno.land/p/demo/dao_maker/jsonutil"
 	"gno.land/p/demo/json"
 )
 
diff --git a/examples/gno.land/p/demo/dao-maker/dao_utils/expiration_test.gno b/examples/gno.land/p/demo/dao_maker/dao_utils/expiration_test.gno
similarity index 100%
rename from examples/gno.land/p/demo/dao-maker/dao_utils/expiration_test.gno
rename to examples/gno.land/p/demo/dao_maker/dao_utils/expiration_test.gno
diff --git a/examples/gno.land/p/demo/dao_maker/dao_utils/gno.mod b/examples/gno.land/p/demo/dao_maker/dao_utils/gno.mod
new file mode 100644
index 00000000000..6ef213b428f
--- /dev/null
+++ b/examples/gno.land/p/demo/dao_maker/dao_utils/gno.mod
@@ -0,0 +1,6 @@
+module gno.land/p/demo/dao_maker/dao_utils
+
+require (
+	gno.land/p/demo/dao_maker/jsonutil v0.0.0-latest
+	gno.land/p/demo/json v0.0.0-latest
+)
diff --git a/examples/gno.land/p/demo/dao_maker/dao_voting_group/gno.mod b/examples/gno.land/p/demo/dao_maker/dao_voting_group/gno.mod
new file mode 100644
index 00000000000..5259d1d5c97
--- /dev/null
+++ b/examples/gno.land/p/demo/dao_maker/dao_voting_group/gno.mod
@@ -0,0 +1,8 @@
+module gno.land/p/demo/dao_maker/dao_voting_group
+
+require (
+	gno.land/p/demo/dao_maker/dao_interfaces v0.0.0-latest
+	gno.land/p/demo/dao_maker/havl v0.0.0-latest
+	gno.land/p/demo/dao_maker/jsonutil v0.0.0-latest
+	gno.land/p/demo/json v0.0.0-latest
+)
diff --git a/examples/gno.land/p/demo/dao-maker/dao_voting_group/messages.gno b/examples/gno.land/p/demo/dao_maker/dao_voting_group/messages.gno
similarity index 92%
rename from examples/gno.land/p/demo/dao-maker/dao_voting_group/messages.gno
rename to examples/gno.land/p/demo/dao_maker/dao_voting_group/messages.gno
index 6099e38d65c..3f930a98704 100644
--- a/examples/gno.land/p/demo/dao-maker/dao_voting_group/messages.gno
+++ b/examples/gno.land/p/demo/dao_maker/dao_voting_group/messages.gno
@@ -1,11 +1,11 @@
 package dao_voting_group
 
 import (
-	"gno.land/p/demo/dao-maker/dao_interfaces"
+	"gno.land/p/demo/dao_maker/dao_interfaces"
 	"gno.land/p/demo/json"
 )
 
-const updateMembersType = "gno.land/p/demo/dao-maker/dao_voting_group.UpdateMembers"
+const updateMembersType = "gno.land/p/demo/dao_maker/dao_voting_group.UpdateMembers"
 
 type UpdateMembersExecutableMessage []Member
 
diff --git a/examples/gno.land/p/demo/dao-maker/dao_voting_group/voting_group.gno b/examples/gno.land/p/demo/dao_maker/dao_voting_group/voting_group.gno
similarity index 95%
rename from examples/gno.land/p/demo/dao-maker/dao_voting_group/voting_group.gno
rename to examples/gno.land/p/demo/dao_maker/dao_voting_group/voting_group.gno
index 8923fe2ead2..32ed059a980 100644
--- a/examples/gno.land/p/demo/dao-maker/dao_voting_group/voting_group.gno
+++ b/examples/gno.land/p/demo/dao_maker/dao_voting_group/voting_group.gno
@@ -5,9 +5,9 @@ import (
 	"strconv"
 	"strings"
 
-	dao_interfaces "gno.land/p/demo/dao-maker/dao_interfaces"
-	"gno.land/p/demo/dao-maker/havl"
-	"gno.land/p/demo/dao-maker/jsonutil"
+	dao_interfaces "gno.land/p/demo/dao_maker/dao_interfaces"
+	"gno.land/p/demo/dao_maker/havl"
+	"gno.land/p/demo/dao_maker/jsonutil"
 	"gno.land/p/demo/json"
 )
 
@@ -47,7 +47,7 @@ func NewVotingGroup() *VotingGroup {
 
 func (v *VotingGroup) Info() dao_interfaces.ModuleInfo {
 	return dao_interfaces.ModuleInfo{
-		Kind:    "gno.land/p/demo/dao-maker/dao_voting_group",
+		Kind:    "gno.land/p/demo/dao_maker/dao_voting_group",
 		Version: "0.1.0",
 	}
 }
diff --git a/examples/gno.land/p/demo/dao-maker/dao_voting_group/voting_group_test.gno b/examples/gno.land/p/demo/dao_maker/dao_voting_group/voting_group_test.gno
similarity index 88%
rename from examples/gno.land/p/demo/dao-maker/dao_voting_group/voting_group_test.gno
rename to examples/gno.land/p/demo/dao_maker/dao_voting_group/voting_group_test.gno
index 1b2f2aace11..eed89ac0529 100644
--- a/examples/gno.land/p/demo/dao-maker/dao_voting_group/voting_group_test.gno
+++ b/examples/gno.land/p/demo/dao_maker/dao_voting_group/voting_group_test.gno
@@ -4,7 +4,7 @@ import (
 	"std"
 	"testing"
 
-	dao_interfaces "gno.land/p/demo/dao-maker/dao_interfaces"
+	dao_interfaces "gno.land/p/demo/dao_maker/dao_interfaces"
 )
 
 func TestVotingGroup(t *testing.T) {
diff --git a/examples/gno.land/p/demo/dao-maker/havl/gno.mod b/examples/gno.land/p/demo/dao_maker/havl/gno.mod
similarity index 53%
rename from examples/gno.land/p/demo/dao-maker/havl/gno.mod
rename to examples/gno.land/p/demo/dao_maker/havl/gno.mod
index 055abf650a1..6ee345e559c 100644
--- a/examples/gno.land/p/demo/dao-maker/havl/gno.mod
+++ b/examples/gno.land/p/demo/dao_maker/havl/gno.mod
@@ -1,3 +1,3 @@
-module gno.land/p/demo/dao-maker/havl
+module gno.land/p/demo/dao_maker/havl
 
 require gno.land/p/demo/avl v0.0.0-latest
diff --git a/examples/gno.land/p/demo/dao-maker/havl/havl.gno b/examples/gno.land/p/demo/dao_maker/havl/havl.gno
similarity index 100%
rename from examples/gno.land/p/demo/dao-maker/havl/havl.gno
rename to examples/gno.land/p/demo/dao_maker/havl/havl.gno
diff --git a/examples/gno.land/p/demo/dao-maker/jsonutil/gno.mod b/examples/gno.land/p/demo/dao_maker/jsonutil/gno.mod
similarity index 74%
rename from examples/gno.land/p/demo/dao-maker/jsonutil/gno.mod
rename to examples/gno.land/p/demo/dao_maker/jsonutil/gno.mod
index 5ba9a372b00..86765ddeb64 100644
--- a/examples/gno.land/p/demo/dao-maker/jsonutil/gno.mod
+++ b/examples/gno.land/p/demo/dao_maker/jsonutil/gno.mod
@@ -1,4 +1,4 @@
-module gno.land/p/demo/dao-maker/jsonutil
+module gno.land/p/demo/dao_maker/jsonutil
 
 require (
 	gno.land/p/demo/avl v0.0.0-latest
diff --git a/examples/gno.land/p/demo/dao-maker/jsonutil/jsonutil.gno b/examples/gno.land/p/demo/dao_maker/jsonutil/jsonutil.gno
similarity index 100%
rename from examples/gno.land/p/demo/dao-maker/jsonutil/jsonutil.gno
rename to examples/gno.land/p/demo/dao_maker/jsonutil/jsonutil.gno
diff --git a/examples/gno.land/r/demo/dao-maker/dao_realm/gno.mod b/examples/gno.land/r/demo/dao-maker/dao_realm/gno.mod
deleted file mode 100644
index 491de9632e9..00000000000
--- a/examples/gno.land/r/demo/dao-maker/dao_realm/gno.mod
+++ /dev/null
@@ -1,14 +0,0 @@
-module gno.land/r/demo/dao-maker/dao_realm
-
-require (
-	gno.land/p/demo/dao-maker/dao_core v0.0.0-latest
-	gno.land/p/demo/dao-maker/dao_interfaces v0.0.0-latest
-	gno.land/p/demo/dao-maker/dao_proposal_single v0.0.0-latest
-	gno.land/p/demo/dao-maker/dao_utils v0.0.0-latest
-	gno.land/p/demo/dao-maker/dao_voting_group v0.0.0-latest
-	gno.land/p/demo/dao-maker/havl v0.0.0-latest
-	gno.land/p/demo/json v0.0.0-latest
-	gno.land/r/demo/dao-maker/dao_registry v0.0.0-latest
-	gno.land/r/demo/dao-maker/tori v0.0.0-latest
-	gno.land/r/demo/users v0.0.0-latest
-)
diff --git a/examples/gno.land/r/demo/dao-maker/dao_registry/gno.mod b/examples/gno.land/r/demo/dao-maker/dao_registry/gno.mod
deleted file mode 100644
index 9f2cfbe1b0f..00000000000
--- a/examples/gno.land/r/demo/dao-maker/dao_registry/gno.mod
+++ /dev/null
@@ -1,9 +0,0 @@
-module gno.land/r/demo/dao-maker/dao_registry
-
-require (
-	gno.land/p/demo/avl v0.0.0-latest
-	gno.land/p/demo/dao-maker/dao_interfaces v0.0.0-latest
-	gno.land/p/demo/dao-maker/jsonutil v0.0.0-latest
-	gno.land/p/demo/json v0.0.0-latest
-	gno.land/p/demo/ufmt v0.0.0-latest
-)
diff --git a/examples/gno.land/r/demo/dao-maker/dao_realm/dao_realm.gno b/examples/gno.land/r/demo/dao_maker/dao_realm/dao_realm.gno
similarity index 92%
rename from examples/gno.land/r/demo/dao-maker/dao_realm/dao_realm.gno
rename to examples/gno.land/r/demo/dao_maker/dao_realm/dao_realm.gno
index 149cc95e2fe..a1bae23b9a1 100644
--- a/examples/gno.land/r/demo/dao-maker/dao_realm/dao_realm.gno
+++ b/examples/gno.land/r/demo/dao_maker/dao_realm/dao_realm.gno
@@ -4,14 +4,14 @@ import (
 	"std"
 	"time"
 
-	"gno.land/r/demo/dao-maker/dao_registry"
-	"gno.land/r/demo/dao-maker/tori"
-
-	dao_core "gno.land/p/demo/dao-maker/dao_core"
-	dao_interfaces "gno.land/p/demo/dao-maker/dao_interfaces"
-	proposal_single "gno.land/p/demo/dao-maker/dao_proposal_single"
-	"gno.land/p/demo/dao-maker/dao_utils"
-	voting_group "gno.land/p/demo/dao-maker/dao_voting_group"
+	"gno.land/r/demo/dao_maker/dao_registry"
+	"gno.land/r/demo/dao_maker/tori"
+
+	dao_core "gno.land/p/demo/dao_maker/dao_core"
+	dao_interfaces "gno.land/p/demo/dao_maker/dao_interfaces"
+	proposal_single "gno.land/p/demo/dao_maker/dao_proposal_single"
+	"gno.land/p/demo/dao_maker/dao_utils"
+	voting_group "gno.land/p/demo/dao_maker/dao_voting_group"
 )
 
 // Example DAO realm
diff --git a/examples/gno.land/r/demo/dao-maker/dao_realm/dao_realm_test.gno b/examples/gno.land/r/demo/dao_maker/dao_realm/dao_realm_test.gno
similarity index 91%
rename from examples/gno.land/r/demo/dao-maker/dao_realm/dao_realm_test.gno
rename to examples/gno.land/r/demo/dao_maker/dao_realm/dao_realm_test.gno
index cd5a212edc2..afb319c6482 100644
--- a/examples/gno.land/r/demo/dao-maker/dao_realm/dao_realm_test.gno
+++ b/examples/gno.land/r/demo/dao_maker/dao_realm/dao_realm_test.gno
@@ -5,11 +5,11 @@ import (
 	"std"
 	"testing"
 
-	dao_core "gno.land/p/demo/dao-maker/dao_core"
-	dao_interfaces "gno.land/p/demo/dao-maker/dao_interfaces"
-	proposal_single "gno.land/p/demo/dao-maker/dao_proposal_single"
-	"gno.land/p/demo/dao-maker/dao_voting_group"
-	"gno.land/p/demo/dao-maker/havl"
+	dao_core "gno.land/p/demo/dao_maker/dao_core"
+	dao_interfaces "gno.land/p/demo/dao_maker/dao_interfaces"
+	proposal_single "gno.land/p/demo/dao_maker/dao_proposal_single"
+	"gno.land/p/demo/dao_maker/dao_voting_group"
+	"gno.land/p/demo/dao_maker/havl"
 	"gno.land/p/demo/json"
 	"gno.land/r/demo/users"
 )
@@ -42,7 +42,7 @@ func TestUpdateMembers(t *testing.T) {
 	var membersJSON string
 
 	{
-		id := ProposeJSON(0, fmt.Sprintf(`{"title": "Test prop", "description": "A description", "messages": [{"type": "gno.land/p/demo/dao-maker/dao_voting_group.UpdateMembers", "payload": [{"power": "2", "address": "g18syxa0vh0vmne90mwhtynjet0zgeqf6prh3ryy"}]}]}`))
+		id := ProposeJSON(0, fmt.Sprintf(`{"title": "Test prop", "description": "A description", "messages": [{"type": "gno.land/p/demo/dao_maker/dao_voting_group.UpdateMembers", "payload": [{"power": "2", "address": "g18syxa0vh0vmne90mwhtynjet0zgeqf6prh3ryy"}]}]}`))
 		VoteJSON(0, id, `{"vote": "Yes", "rationale": "testing"}`)
 		Execute(0, id)
 		members := group.GetMembers("", "", 0, havl.Latest)
@@ -72,7 +72,7 @@ func TestUpdateMembers(t *testing.T) {
 		var member dao_voting_group.Member
 		member.FromJSON(children[0])
 
-		id := ProposeJSON(0, fmt.Sprintf(`{"title": "Test prop 2", "description": "A description", "messages": [{"type": "gno.land/p/demo/dao-maker/dao_voting_group.UpdateMembers", "payload": [{"address": "%s", "power": "0"}]}]}`, member.Address.String()))
+		id := ProposeJSON(0, fmt.Sprintf(`{"title": "Test prop 2", "description": "A description", "messages": [{"type": "gno.land/p/demo/dao_maker/dao_voting_group.UpdateMembers", "payload": [{"address": "%s", "power": "0"}]}]}`, member.Address.String()))
 		VoteJSON(0, id, `{"vote": "Yes", "rationale": "testing"}`)
 		Execute(0, id)
 		members := group.GetMembers("", "", 0, havl.Latest)
@@ -98,11 +98,11 @@ func TestUpdateSettings(t *testing.T) {
 	// not sure why but in this test the proposal ids start at 3 and the voting power is 5 when all tests are run, shouldn't tests be isolated? TODO: investigate
 
 	{
-		id := ProposeJSON(0, fmt.Sprintf(`{"title": "Test prop", "description": "A description", "messages": [{"type": "gno.land/p/demo/dao-maker/dao_proposal_single.UpdateSettings", "payload": {"threshold": {"thresholdQuorum": {"threshold": {"percent": 200}, "quorum": {"percent": 200}}}}}]}`))
+		id := ProposeJSON(0, fmt.Sprintf(`{"title": "Test prop", "description": "A description", "messages": [{"type": "gno.land/p/demo/dao_maker/dao_proposal_single.UpdateSettings", "payload": {"threshold": {"thresholdQuorum": {"threshold": {"percent": 200}, "quorum": {"percent": 200}}}}}]}`))
 		VoteJSON(0, id, `{"vote": "Yes", "rationale": "testing"}`)
 		Execute(0, id)
 		proposalJSON := getProposalJSON(0, id)
-		expected := fmt.Sprintf(`{"id":"%d","title":"Test prop","description":"A description","proposer":"g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm","startHeight":"123","totalPower":"6","messages":[{"type":"gno.land/p/demo/dao-maker/dao_proposal_single.UpdateSettings","payload":{"threshold":{"thresholdQuorum":{"threshold":{"percent":200},"quorum":{"percent":200}}}}}],"status":"Executed","votes":{"yes":"1","no":"0","abstain":"0"},"allowRevoting":false,"ballots":{"g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm":{"power":"1","vote":"Yes","rationale":"testing"}},"expiration":{"atTime":"2009-03-27T23:31:30Z"},"threshold":{"thresholdQuorum":{"threshold":{"percent":100},"quorum":{"percent":100}}}}`, id)
+		expected := fmt.Sprintf(`{"id":"%d","title":"Test prop","description":"A description","proposer":"g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm","startHeight":"123","totalPower":"6","messages":[{"type":"gno.land/p/demo/dao_maker/dao_proposal_single.UpdateSettings","payload":{"threshold":{"thresholdQuorum":{"threshold":{"percent":200},"quorum":{"percent":200}}}}}],"status":"Executed","votes":{"yes":"1","no":"0","abstain":"0"},"allowRevoting":false,"ballots":{"g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm":{"power":"1","vote":"Yes","rationale":"testing"}},"expiration":{"atTime":"2009-03-27T23:31:30Z"},"threshold":{"thresholdQuorum":{"threshold":{"percent":100},"quorum":{"percent":100}}}}`, id)
 		if proposalJSON != expected {
 			t.Fatalf("Expected:\n%s\nGot:\n%s", expected, proposalJSON)
 		}
diff --git a/examples/gno.land/r/demo/dao_maker/dao_realm/gno.mod b/examples/gno.land/r/demo/dao_maker/dao_realm/gno.mod
new file mode 100644
index 00000000000..f8954f2c571
--- /dev/null
+++ b/examples/gno.land/r/demo/dao_maker/dao_realm/gno.mod
@@ -0,0 +1,14 @@
+module gno.land/r/demo/dao_maker/dao_realm
+
+require (
+	gno.land/p/demo/dao_maker/dao_core v0.0.0-latest
+	gno.land/p/demo/dao_maker/dao_interfaces v0.0.0-latest
+	gno.land/p/demo/dao_maker/dao_proposal_single v0.0.0-latest
+	gno.land/p/demo/dao_maker/dao_utils v0.0.0-latest
+	gno.land/p/demo/dao_maker/dao_voting_group v0.0.0-latest
+	gno.land/p/demo/dao_maker/havl v0.0.0-latest
+	gno.land/p/demo/json v0.0.0-latest
+	gno.land/r/demo/dao_maker/dao_registry v0.0.0-latest
+	gno.land/r/demo/dao_maker/tori v0.0.0-latest
+	gno.land/r/demo/users v0.0.0-latest
+)
diff --git a/examples/gno.land/r/demo/dao-maker/dao_registry/dao_registry.gno b/examples/gno.land/r/demo/dao_maker/dao_registry/dao_registry.gno
similarity index 97%
rename from examples/gno.land/r/demo/dao-maker/dao_registry/dao_registry.gno
rename to examples/gno.land/r/demo/dao_maker/dao_registry/dao_registry.gno
index 6d5fcf1e09e..308117396c2 100644
--- a/examples/gno.land/r/demo/dao-maker/dao_registry/dao_registry.gno
+++ b/examples/gno.land/r/demo/dao_maker/dao_registry/dao_registry.gno
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"gno.land/p/demo/avl"
-	"gno.land/p/demo/dao-maker/dao_interfaces"
-	"gno.land/p/demo/dao-maker/jsonutil"
+	"gno.land/p/demo/dao_maker/dao_interfaces"
+	"gno.land/p/demo/dao_maker/jsonutil"
 	"gno.land/p/demo/json"
 )
 
diff --git a/examples/gno.land/r/demo/dao-maker/dao_registry/dao_registry_test.gno b/examples/gno.land/r/demo/dao_maker/dao_registry/dao_registry_test.gno
similarity index 95%
rename from examples/gno.land/r/demo/dao-maker/dao_registry/dao_registry_test.gno
rename to examples/gno.land/r/demo/dao_maker/dao_registry/dao_registry_test.gno
index 994924f39ea..a1060017180 100644
--- a/examples/gno.land/r/demo/dao-maker/dao_registry/dao_registry_test.gno
+++ b/examples/gno.land/r/demo/dao_maker/dao_registry/dao_registry_test.gno
@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"gno.land/r/demo/dao-maker/dao_registry"
+	"gno.land/r/demo/dao_maker/dao_registry"
 
-	"gno.land/p/demo/dao-maker/dao_interfaces"
+	"gno.land/p/demo/dao_maker/dao_interfaces"
 	"gno.land/p/demo/ufmt"
 )
 
diff --git a/examples/gno.land/r/demo/dao_maker/dao_registry/gno.mod b/examples/gno.land/r/demo/dao_maker/dao_registry/gno.mod
new file mode 100644
index 00000000000..bf31caa7dff
--- /dev/null
+++ b/examples/gno.land/r/demo/dao_maker/dao_registry/gno.mod
@@ -0,0 +1,9 @@
+module gno.land/r/demo/dao_maker/dao_registry
+
+require (
+	gno.land/p/demo/avl v0.0.0-latest
+	gno.land/p/demo/dao_maker/dao_interfaces v0.0.0-latest
+	gno.land/p/demo/dao_maker/jsonutil v0.0.0-latest
+	gno.land/p/demo/json v0.0.0-latest
+	gno.land/p/demo/ufmt v0.0.0-latest
+)
diff --git a/examples/gno.land/r/demo/dao-maker/tori/gno.mod b/examples/gno.land/r/demo/dao_maker/tori/gno.mod
similarity index 58%
rename from examples/gno.land/r/demo/dao-maker/tori/gno.mod
rename to examples/gno.land/r/demo/dao_maker/tori/gno.mod
index 08f663b8a2b..36254f364a7 100644
--- a/examples/gno.land/r/demo/dao-maker/tori/gno.mod
+++ b/examples/gno.land/r/demo/dao_maker/tori/gno.mod
@@ -1,8 +1,8 @@
-module gno.land/r/demo/dao-maker/tori
+module gno.land/r/demo/dao_maker/tori
 
 require (
-	gno.land/p/demo/dao-maker/dao_interfaces v0.0.0-latest
-	gno.land/p/demo/dao-maker/jsonutil v0.0.0-latest
+	gno.land/p/demo/dao_maker/dao_interfaces v0.0.0-latest
+	gno.land/p/demo/dao_maker/jsonutil v0.0.0-latest
 	gno.land/p/demo/grc/grc20 v0.0.0-latest
 	gno.land/p/demo/json v0.0.0-latest
 	gno.land/p/demo/ufmt v0.0.0-latest
diff --git a/examples/gno.land/r/demo/dao-maker/tori/messages.gno b/examples/gno.land/r/demo/dao_maker/tori/messages.gno
similarity index 95%
rename from examples/gno.land/r/demo/dao-maker/tori/messages.gno
rename to examples/gno.land/r/demo/dao_maker/tori/messages.gno
index d171686d1e7..32adb2afae3 100644
--- a/examples/gno.land/r/demo/dao-maker/tori/messages.gno
+++ b/examples/gno.land/r/demo/dao_maker/tori/messages.gno
@@ -4,8 +4,8 @@ import (
 	"strconv"
 	"strings"
 
-	"gno.land/p/demo/dao-maker/dao_interfaces"
-	"gno.land/p/demo/dao-maker/jsonutil"
+	"gno.land/p/demo/dao_maker/dao_interfaces"
+	"gno.land/p/demo/dao_maker/jsonutil"
 	"gno.land/p/demo/json"
 	"gno.land/p/demo/users"
 )
@@ -20,7 +20,7 @@ type ExecutableMessageMintTori struct {
 var _ dao_interfaces.ExecutableMessage = &ExecutableMessageMintTori{}
 
 func (msg ExecutableMessageMintTori) Type() string {
-	return "gno.land/r/demo/dao-maker/tori.Mint"
+	return "gno.land/r/demo/dao_maker/tori.Mint"
 }
 
 func (msg *ExecutableMessageMintTori) String() string {
@@ -81,7 +81,7 @@ type ExecutableMessageBurnTori struct {
 var _ dao_interfaces.ExecutableMessage = &ExecutableMessageBurnTori{}
 
 func (msg ExecutableMessageBurnTori) Type() string {
-	return "gno.land/r/demo/dao-maker/tori.Burn"
+	return "gno.land/r/demo/dao_maker/tori.Burn"
 }
 
 func (msg *ExecutableMessageBurnTori) String() string {
@@ -141,7 +141,7 @@ type ExecutableMessageChangeAdmin struct {
 var _ dao_interfaces.ExecutableMessage = &ExecutableMessageChangeAdmin{}
 
 func (msg ExecutableMessageChangeAdmin) Type() string {
-	return "gno.land/r/demo/dao-maker/tori.ChangeAdmin"
+	return "gno.land/r/demo/dao_maker/tori.ChangeAdmin"
 }
 
 func (msg *ExecutableMessageChangeAdmin) String() string {
diff --git a/examples/gno.land/r/demo/dao-maker/tori/tori.gno b/examples/gno.land/r/demo/dao_maker/tori/tori.gno
similarity index 97%
rename from examples/gno.land/r/demo/dao-maker/tori/tori.gno
rename to examples/gno.land/r/demo/dao_maker/tori/tori.gno
index f81a310c7de..1dc53ada7ff 100644
--- a/examples/gno.land/r/demo/dao-maker/tori/tori.gno
+++ b/examples/gno.land/r/demo/dao_maker/tori/tori.gno
@@ -13,7 +13,7 @@ import (
 var (
 	tori     *grc20.AdminToken
 	userTori grc20.IGRC20
-	admin    std.Address = std.DerivePkgAddr("gno.land/r/demo/dao-maker/dao_realm")
+	admin    std.Address = std.DerivePkgAddr("gno.land/r/demo/dao_maker/dao_realm")
 )
 
 func init() {