diff --git a/pkg/op/auth_request.go b/pkg/op/auth_request.go
index 435e3f4..4b5837a 100644
--- a/pkg/op/auth_request.go
+++ b/pkg/op/auth_request.go
@@ -79,7 +79,6 @@ func Authorize(w http.ResponseWriter, r *http.Request, authorizer Authorizer) {
 		AuthRequestError(w, r, nil, err, authorizer)
 		return
 	}
-	ctx = r.Context()
 	if authReq.RequestParam != "" && authorizer.RequestObjectSupported() {
 		err = ParseRequestObject(ctx, authReq, authorizer.Storage(), IssuerFromContext(ctx))
 		if err != nil {
@@ -452,7 +451,7 @@ func ParseAuthorizeCallbackRequest(r *http.Request) (id string, err error) {
 
 // AuthResponse creates the successful authentication response (either code or tokens)
 func AuthResponse(authReq AuthRequest, authorizer Authorizer, w http.ResponseWriter, r *http.Request) {
-	ctx, span := tracer.Start(r.Context(), "ValidateAuthRequest")
+	ctx, span := tracer.Start(r.Context(), "AuthResponse")
 	r = r.WithContext(ctx)
 	defer span.End()
 
diff --git a/pkg/op/device.go b/pkg/op/device.go
index d08b4fd..11638b0 100644
--- a/pkg/op/device.go
+++ b/pkg/op/device.go
@@ -299,7 +299,7 @@ func (r *DeviceAuthorizationState) GetSubject() string {
 }
 
 func CheckDeviceAuthorizationState(ctx context.Context, clientID, deviceCode string, exchanger Exchanger) (*DeviceAuthorizationState, error) {
-	ctx, span := tracer.Start(ctx, "CheckDeviceAuthorization")
+	ctx, span := tracer.Start(ctx, "CheckDeviceAuthorizationState")
 	defer span.End()
 
 	storage, err := assertDeviceStorage(exchanger.Storage())
diff --git a/pkg/op/op.go b/pkg/op/op.go
index 2080339..326737a 100644
--- a/pkg/op/op.go
+++ b/pkg/op/op.go
@@ -135,7 +135,6 @@ func CreateRouter(o OpenIDProvider, interceptors ...HttpInterceptor) chi.Router
 	} else {
 		router.Use(cors.New(defaultCORSOptions).Handler)
 	}
-
 	router.Use(intercept(o.IssuerFromRequest, interceptors...))
 	router.HandleFunc(healthEndpoint, healthHandler)
 	router.HandleFunc(readinessEndpoint, readyHandler(o.Probes()))
diff --git a/pkg/op/token_revocation.go b/pkg/op/token_revocation.go
index 537b164..a86a481 100644
--- a/pkg/op/token_revocation.go
+++ b/pkg/op/token_revocation.go
@@ -156,7 +156,7 @@ func RevocationError(err error) StatusError {
 }
 
 func getTokenIDAndSubjectForRevocation(ctx context.Context, userinfoProvider UserinfoProvider, accessToken string) (string, string, bool) {
-	ctx, span := tracer.Start(ctx, "getTokenIDAndSubjectFromRevocation")
+	ctx, span := tracer.Start(ctx, "getTokenIDAndSubjectForRevocation")
 	defer span.End()
 
 	tokenIDSubject, err := userinfoProvider.Crypto().Decrypt(accessToken)
diff --git a/pkg/op/userinfo.go b/pkg/op/userinfo.go
index 4b8f398..839b139 100644
--- a/pkg/op/userinfo.go
+++ b/pkg/op/userinfo.go
@@ -69,7 +69,7 @@ func ParseUserinfoRequest(r *http.Request, decoder httphelper.Decoder) (string,
 }
 
 func getAccessToken(r *http.Request) (string, error) {
-	ctx, span := tracer.Start(r.Context(), "RefreshTokens")
+	ctx, span := tracer.Start(r.Context(), "getAccessToken")
 	r = r.WithContext(ctx)
 	defer span.End()