6 files changed, 9 insertions, 9 deletions
diff --git a/internal/api/client/accounts/mute.go b/internal/api/client/accounts/mute.go
index 37cd3bbff..affb0f055 100644
--- a/internal/api/client/accounts/mute.go
+++ b/internal/api/client/accounts/mute.go
@@ -138,7 +138,7 @@ func (m *Module) AccountMutePOSTHandler(c *gin.Context) {
 
 func normalizeCreateUpdateMute(form *apimodel.UserMuteCreateUpdateRequest) error {
 	// Apply defaults for missing fields.
-	form.Notifications = util.Ptr(util.PtrValueOr(form.Notifications, false))
+	form.Notifications = util.Ptr(util.PtrOrValue(form.Notifications, false))
 
 	// Normalize mute duration if necessary.
 	// If we parsed this as JSON, expires_in
diff --git a/internal/api/client/filters/v1/validate.go b/internal/api/client/filters/v1/validate.go
index 550df54fa..cce00fdc4 100644
--- a/internal/api/client/filters/v1/validate.go
+++ b/internal/api/client/filters/v1/validate.go
@@ -40,8 +40,8 @@ func validateNormalizeCreateUpdateFilter(form *model.FilterCreateUpdateRequestV1
 	}
 
 	// Apply defaults for missing fields.
-	form.WholeWord = util.Ptr(util.PtrValueOr(form.WholeWord, false))
-	form.Irreversible = util.Ptr(util.PtrValueOr(form.Irreversible, false))
+	form.WholeWord = util.Ptr(util.PtrOrValue(form.WholeWord, false))
+	form.Irreversible = util.Ptr(util.PtrOrValue(form.Irreversible, false))
 
 	if *form.Irreversible {
 		return errors.New("irreversible aka server-side drop filters are not supported yet")
diff --git a/internal/api/client/filters/v2/filterkeywordget_test.go b/internal/api/client/filters/v2/filterkeywordget_test.go
index a5d8754a6..13e90c0c2 100644
--- a/internal/api/client/filters/v2/filterkeywordget_test.go
+++ b/internal/api/client/filters/v2/filterkeywordget_test.go
@@ -100,7 +100,7 @@ func (suite *FiltersTestSuite) TestGetFilterKeyword() {
 	suite.NotEmpty(filterKeyword)
 	suite.Equal(expectedFilterKeyword.ID, filterKeyword.ID)
 	suite.Equal(expectedFilterKeyword.Keyword, filterKeyword.Keyword)
-	suite.Equal(util.PtrValueOr(expectedFilterKeyword.WholeWord, false), filterKeyword.WholeWord)
+	suite.Equal(util.PtrOrValue(expectedFilterKeyword.WholeWord, false), filterKeyword.WholeWord)
 }
 
 func (suite *FiltersTestSuite) TestGetAnotherAccountsFilterKeyword() {
diff --git a/internal/api/client/filters/v2/filterkeywordpost.go b/internal/api/client/filters/v2/filterkeywordpost.go
index fab7dc812..ba8f80135 100644
--- a/internal/api/client/filters/v2/filterkeywordpost.go
+++ b/internal/api/client/filters/v2/filterkeywordpost.go
@@ -147,7 +147,7 @@ func validateNormalizeCreateUpdateFilterKeyword(form *apimodel.FilterKeywordCrea
 		return err
 	}
 
-	form.WholeWord = util.Ptr(util.PtrValueOr(form.WholeWord, false))
+	form.WholeWord = util.Ptr(util.PtrOrValue(form.WholeWord, false))
 
 	return nil
 }
diff --git a/internal/api/client/filters/v2/filterpost.go b/internal/api/client/filters/v2/filterpost.go
index 732b81041..13270b1e5 100644
--- a/internal/api/client/filters/v2/filterpost.go
+++ b/internal/api/client/filters/v2/filterpost.go
@@ -192,7 +192,7 @@ func validateNormalizeCreateFilter(form *apimodel.FilterCreateRequestV2) error {
 	if err := validate.FilterTitle(form.Title); err != nil {
 		return err
 	}
-	action := util.PtrValueOr(form.FilterAction, apimodel.FilterActionWarn)
+	action := util.PtrOrValue(form.FilterAction, apimodel.FilterActionWarn)
 	if err := validate.FilterAction(action); err != nil {
 		return err
 	}
@@ -253,7 +253,7 @@ func validateNormalizeCreateFilter(form *apimodel.FilterCreateRequestV2) error {
 		if err := validate.FilterKeyword(formKeyword.Keyword); err != nil {
 			return err
 		}
-		form.Keywords[i].WholeWord = util.Ptr(util.PtrValueOr(formKeyword.WholeWord, false))
+		form.Keywords[i].WholeWord = util.Ptr(util.PtrOrValue(formKeyword.WholeWord, false))
 	}
 	for _, formStatus := range form.Statuses {
 		if err := validate.ULID(formStatus.StatusID, "status_id"); err != nil {
diff --git a/internal/api/client/filters/v2/filterput.go b/internal/api/client/filters/v2/filterput.go
index cc3531838..c86dc36dc 100644
--- a/internal/api/client/filters/v2/filterput.go
+++ b/internal/api/client/filters/v2/filterput.go
@@ -289,7 +289,7 @@ func validateNormalizeUpdateFilter(form *apimodel.FilterUpdateRequestV2) error {
 			}
 		}
 
-		destroy := util.PtrValueOr(formKeyword.Destroy, false)
+		destroy := util.PtrOrValue(formKeyword.Destroy, false)
 		form.Keywords[i].Destroy = &destroy
 
 		if destroy && formKeyword.ID == nil {
@@ -305,7 +305,7 @@ func validateNormalizeUpdateFilter(form *apimodel.FilterUpdateRequestV2) error {
 			}
 		}
 
-		destroy := util.PtrValueOr(formStatus.Destroy, false)
+		destroy := util.PtrOrValue(formStatus.Destroy, false)
 		form.Statuses[i].Destroy = &destroy
 
 		switch {