diff --git a/src/database/entities/InstanceBan.ts b/src/database/entities/InstanceBan.ts
index 879ad1a79..67b0cb412 100644
--- a/src/database/entities/InstanceBan.ts
+++ b/src/database/entities/InstanceBan.ts
@@ -30,15 +30,15 @@ export class InstanceBan extends BaseClass {
     @Column()
     reason: string;
 
-    @Index("instance_bans_user_id_idx", { type: "hash" })
+    @Index("IDX_instance_ban_user_id", { type: "hash" })
     @Column({ type: "int8", nullable: true })
     user_id?: string;
 
-    @Index("instance_bans_fingerprint_idx", { type: "hash" })
+    @Index("IDX_instance_ban_fingerprint", { type: "hash" })
     @Column({ nullable: true })
     fingerprint?: string;
 
-    @Index("instance_bans_ip_address_idx", { type: "hash" })
+    @Index("IDX_instance_ban_ip_address", { type: "hash" })
     @Column({ nullable: true })
     ip_address?: string;
 
@@ -54,7 +54,7 @@ export class InstanceBan extends BaseClass {
     @RelationId((instance_ban: InstanceBan) => instance_ban.origin_instance_ban)
     origin_instance_ban_id?: string;
 
-    @JoinColumn({ name: "origin_instance_ban_id" })
+    @JoinColumn({ name: "origin_instance_ban_id", foreignKeyConstraintName: "FK_origin_instance_ban_id" })
     @OneToOne(() => InstanceBan, { nullable: true, onDelete: "SET NULL" })
     origin_instance_ban?: InstanceBan;
 
diff --git a/src/database/migration/postgres/1782925307189-NameIndexes.ts b/src/database/migration/postgres/1782925307189-NameIndexes.ts
new file mode 100644
index 000000000..c6f568546
--- /dev/null
+++ b/src/database/migration/postgres/1782925307189-NameIndexes.ts
@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class NameIndexes1782925307189 implements MigrationInterface {
+    name = "NameIndexes1782925307189";
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER INDEX "instance_bans_fingerprint_idx" RENAME TO "IDX_instance_ban_fingerprint"`);
+        await queryRunner.query(`ALTER INDEX "instance_bans_ip_address_idx" RENAME TO "IDX_instance_ban_ip_address"`);
+        await queryRunner.query(`ALTER INDEX "instance_bans_user_id_idx" RENAME TO "IDX_instance_ban_user_id"`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER INDEX "IDX_instance_ban_fingerprint" RENAME TO "instance_bans_fingerprint_idx"`);
+        await queryRunner.query(`ALTER INDEX "IDX_instance_ban_ip_address" RENAME TO "instance_bans_ip_address_idx"`);
+        await queryRunner.query(`ALTER INDEX "IDX_instance_ban_user_id" RENAME TO "instance_bans_user_id_idx"`);
+    }
+}