diff --git a/persistence/sql/migrations/sql/20200810161022_flow_rename.cockroach.down.sql b/persistence/sql/migrations/sql/20200810161022_flow_rename.cockroach.down.sql
index a05ccd5f0f9..7b665f0e166 100644
--- a/persistence/sql/migrations/sql/20200810161022_flow_rename.cockroach.down.sql
+++ b/persistence/sql/migrations/sql/20200810161022_flow_rename.cockroach.down.sql
@@ -1,2 +1,9 @@
 ALTER TABLE "selfservice_login_flows" RENAME TO "selfservice_login_requests";COMMIT TRANSACTION;BEGIN TRANSACTION;
-ALTER TABLE "selfservice_login_flow_methods" RENAME TO "selfservice_login_request_methods";COMMIT TRANSACTION;BEGIN TRANSACTION;
\ No newline at end of file
+ALTER TABLE "selfservice_login_flow_methods" RENAME TO "selfservice_login_request_methods";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_registration_flow_methods" RENAME TO "selfservice_registration_request_methods";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_registration_flows" RENAME TO "selfservice_registration_requests";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_settings_flow_methods" RENAME TO "selfservice_settings_request_methods";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_settings_flows" RENAME TO "selfservice_settings_requests";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_recovery_flow_methods" RENAME TO "selfservice_recovery_request_methods";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_recovery_flows" RENAME TO "selfservice_recovery_requests";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_verification_flows" RENAME TO "selfservice_verification_requests";COMMIT TRANSACTION;BEGIN TRANSACTION;
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20200810161022_flow_rename.cockroach.up.sql b/persistence/sql/migrations/sql/20200810161022_flow_rename.cockroach.up.sql
index 0ce6996744f..9b606779796 100644
--- a/persistence/sql/migrations/sql/20200810161022_flow_rename.cockroach.up.sql
+++ b/persistence/sql/migrations/sql/20200810161022_flow_rename.cockroach.up.sql
@@ -1,2 +1,9 @@
 ALTER TABLE "selfservice_login_request_methods" RENAME TO "selfservice_login_flow_methods";COMMIT TRANSACTION;BEGIN TRANSACTION;
-ALTER TABLE "selfservice_login_requests" RENAME TO "selfservice_login_flows";COMMIT TRANSACTION;BEGIN TRANSACTION;
\ No newline at end of file
+ALTER TABLE "selfservice_login_requests" RENAME TO "selfservice_login_flows";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_registration_request_methods" RENAME TO "selfservice_registration_flow_methods";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_registration_requests" RENAME TO "selfservice_registration_flows";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_settings_request_methods" RENAME TO "selfservice_settings_flow_methods";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_settings_requests" RENAME TO "selfservice_settings_flows";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_recovery_request_methods" RENAME TO "selfservice_recovery_flow_methods";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_recovery_requests" RENAME TO "selfservice_recovery_flows";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_verification_requests" RENAME TO "selfservice_verification_flows";COMMIT TRANSACTION;BEGIN TRANSACTION;
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20200810161022_flow_rename.mysql.down.sql b/persistence/sql/migrations/sql/20200810161022_flow_rename.mysql.down.sql
index c98f65a9a94..6ba6c693318 100644
--- a/persistence/sql/migrations/sql/20200810161022_flow_rename.mysql.down.sql
+++ b/persistence/sql/migrations/sql/20200810161022_flow_rename.mysql.down.sql
@@ -1,2 +1,9 @@
 ALTER TABLE `selfservice_login_flows` RENAME TO `selfservice_login_requests`;
