diff --git a/server/internal/handlers/item/v1/item.go b/server/internal/handlers/item/v1/item.go
index a4a0765..b416c68 100644
--- a/server/internal/handlers/item/v1/item.go
+++ b/server/internal/handlers/item/v1/item.go
@@ -12,8 +12,8 @@ import (
 	itemv1 "github.com/spotdemo4/trevstack/server/internal/connect/item/v1"
 	"github.com/spotdemo4/trevstack/server/internal/connect/item/v1/itemv1connect"
 	"github.com/spotdemo4/trevstack/server/internal/interceptors"
+	"github.com/spotdemo4/trevstack/server/internal/putil"
 	"github.com/spotdemo4/trevstack/server/internal/sqlc"
-	"github.com/spotdemo4/trevstack/server/internal/util"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
@@ -80,9 +80,9 @@ func (h *Handler) GetItems(ctx context.Context, req *connect.Request[itemv1.GetI
 	// Get items
 	items, err := h.db.GetItems(ctx, sqlc.GetItemsParams{
 		UserID: userid,
-		Name:   util.NullLike(req.Msg.Filter),
-		Start:  util.NullTimestamp(req.Msg.Start),
-		End:    util.NullTimestamp(req.Msg.End),
+		Name:   putil.NullLike(req.Msg.Filter),
+		Start:  putil.NullTimestamp(req.Msg.Start),
+		End:    putil.NullTimestamp(req.Msg.End),
 		Offset: int64(offset),
 		Limit:  int64(limit),
 	})
@@ -97,9 +97,9 @@ func (h *Handler) GetItems(ctx context.Context, req *connect.Request[itemv1.GetI
 	// Get items count
 	count, err := h.db.GetItemsCount(ctx, sqlc.GetItemsCountParams{
 		UserID: userid,
-		Name:   util.NullLike(req.Msg.Filter),
-		Start:  util.NullTimestamp(req.Msg.Start),
-		End:    util.NullTimestamp(req.Msg.End),
+		Name:   putil.NullLike(req.Msg.Filter),
+		Start:  putil.NullTimestamp(req.Msg.Start),
+		End:    putil.NullTimestamp(req.Msg.End),
 	})
 	if err != nil {
 		return nil, connect.NewError(connect.CodeInternal, err)
@@ -157,8 +157,8 @@ func (h *Handler) UpdateItem(ctx context.Context, req *connect.Request[itemv1.Up
 		// set
 		Name:        req.Msg.Name,
 		Description: req.Msg.Description,
-		Price:       util.NullFloat64(req.Msg.Price),
-		Quantity:    util.NullInt64(req.Msg.Quantity),
+		Price:       putil.NullFloat64(req.Msg.Price),
+		Quantity:    putil.NullInt64(req.Msg.Quantity),
 
 		// where
 		ID:     req.Msg.Id,
diff --git a/server/internal/handlers/user/v1/user.go b/server/internal/handlers/user/v1/user.go
index 46630af..b750036 100644
--- a/server/internal/handlers/user/v1/user.go
+++ b/server/internal/handlers/user/v1/user.go
@@ -19,8 +19,8 @@ import (
 	userv1 "github.com/spotdemo4/trevstack/server/internal/connect/user/v1"
 	"github.com/spotdemo4/trevstack/server/internal/connect/user/v1/userv1connect"
 	"github.com/spotdemo4/trevstack/server/internal/interceptors"
+	"github.com/spotdemo4/trevstack/server/internal/putil"
 	"github.com/spotdemo4/trevstack/server/internal/sqlc"
-	"github.com/spotdemo4/trevstack/server/internal/util"
 	"golang.org/x/crypto/bcrypt"
 )
 
@@ -96,7 +96,7 @@ func (h *Handler) UpdatePassword(ctx context.Context, req *connect.Request[userv
 
 	// Update password
 	err = h.db.UpdateUser(ctx, sqlc.UpdateUserParams{
-		Password: util.ToPointer(string(hash)),
+		Password: putil.ToPointer(string(hash)),
 		ID:       userid,
 	})
 	if err != nil {
diff --git a/server/internal/util/pointers.go b/server/internal/putil/pointers.go
similarity index 93%
rename from server/internal/util/pointers.go
rename to server/internal/putil/pointers.go
index 59ed55d..0c65a0c 100644
--- a/server/internal/util/pointers.go
+++ b/server/internal/putil/pointers.go
@@ -1,4 +1,4 @@
-package util
+package putil
 
 func DerefOrEmpty[T any](val *T) T {
 	if val == nil {
diff --git a/server/internal/util/sql.go b/server/internal/putil/sql.go
similarity index 97%
rename from server/internal/util/sql.go
rename to server/internal/putil/sql.go
index 8055fc9..f46b35b 100644
--- a/server/internal/util/sql.go
+++ b/server/internal/putil/sql.go
@@ -1,4 +1,4 @@
-package util
+package putil
 
 import (
 	"fmt"