diff --git a/server/callback.go b/server/callback.go
index 5828d0c..2faf86e 100644
--- a/server/callback.go
+++ b/server/callback.go
@@ -100,13 +100,13 @@ type UnimplementedCallbackServer struct{}
 
 func (u UnimplementedCallbackServer) mustEmbedUnimplementedCallbackServer() {}
 
-func (u UnimplementedCallbackServer) Callback(callback *CallbackRequest) (callbackResp *CallbackResponse, callbackErr *CallbackError) {
+func (u UnimplementedCallbackServer) Callback(req *CallbackRequest) (res *CallbackResponse, errRes *CallbackError) {
 	ce := CallbackErrorUnimplemented
-	callbackErr = &ce
+	errRes = &ce
 	return
 }
 
 type CallbackServer interface {
 	mustEmbedUnimplementedCallbackServer()
-	Callback(callback *CallbackRequest) (callbackResp *CallbackResponse, callbackErr *CallbackError)
+	Callback(*CallbackRequest) (*CallbackResponse, *CallbackError)
 }
diff --git a/server/token.go b/server/token.go
index f674465..1c87cf1 100644
--- a/server/token.go
+++ b/server/token.go
@@ -117,13 +117,13 @@ type UnimplementedTokenServer struct{}
 
 func (u UnimplementedTokenServer) mustEmbedUnimplementedTokenServer() {}
 
-func (u UnimplementedTokenServer) Token(token *TokenRequest) (tokenResp *TokenResponse, tokenErr *TokenError) {
+func (u UnimplementedTokenServer) Token(req *TokenRequest) (res *TokenResponse, errRes *TokenError) {
 	te := TokenErrorUnimplemented
-	tokenErr = &te
+	errRes = &te
 	return
 }
 
 type TokenServer interface {
 	mustEmbedUnimplementedTokenServer()
-	Token(token *TokenRequest) (tokenResp *TokenResponse, tokenErr *TokenError)
+	Token(*TokenRequest) (*TokenResponse, *TokenError)
 }