-ALTER TABLE `selfservice_login_flow_methods` RENAME TO `selfservice_login_request_methods`;
\ No newline at end of file
+ALTER TABLE `selfservice_login_flow_methods` RENAME TO `selfservice_login_request_methods`;
+ALTER TABLE `selfservice_registration_flow_methods` RENAME TO `selfservice_registration_request_methods`;
+ALTER TABLE `selfservice_registration_flows` RENAME TO `selfservice_registration_requests`;
+ALTER TABLE `selfservice_settings_flow_methods` RENAME TO `selfservice_settings_request_methods`;
+ALTER TABLE `selfservice_settings_flows` RENAME TO `selfservice_settings_requests`;
+ALTER TABLE `selfservice_recovery_flow_methods` RENAME TO `selfservice_recovery_request_methods`;
+ALTER TABLE `selfservice_recovery_flows` RENAME TO `selfservice_recovery_requests`;
+ALTER TABLE `selfservice_verification_flows` RENAME TO `selfservice_verification_requests`;
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20200810161022_flow_rename.mysql.up.sql b/persistence/sql/migrations/sql/20200810161022_flow_rename.mysql.up.sql
index 2634aa1adb8..28508f8a06e 100644
--- a/persistence/sql/migrations/sql/20200810161022_flow_rename.mysql.up.sql
+++ b/persistence/sql/migrations/sql/20200810161022_flow_rename.mysql.up.sql
@@ -1,2 +1,9 @@
 ALTER TABLE `selfservice_login_request_methods` RENAME TO `selfservice_login_flow_methods`;
-ALTER TABLE `selfservice_login_requests` RENAME TO `selfservice_login_flows`;
\ No newline at end of file
+ALTER TABLE `selfservice_login_requests` RENAME TO `selfservice_login_flows`;
+ALTER TABLE `selfservice_registration_request_methods` RENAME TO `selfservice_registration_flow_methods`;
+ALTER TABLE `selfservice_registration_requests` RENAME TO `selfservice_registration_flows`;
+ALTER TABLE `selfservice_settings_request_methods` RENAME TO `selfservice_settings_flow_methods`;
+ALTER TABLE `selfservice_settings_requests` RENAME TO `selfservice_settings_flows`;
+ALTER TABLE `selfservice_recovery_request_methods` RENAME TO `selfservice_recovery_flow_methods`;
+ALTER TABLE `selfservice_recovery_requests` RENAME TO `selfservice_recovery_flows`;
+ALTER TABLE `selfservice_verification_requests` RENAME TO `selfservice_verification_flows`;
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20200810161022_flow_rename.postgres.down.sql b/persistence/sql/migrations/sql/20200810161022_flow_rename.postgres.down.sql
index c6935b454d4..60d6d0dd119 100644
--- a/persistence/sql/migrations/sql/20200810161022_flow_rename.postgres.down.sql
+++ b/persistence/sql/migrations/sql/20200810161022_flow_rename.postgres.down.sql
@@ -1,2 +1,9 @@
 ALTER TABLE "selfservice_login_flows" RENAME TO "selfservice_login_requests";
-ALTER TABLE "selfservice_login_flow_methods" RENAME TO "selfservice_login_request_methods";
\ No newline at end of file
+ALTER TABLE "selfservice_login_flow_methods" RENAME TO "selfservice_login_request_methods";
+ALTER TABLE "selfservice_registration_flow_methods" RENAME TO "selfservice_registration_request_methods";
+ALTER TABLE "selfservice_registration_flows" RENAME TO "selfservice_registration_requests";
+ALTER TABLE "selfservice_settings_flow_methods" RENAME TO "selfservice_settings_request_methods";
+ALTER TABLE "selfservice_settings_flows" RENAME TO "selfservice_settings_requests";
+ALTER TABLE "selfservice_recovery_flow_methods" RENAME TO "selfservice_recovery_request_methods";
+ALTER TABLE "selfservice_recovery_flows" RENAME TO "selfservice_recovery_requests";
+ALTER TABLE "selfservice_verification_flows" RENAME TO "selfservice_verification_requests";
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20200810161022_flow_rename.postgres.up.sql b/persistence/sql/migrations/sql/20200810161022_flow_rename.postgres.up.sql
index 5a41ee220e7..be3be9e5ed4 100644
--- a/persistence/sql/migrations/sql/20200810161022_flow_rename.postgres.up.sql
+++ b/persistence/sql/migrations/sql/20200810161022_flow_rename.postgres.up.sql
@@ -1,2 +1,9 @@
 ALTER TABLE "selfservice_login_request_methods" RENAME TO "selfservice_login_flow_methods";
