diff --git a/pkg/service/audit_log_query_test.go b/pkg/service/audit_log_query_test.go
index abb8971..a914357 100644
--- a/pkg/service/audit_log_query_test.go
+++ b/pkg/service/audit_log_query_test.go
@@ -87,7 +87,7 @@ func (m *mockElasticSearchQuery) Handle(msg bytes.Buffer) (map[string]interface{
 func TestGetAuditLogByProjectsSimple(t *testing.T) {
 	esq := &mockElasticSearchQuery{}
 	al := &AuditLogService{auditQuery: esq}
-	req := v1.AuditLogSearchRequest{
+	req := v1.GetAuditLogSearchRequest{
 		Filter: &v1.AuditLogQueryFilter{
 			QueryString:   "query-string",
 			Projects:      []string{"project-one", "project-two"},
@@ -119,7 +119,7 @@ func TestGetAuditLogByProjectsSimple(t *testing.T) {
 func TestGetAuditLogByProjectsNoProject(t *testing.T) {
 	esq := &mockElasticSearchQuery{}
 	al := &AuditLogService{auditQuery: esq}
-	req := v1.AuditLogSearchRequest{
+	req := v1.GetAuditLogSearchRequest{
 		Metadata: &v3.Metadata{UrlScope: "url/project"},
 		Filter: &v1.AuditLogQueryFilter{
 			QueryString: "query-string",
diff --git a/pkg/service/relay_audit_query_test.go b/pkg/service/relay_audit_query_test.go
index 1a954e3..280708b 100644
--- a/pkg/service/relay_audit_query_test.go
+++ b/pkg/service/relay_audit_query_test.go
@@ -87,7 +87,7 @@ type rmd struct {
 func TestGetRelayAuditLogByProjectsSimple(t *testing.T) {
 	esq := &mockElasticSearchQuery{}
 	al := &RelayAuditService{relayQuery: esq}
-	req := v1.RelayAuditSearchRequest{
+	req := v1.RelayAuditRequest{
 		Filter: &v1.RelayAuditQueryFilter{
 			QueryString:   "query-string",
 			Projects:      []string{"project-one", "project-two"},
@@ -123,7 +123,7 @@ func TestGetRelayAuditLogByProjectsSimple(t *testing.T) {
 func TestGetRelayAuditLogByProjectsNoProject(t *testing.T) {
 	esq := &mockElasticSearchQuery{}
 	al := &RelayAuditService{relayQuery: esq}
-	req := v1.RelayAuditSearchRequest{
+	req := v1.RelayAuditRequest{
 		Metadata: &v3.Metadata{UrlScope: "url/project"},
 		Filter: &v1.RelayAuditQueryFilter{
 			QueryString: "query-string",
diff --git a/pkg/service/user_test.go b/pkg/service/user_test.go
index 3075dd8..e80a5ba 100644
--- a/pkg/service/user_test.go
+++ b/pkg/service/user_test.go
@@ -742,7 +742,7 @@ func TestUserForgotPassword(t *testing.T) {
 
 	uuuid := addUserFetchExpectation(mock)
 
-	fpreq := &userrpcv3.ForgotPasswordRequest{Username: "user-" + uuuid}
+	fpreq := &userrpcv3.UserForgotPasswordRequest{Username: "user-" + uuuid}
 	fpresp, err := us.ForgotPassword(context.Background(), fpreq)
 	if err != nil {
 		t.Fatal("could not fetch password recovery link:", err)