diff --git a/internal/utils/minmax.go b/internal/utils/minmax.go
index ee1f85f62..bed2ef7d0 100644
--- a/internal/utils/minmax.go
+++ b/internal/utils/minmax.go
@@ -10,8 +10,8 @@ import (
 // InfDuration is a duration of infinite length
 const InfDuration = time.Duration(math.MaxInt64)
 
-// Max returns the maximum of two Ints
-func Max(a, b int) int {
+// MaxInt returns the maximum of two Ints
+func MaxInt(a, b int) int {
 	if a < b {
 		return b
 	}
diff --git a/internal/utils/minmax_test.go b/internal/utils/minmax_test.go
index 883d0349b..4168fe585 100644
--- a/internal/utils/minmax_test.go
+++ b/internal/utils/minmax_test.go
@@ -11,8 +11,8 @@ import (
 var _ = Describe("Min / Max", func() {
 	Context("Max", func() {
 		It("returns the maximum", func() {
-			Expect(Max(5, 7)).To(Equal(7))
-			Expect(Max(7, 5)).To(Equal(7))
+			Expect(MaxInt(5, 7)).To(Equal(7))
+			Expect(MaxInt(7, 5)).To(Equal(7))
 		})
 
 		It("returns the maximum uint32", func() {
diff --git a/token_store.go b/token_store.go
index 9641dc5a7..191cacc0c 100644
--- a/token_store.go
+++ b/token_store.go
@@ -27,7 +27,7 @@ func (s *singleOriginTokenStore) Pop() *ClientToken {
 	s.p = s.index(s.p - 1)
 	token := s.tokens[s.p]
 	s.tokens[s.p] = nil
-	s.len = utils.Max(s.len-1, 0)
+	s.len = utils.MaxInt(s.len-1, 0)
 	return token
 }