-ALTER TABLE "selfservice_login_requests" RENAME TO "selfservice_login_flows";
\ No newline at end of file
+ALTER TABLE "selfservice_login_requests" RENAME TO "selfservice_login_flows";
+ALTER TABLE "selfservice_registration_request_methods" RENAME TO "selfservice_registration_flow_methods";
+ALTER TABLE "selfservice_registration_requests" RENAME TO "selfservice_registration_flows";
+ALTER TABLE "selfservice_settings_request_methods" RENAME TO "selfservice_settings_flow_methods";
+ALTER TABLE "selfservice_settings_requests" RENAME TO "selfservice_settings_flows";
+ALTER TABLE "selfservice_recovery_request_methods" RENAME TO "selfservice_recovery_flow_methods";
+ALTER TABLE "selfservice_recovery_requests" RENAME TO "selfservice_recovery_flows";
+ALTER TABLE "selfservice_verification_requests" RENAME TO "selfservice_verification_flows";
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20200810161022_flow_rename.sqlite3.down.sql b/persistence/sql/migrations/sql/20200810161022_flow_rename.sqlite3.down.sql
index c6935b454d4..60d6d0dd119 100644
--- a/persistence/sql/migrations/sql/20200810161022_flow_rename.sqlite3.down.sql
+++ b/persistence/sql/migrations/sql/20200810161022_flow_rename.sqlite3.down.sql
@@ -1,2 +1,9 @@
 ALTER TABLE "selfservice_login_flows" RENAME TO "selfservice_login_requests";
-ALTER TABLE "selfservice_login_flow_methods" RENAME TO "selfservice_login_request_methods";
\ No newline at end of file
+ALTER TABLE "selfservice_login_flow_methods" RENAME TO "selfservice_login_request_methods";
+ALTER TABLE "selfservice_registration_flow_methods" RENAME TO "selfservice_registration_request_methods";
+ALTER TABLE "selfservice_registration_flows" RENAME TO "selfservice_registration_requests";
+ALTER TABLE "selfservice_settings_flow_methods" RENAME TO "selfservice_settings_request_methods";
+ALTER TABLE "selfservice_settings_flows" RENAME TO "selfservice_settings_requests";
+ALTER TABLE "selfservice_recovery_flow_methods" RENAME TO "selfservice_recovery_request_methods";
+ALTER TABLE "selfservice_recovery_flows" RENAME TO "selfservice_recovery_requests";
+ALTER TABLE "selfservice_verification_flows" RENAME TO "selfservice_verification_requests";
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20200810161022_flow_rename.sqlite3.up.sql b/persistence/sql/migrations/sql/20200810161022_flow_rename.sqlite3.up.sql
index 5a41ee220e7..be3be9e5ed4 100644
--- a/persistence/sql/migrations/sql/20200810161022_flow_rename.sqlite3.up.sql
+++ b/persistence/sql/migrations/sql/20200810161022_flow_rename.sqlite3.up.sql
@@ -1,2 +1,9 @@
 ALTER TABLE "selfservice_login_request_methods" RENAME TO "selfservice_login_flow_methods";
