diff --git a/lib/pg_online_schema_change/orchestrate.rb b/lib/pg_online_schema_change/orchestrate.rb
index cad5544..3d6ebcb 100644
--- a/lib/pg_online_schema_change/orchestrate.rb
+++ b/lib/pg_online_schema_change/orchestrate.rb
@@ -31,7 +31,7 @@ def setup_store
         # Set this early on to ensure their creation and cleanup (unexpected)
         # happens at all times. IOW, the calls from Store.get always return
         # the same value.
-        Store.set(:old_primary_table, "pgosc_op_table_#{client.table.downcase}")
+        Store.set(:old_primary_table, "pgosc_op_table_#{client.table.downcase}_#{pgosc_identifier}")
         Store.set(:audit_table, "pgosc_at_#{client.table.downcase}_#{pgosc_identifier}")
         Store.set(:operation_type_column, "operation_type_#{pgosc_identifier}")
         Store.set(:trigger_time_column, "trigger_time_#{pgosc_identifier}")