diff --git a/example/internal/mock/storage.go b/example/internal/mock/storage.go
index 497c1b0..8c1ab38 100644
--- a/example/internal/mock/storage.go
+++ b/example/internal/mock/storage.go
@@ -300,7 +300,7 @@ func (c *ConfClient) IsScopeAllowed(scope string) bool {
 	return false
 }
 
-func (c *ConfClient) UserInfoInIDToken() bool {
+func (c *ConfClient) IDTokenUserinfoClaimsAssertion() bool {
 	return false
 }
 
diff --git a/pkg/op/client.go b/pkg/op/client.go
index 06fbcc3..6d0891c 100644
--- a/pkg/op/client.go
+++ b/pkg/op/client.go
@@ -37,7 +37,7 @@ type Client interface {
 	RestrictAdditionalIdTokenScopes() func(scopes []string) []string
 	RestrictAdditionalAccessTokenScopes() func(scopes []string) []string
 	IsScopeAllowed(scope string) bool
-	UserInfoInIDToken() bool
+	IDTokenUserinfoClaimsAssertion() bool
 	ClockSkew() time.Duration
 }
 
diff --git a/pkg/op/mock/client.mock.go b/pkg/op/mock/client.mock.go
index 5a89c34..1a15624 100644
--- a/pkg/op/mock/client.mock.go
+++ b/pkg/op/mock/client.mock.go
@@ -133,6 +133,20 @@ func (mr *MockClientMockRecorder) IDTokenLifetime() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IDTokenLifetime", reflect.TypeOf((*MockClient)(nil).IDTokenLifetime))
 }
 
+// IDTokenUserinfoClaimsAssertion mocks base method
+func (m *MockClient) IDTokenUserinfoClaimsAssertion() bool {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "IDTokenUserinfoClaimsAssertion")
+	ret0, _ := ret[0].(bool)
+	return ret0
+}
+
+// IDTokenUserinfoClaimsAssertion indicates an expected call of IDTokenUserinfoClaimsAssertion
+func (mr *MockClientMockRecorder) IDTokenUserinfoClaimsAssertion() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IDTokenUserinfoClaimsAssertion", reflect.TypeOf((*MockClient)(nil).IDTokenUserinfoClaimsAssertion))
+}
+
 // IsScopeAllowed mocks base method
 func (m *MockClient) IsScopeAllowed(arg0 string) bool {
 	m.ctrl.T.Helper()
@@ -230,17 +244,3 @@ func (mr *MockClientMockRecorder) RestrictAdditionalIdTokenScopes() *gomock.Call
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RestrictAdditionalIdTokenScopes", reflect.TypeOf((*MockClient)(nil).RestrictAdditionalIdTokenScopes))
 }
-
-// UserInfoInIDToken mocks base method
-func (m *MockClient) UserInfoInIDToken() bool {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "UserInfoInIDToken")
-	ret0, _ := ret[0].(bool)
-	return ret0
-}
-
-// UserInfoInIDToken indicates an expected call of UserInfoInIDToken
-func (mr *MockClientMockRecorder) UserInfoInIDToken() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UserInfoInIDToken", reflect.TypeOf((*MockClient)(nil).UserInfoInIDToken))
-}
diff --git a/pkg/op/mock/storage.mock.impl.go b/pkg/op/mock/storage.mock.impl.go
index 3accdef..29d0d15 100644
--- a/pkg/op/mock/storage.mock.impl.go
+++ b/pkg/op/mock/storage.mock.impl.go
@@ -185,7 +185,7 @@ func (c *ConfClient) IsScopeAllowed(scope string) bool {
 	return false
 }
 
-func (c *ConfClient) UserInfoInIDToken() bool {
+func (c *ConfClient) IDTokenUserinfoClaimsAssertion() bool {
 	return false
 }
 
diff --git a/pkg/op/token.go b/pkg/op/token.go
index cc6e11b..fe6658a 100644
--- a/pkg/op/token.go
+++ b/pkg/op/token.go
@@ -105,7 +105,7 @@ func CreateIDToken(ctx context.Context, issuer string, authReq AuthRequest, vali
 			return "", err
 		}
 		claims.SetAccessTokenHash(atHash)
-		if !client.UserInfoInIDToken() {
+		if !client.IDTokenUserinfoClaimsAssertion() {
 			scopes = removeUserinfoScopes(scopes)
 		}
 	}