-ALTER TABLE "selfservice_login_requests" RENAME TO "selfservice_login_flows";
\ No newline at end of file
+ALTER TABLE "selfservice_login_requests" RENAME TO "selfservice_login_flows";
+ALTER TABLE "selfservice_registration_request_methods" RENAME TO "selfservice_registration_flow_methods";
+ALTER TABLE "selfservice_registration_requests" RENAME TO "selfservice_registration_flows";
+ALTER TABLE "selfservice_settings_request_methods" RENAME TO "selfservice_settings_flow_methods";
+ALTER TABLE "selfservice_settings_requests" RENAME TO "selfservice_settings_flows";
+ALTER TABLE "selfservice_recovery_request_methods" RENAME TO "selfservice_recovery_flow_methods";
+ALTER TABLE "selfservice_recovery_requests" RENAME TO "selfservice_recovery_flows";
+ALTER TABLE "selfservice_verification_requests" RENAME TO "selfservice_verification_flows";
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.cockroach.down.sql b/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.cockroach.down.sql
index 366b0daceca..0ccaced0ddf 100644
--- a/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.cockroach.down.sql
+++ b/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.cockroach.down.sql
@@ -1 +1,4 @@
-ALTER TABLE "selfservice_login_flow_methods" RENAME COLUMN "selfservice_login_flow_id" TO "selfservice_login_request_id";COMMIT TRANSACTION;BEGIN TRANSACTION;
\ No newline at end of file
+ALTER TABLE "selfservice_login_flow_methods" RENAME COLUMN "selfservice_login_flow_id" TO "selfservice_login_request_id";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_registration_flow_methods" RENAME COLUMN "selfservice_registration_flow_id" TO "selfservice_registration_request_id";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_settings_flow_methods" RENAME COLUMN "selfservice_settings_flow_id" TO "selfservice_settings_request_id";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_recovery_flow_methods" RENAME COLUMN "selfservice_recovery_flow_id" TO "selfservice_recovery_request_id";COMMIT TRANSACTION;BEGIN TRANSACTION;
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.cockroach.up.sql b/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.cockroach.up.sql
index 241668b66f3..9f7efff7e16 100644
--- a/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.cockroach.up.sql
+++ b/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.cockroach.up.sql
@@ -1 +1,4 @@
-ALTER TABLE "selfservice_login_flow_methods" RENAME COLUMN "selfservice_login_request_id" TO "selfservice_login_flow_id";COMMIT TRANSACTION;BEGIN TRANSACTION;
\ No newline at end of file
+ALTER TABLE "selfservice_login_flow_methods" RENAME COLUMN "selfservice_login_request_id" TO "selfservice_login_flow_id";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_registration_flow_methods" RENAME COLUMN "selfservice_registration_request_id" TO "selfservice_registration_flow_id";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_recovery_flow_methods" RENAME COLUMN "selfservice_recovery_request_id" TO "selfservice_recovery_flow_id";COMMIT TRANSACTION;BEGIN TRANSACTION;
+ALTER TABLE "selfservice_settings_flow_methods" RENAME COLUMN "selfservice_settings_request_id" TO "selfservice_settings_flow_id";COMMIT TRANSACTION;BEGIN TRANSACTION;
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.mysql.down.sql b/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.mysql.down.sql
index edc2c1dffc3..9a5473340c7 100644
--- a/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.mysql.down.sql
+++ b/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.mysql.down.sql
@@ -1 +1,4 @@
-ALTER TABLE `selfservice_login_flow_methods` CHANGE `selfservice_login_flow_id` `selfservice_login_request_id` char(36) NOT NULL;
\ No newline at end of file
+ALTER TABLE `selfservice_login_flow_methods` CHANGE `selfservice_login_flow_id` `selfservice_login_request_id` char(36) NOT NULL;
+ALTER TABLE `selfservice_registration_flow_methods` CHANGE `selfservice_registration_flow_id` `selfservice_registration_request_id` char(36) NOT NULL;
+ALTER TABLE `selfservice_settings_flow_methods` CHANGE `selfservice_settings_flow_id` `selfservice_settings_request_id` char(36) NOT NULL;
+ALTER TABLE `selfservice_recovery_flow_methods` CHANGE `selfservice_recovery_flow_id` `selfservice_recovery_request_id` char(36) NOT NULL;
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.mysql.up.sql b/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.mysql.up.sql
index c8cb7696b76..93844b82e58 100644
--- a/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.mysql.up.sql
+++ b/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.mysql.up.sql
@@ -1 +1,4 @@
-ALTER TABLE `selfservice_login_flow_methods` CHANGE `selfservice_login_request_id` `selfservice_login_flow_id` char(36) NOT NULL;
\ No newline at end of file
+ALTER TABLE `selfservice_login_flow_methods` CHANGE `selfservice_login_request_id` `selfservice_login_flow_id` char(36) NOT NULL;
+ALTER TABLE `selfservice_registration_flow_methods` CHANGE `selfservice_registration_request_id` `selfservice_registration_flow_id` char(36) NOT NULL;
+ALTER TABLE `selfservice_recovery_flow_methods` CHANGE `selfservice_recovery_request_id` `selfservice_recovery_flow_id` char(36) NOT NULL;
+ALTER TABLE `selfservice_settings_flow_methods` CHANGE `selfservice_settings_request_id` `selfservice_settings_flow_id` char(36) NOT NULL;
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.postgres.down.sql b/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.postgres.down.sql
index 4c880bde5df..931cf718659 100644
--- a/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.postgres.down.sql
+++ b/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.postgres.down.sql
@@ -1 +1,4 @@
-ALTER TABLE "selfservice_login_flow_methods" RENAME COLUMN "selfservice_login_flow_id" TO "selfservice_login_request_id";
\ No newline at end of file
+ALTER TABLE "selfservice_login_flow_methods" RENAME COLUMN "selfservice_login_flow_id" TO "selfservice_login_request_id";
+ALTER TABLE "selfservice_registration_flow_methods" RENAME COLUMN "selfservice_registration_flow_id" TO "selfservice_registration_request_id";
+ALTER TABLE "selfservice_settings_flow_methods" RENAME COLUMN "selfservice_settings_flow_id" TO "selfservice_settings_request_id";
+ALTER TABLE "selfservice_recovery_flow_methods" RENAME COLUMN "selfservice_recovery_flow_id" TO "selfservice_recovery_request_id";
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.postgres.up.sql b/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.postgres.up.sql
index 8bf38e948f7..9f351a5b96e 100644
--- a/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.postgres.up.sql
+++ b/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.postgres.up.sql
@@ -1 +1,4 @@
-ALTER TABLE "selfservice_login_flow_methods" RENAME COLUMN "selfservice_login_request_id" TO "selfservice_login_flow_id";
\ No newline at end of file
+ALTER TABLE "selfservice_login_flow_methods" RENAME COLUMN "selfservice_login_request_id" TO "selfservice_login_flow_id";
+ALTER TABLE "selfservice_registration_flow_methods" RENAME COLUMN "selfservice_registration_request_id" TO "selfservice_registration_flow_id";
+ALTER TABLE "selfservice_recovery_flow_methods" RENAME COLUMN "selfservice_recovery_request_id" TO "selfservice_recovery_flow_id";
+ALTER TABLE "selfservice_settings_flow_methods" RENAME COLUMN "selfservice_settings_request_id" TO "selfservice_settings_flow_id";
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.sqlite3.down.sql b/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.sqlite3.down.sql
index 4c880bde5df..931cf718659 100644
--- a/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.sqlite3.down.sql
+++ b/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.sqlite3.down.sql
@@ -1 +1,4 @@
-ALTER TABLE "selfservice_login_flow_methods" RENAME COLUMN "selfservice_login_flow_id" TO "selfservice_login_request_id";
\ No newline at end of file
+ALTER TABLE "selfservice_login_flow_methods" RENAME COLUMN "selfservice_login_flow_id" TO "selfservice_login_request_id";
+ALTER TABLE "selfservice_registration_flow_methods" RENAME COLUMN "selfservice_registration_flow_id" TO "selfservice_registration_request_id";
+ALTER TABLE "selfservice_settings_flow_methods" RENAME COLUMN "selfservice_settings_flow_id" TO "selfservice_settings_request_id";
+ALTER TABLE "selfservice_recovery_flow_methods" RENAME COLUMN "selfservice_recovery_flow_id" TO "selfservice_recovery_request_id";
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.sqlite3.up.sql b/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.sqlite3.up.sql
index 8bf38e948f7..9f351a5b96e 100644
--- a/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.sqlite3.up.sql
+++ b/persistence/sql/migrations/sql/20200810162450_flow_fields_rename.sqlite3.up.sql
@@ -1 +1,4 @@
-ALTER TABLE "selfservice_login_flow_methods" RENAME COLUMN "selfservice_login_request_id" TO "selfservice_login_flow_id";
\ No newline at end of file
+ALTER TABLE "selfservice_login_flow_methods" RENAME COLUMN "selfservice_login_request_id" TO "selfservice_login_flow_id";
+ALTER TABLE "selfservice_registration_flow_methods" RENAME COLUMN "selfservice_registration_request_id" TO "selfservice_registration_flow_id";
+ALTER TABLE "selfservice_recovery_flow_methods" RENAME COLUMN "selfservice_recovery_request_id" TO "selfservice_recovery_flow_id";
+ALTER TABLE "selfservice_settings_flow_methods" RENAME COLUMN "selfservice_settings_request_id" TO "selfservice_settings_flow_id";
\ No newline at end of file
diff --git a/persistence/sql/migrations/templates/20200810161022_flow_rename.down.fizz b/persistence/sql/migrations/templates/20200810161022_flow_rename.down.fizz
index 76071b16536..3ddf846d554 100644
--- a/persistence/sql/migrations/templates/20200810161022_flow_rename.down.fizz
+++ b/persistence/sql/migrations/templates/20200810161022_flow_rename.down.fizz
@@ -1,2 +1,13 @@
 rename_table("selfservice_login_flows", "selfservice_login_requests")
 rename_table("selfservice_login_flow_methods", "selfservice_login_request_methods")
