diff --git a/examples/gno.land/r/demo/wugnot/gno.mod b/examples/gno.land/r/demo/wugnot/gno.mod
index 1f03ded515c..f076e90e068 100644
--- a/examples/gno.land/r/demo/wugnot/gno.mod
+++ b/examples/gno.land/r/demo/wugnot/gno.mod
@@ -3,4 +3,6 @@ module gno.land/r/demo/wugnot
 require (
 	gno.land/p/demo/grc/grc20 v0.0.0-latest
 	gno.land/p/demo/ufmt v0.0.0-latest
+	gno.land/p/demo/users v0.0.0-latest
+	gno.land/r/demo/users v0.0.0-latest
 )
diff --git a/examples/gno.land/r/demo/wugnot/wugnot.gno b/examples/gno.land/r/demo/wugnot/wugnot.gno
index 85a05ae3d6d..4896d23499e 100644
--- a/examples/gno.land/r/demo/wugnot/wugnot.gno
+++ b/examples/gno.land/r/demo/wugnot/wugnot.gno
@@ -6,6 +6,10 @@ import (
 
 	"gno.land/p/demo/grc/grc20"
 	"gno.land/p/demo/ufmt"
+
+	"gno.land/r/demo/users"
+
+	pusers "gno.land/p/demo/users"
 )
 
 var (
@@ -82,16 +86,16 @@ func TotalSupply() uint64 {
 	return wugnot.TotalSupply()
 }
 
-func BalanceOf(owner std.Address) uint64 {
-	balance, err := wugnot.BalanceOf(owner)
+func BalanceOf(owner pusers.AddressOrName) uint64 {
+	balance, err := wugnot.BalanceOf(users.Resolve(owner))
 	if err != nil {
 		panic(err)
 	}
 	return balance
 }
 
-func Allowance(owner, spender std.Address) uint64 {
-	allowance, err := wugnot.Allowance(owner, spender)
+func Allowance(owner, spender pusers.AddressOrName) uint64 {
+	allowance, err := wugnot.Allowance(users.Resolve(owner), users.Resolve(spender))
 	if err != nil {
 		panic(err)
 	}
@@ -101,25 +105,25 @@ func Allowance(owner, spender std.Address) uint64 {
 // setters.
 //
 
-func Transfer(to std.Address, amount uint64) {
+func Transfer(to pusers.AddressOrName, amount uint64) {
 	caller := std.PrevRealm().Addr()
-	err := wugnot.Transfer(caller, to, amount)
+	err := wugnot.Transfer(caller, users.Resolve(to), amount)
 	if err != nil {
 		panic(err)
 	}
 }
 
-func Approve(spender std.Address, amount uint64) {
+func Approve(spender pusers.AddressOrName, amount uint64) {
 	caller := std.PrevRealm().Addr()
-	err := wugnot.Approve(caller, spender, amount)
+	err := wugnot.Approve(caller, users.Resolve(spender), amount)
 	if err != nil {
 		panic(err)
 	}
 }
 
-func TransferFrom(from, to std.Address, amount uint64) {
+func TransferFrom(from, to pusers.AddressOrName, amount uint64) {
 	caller := std.PrevRealm().Addr()
-	err := wugnot.TransferFrom(caller, from, to, amount)
+	err := wugnot.TransferFrom(caller, users.Resolve(from), users.Resolve(to), amount)
 	if err != nil {
 		panic(err)
 	}
diff --git a/examples/gno.land/r/demo/wugnot/z0_filetest.gno b/examples/gno.land/r/demo/wugnot/z0_filetest.gno
index fa2f45682b1..6eb47d7636d 100644
--- a/examples/gno.land/r/demo/wugnot/z0_filetest.gno
+++ b/examples/gno.land/r/demo/wugnot/z0_filetest.gno
@@ -7,6 +7,8 @@ import (
 
 	"gno.land/p/demo/testutils"
 	"gno.land/r/demo/wugnot"
+
+	pusers "gno.land/p/demo/users"
 )
 
 var (
@@ -37,7 +39,7 @@ func main() {
 
 func printBalances() {
 	printSingleBalance := func(name string, addr std.Address) {
-		wugnotBal := wugnot.BalanceOf(addr)
+		wugnotBal := wugnot.BalanceOf(pusers.AddressOrName(addr))
 		std.TestSetOrigCaller(addr)
 		abanker := std.GetBanker(std.BankerTypeOrigSend)
 		acoins := abanker.GetCoins(addr).AmountOf("ugnot")
diff --git a/gno.land/cmd/gnoland/testdata/issue-1786.txtar b/gno.land/cmd/gnoland/testdata/issue-1786.txtar
index c42cca490b6..a14f06cf9b9 100644
--- a/gno.land/cmd/gnoland/testdata/issue-1786.txtar
+++ b/gno.land/cmd/gnoland/testdata/issue-1786.txtar
@@ -48,6 +48,7 @@ import (
 	"gno.land/r/demo/wugnot"
 
 	"gno.land/p/demo/ufmt"
+	pusers "gno.land/p/demo/users"
 )
 
 func ProxyWrap() {
@@ -65,17 +66,17 @@ func ProxyWrap() {
 	wugnot.Deposit() // `proxywugnot` has ugnot
 
 	// SEND WUGNOT: PROXY_WUGNOT -> USER
-	wugnot.Transfer(std.GetOrigCaller(), ugnotSent)
+	wugnot.Transfer(pusers.AddressOrName(std.GetOrigCaller()), ugnotSent)
 }
 
 func ProxyUnwrap(wugnotAmount uint64) {
 	if wugnotAmount == 0 {
 		return
 	}
-	userOldWugnot := wugnot.BalanceOf(std.GetOrigCaller())
+	userOldWugnot := wugnot.BalanceOf(pusers.AddressOrName(std.GetOrigCaller()))
 
 	// SEND WUGNOT: USER -> PROXY_WUGNOT
-	wugnot.TransferFrom(std.GetOrigCaller(), std.CurrentRealm().Addr(), wugnotAmount)
+	wugnot.TransferFrom(pusers.AddressOrName(std.GetOrigCaller()), pusers.AddressOrName(std.CurrentRealm().Addr()), wugnotAmount)
 
 	// UNWRAP IT
 	wugnot.Withdraw(wugnotAmount)