diff --git a/core/Application.php b/core/Application.php
index 5a8b6be089..a65f1f3fa6 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -70,11 +70,11 @@ class Application extends App {
 					if (!$table->hasIndex('parent_index')) {
 						$subject->addHintForMissingSubject($table->getName(), 'parent_index');
 					}
-					if (!$table->hasIndex('uid_owner')) {
-						$subject->addHintForMissingSubject($table->getName(), 'uid_owner');
+					if (!$table->hasIndex('owner_index')) {
+						$subject->addHintForMissingSubject($table->getName(), 'owner_index');
 					}
-					if (!$table->hasIndex('uid_initiator')) {
-						$subject->addHintForMissingSubject($table->getName(), 'uid_initiator');
+					if (!$table->hasIndex('initiator_index')) {
+						$subject->addHintForMissingSubject($table->getName(), 'initiator_index');
 					}
 				}
 
diff --git a/core/Command/Db/AddMissingIndices.php b/core/Command/Db/AddMissingIndices.php
index c2068b3691..8fb5f9b4e8 100644
--- a/core/Command/Db/AddMissingIndices.php
+++ b/core/Command/Db/AddMissingIndices.php
@@ -99,7 +99,7 @@ class AddMissingIndices extends Command {
 				$output->writeln('<info>Share table updated successfully.</info>');
 			}
 
-			if (!$table->hasIndex('uid_owner')) {
+			if (!$table->hasIndex('owner_index')) {
 				$output->writeln('<info>Adding additional owner index to the share table, this can take some time...</info>');
 				$table->addIndex(['uid_owner'], 'owner_index');
 				$this->connection->migrateToSchema($schema->getWrappedSchema());
@@ -107,7 +107,7 @@ class AddMissingIndices extends Command {
 				$output->writeln('<info>Share table updated successfully.</info>');
 			}
 
-			if (!$table->hasIndex('uid_initiator')) {
+			if (!$table->hasIndex('initiator_index')) {
 				$output->writeln('<info>Adding additional initiator index to the share table, this can take some time...</info>');
 				$table->addIndex(['uid_initiator'], 'initiator_index');
 				$this->connection->migrateToSchema($schema->getWrappedSchema());