+
+rename_table("selfservice_registration_flow_methods", "selfservice_registration_request_methods")
+rename_table("selfservice_registration_flows", "selfservice_registration_requests")
+
+rename_table("selfservice_settings_flow_methods", "selfservice_settings_request_methods")
+rename_table("selfservice_settings_flows", "selfservice_settings_requests")
+
+rename_table("selfservice_recovery_flow_methods", "selfservice_recovery_request_methods")
+rename_table("selfservice_recovery_flows", "selfservice_recovery_requests")
+
+rename_table("selfservice_verification_flows", "selfservice_verification_requests")
diff --git a/persistence/sql/migrations/templates/20200810161022_flow_rename.up.fizz b/persistence/sql/migrations/templates/20200810161022_flow_rename.up.fizz
index 2bcb91a8057..469afdd3bab 100644
--- a/persistence/sql/migrations/templates/20200810161022_flow_rename.up.fizz
+++ b/persistence/sql/migrations/templates/20200810161022_flow_rename.up.fizz
@@ -1,2 +1,13 @@
 rename_table("selfservice_login_request_methods", "selfservice_login_flow_methods")
 rename_table("selfservice_login_requests", "selfservice_login_flows")
+
+rename_table("selfservice_registration_request_methods", "selfservice_registration_flow_methods")
+rename_table("selfservice_registration_requests", "selfservice_registration_flows")
+
+rename_table("selfservice_settings_request_methods", "selfservice_settings_flow_methods")
+rename_table("selfservice_settings_requests", "selfservice_settings_flows")
+
+rename_table("selfservice_recovery_request_methods", "selfservice_recovery_flow_methods")
+rename_table("selfservice_recovery_requests", "selfservice_recovery_flows")
+
+rename_table("selfservice_verification_requests", "selfservice_verification_flows")
diff --git a/persistence/sql/migrations/templates/20200810162450_flow_fields_rename.down.fizz b/persistence/sql/migrations/templates/20200810162450_flow_fields_rename.down.fizz
index 21ca247c56c..86a600ceadc 100644
--- a/persistence/sql/migrations/templates/20200810162450_flow_fields_rename.down.fizz
+++ b/persistence/sql/migrations/templates/20200810162450_flow_fields_rename.down.fizz
@@ -1 +1,7 @@
 rename_column("selfservice_login_flow_methods", "selfservice_login_flow_id", "selfservice_login_request_id")
