diff --git a/grade/internal/infrastructure/repositories/specialist/queries/assignment/assignment_insert_query.go b/grade/internal/infrastructure/repositories/specialist/queries/assignment/assignment_insert_query.go
index e886d975..5e3ae409 100644
--- a/grade/internal/infrastructure/repositories/specialist/queries/assignment/assignment_insert_query.go
+++ b/grade/internal/infrastructure/repositories/specialist/queries/assignment/assignment_insert_query.go
@@ -16,7 +16,7 @@ type AssignmentInsertQuery struct {
 
 func (q AssignmentInsertQuery) sql() string {
 	return `
-		INSERT INTO assignment (
+		INSERT INTO specialist_assignment (
 			tenant_id, specialist_id, specialist_version, assigned_grade, reason, created_at
 		) VALUES ($1, $2, $3, $4, $5, $6)
 		ON CONFLICT DO NOTHING`
diff --git a/grade/internal/infrastructure/repositories/specialist/queries/endorsement/endorsement_insert_query.go b/grade/internal/infrastructure/repositories/specialist/queries/endorsement/endorsement_insert_query.go
index 99dfa279..10d8525d 100644
--- a/grade/internal/infrastructure/repositories/specialist/queries/endorsement/endorsement_insert_query.go
+++ b/grade/internal/infrastructure/repositories/specialist/queries/endorsement/endorsement_insert_query.go
@@ -16,7 +16,7 @@ type EndorsementInsertQuery struct {
 
 func (q EndorsementInsertQuery) sql() string {
 	return `
-		INSERT INTO endorsement (
+		INSERT INTO specialist_endorsement (
 			tenant_id, specialist_id, specialist_grade, specialist_version,
 			artifact_id, endorser_id, endorser_grade, endorser_version, created_at
 		) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
diff --git a/grade/internal/infrastructure/sql/init.sql b/grade/internal/infrastructure/sql/init.sql
index f6a69fe4..412ec697 100644
--- a/grade/internal/infrastructure/sql/init.sql
+++ b/grade/internal/infrastructure/sql/init.sql
@@ -176,7 +176,7 @@ CREATE TABLE specialist (
 );
 
 
-CREATE TABLE endorsement (
+CREATE TABLE specialist_endorsement (
     tenant_id integer NOT NULL,
     specialist_id bigint NOT NULL,
     specialist_grade smallint NOT NULL DEFAULT 0,
@@ -194,7 +194,7 @@ CREATE TABLE endorsement (
 );
 
 
-CREATE TABLE assignment (
+CREATE TABLE specialist_assignment (
     tenant_id integer NOT NULL,
     specialist_id bigint NOT NULL,
     specialist_version integer NOT NULL,