+
+rename_column("selfservice_registration_flow_methods", "selfservice_registration_flow_id", "selfservice_registration_request_id")
+
+rename_column("selfservice_settings_flow_methods", "selfservice_settings_flow_id", "selfservice_settings_request_id")
+
+rename_column("selfservice_recovery_flow_methods", "selfservice_recovery_flow_id", "selfservice_recovery_request_id")
diff --git a/persistence/sql/migrations/templates/20200810162450_flow_fields_rename.up.fizz b/persistence/sql/migrations/templates/20200810162450_flow_fields_rename.up.fizz
index b9fd4ab5319..bc24ef316b8 100644
--- a/persistence/sql/migrations/templates/20200810162450_flow_fields_rename.up.fizz
+++ b/persistence/sql/migrations/templates/20200810162450_flow_fields_rename.up.fizz
@@ -1 +1,7 @@
 rename_column("selfservice_login_flow_methods", "selfservice_login_request_id", "selfservice_login_flow_id")
+
+rename_column("selfservice_registration_flow_methods", "selfservice_registration_request_id", "selfservice_registration_flow_id")
+
+rename_column("selfservice_recovery_flow_methods", "selfservice_recovery_request_id", "selfservice_recovery_flow_id")
+
+rename_column("selfservice_settings_flow_methods", "selfservice_settings_request_id", "selfservice_settings_flow_id")