--- a/dist/restore/restore-postgresql.bat
+++ b/dist/restore/restore-postgresql.bat
@@ -6,14 +6,14 @@
 set DBTYPE=postgresql
 set DBUSER=postgres
 set /P PGPASSWORD="Enter %DBUSER% password:"
-set MODULES=wn legacy vn bnc sumo xwn glf ilfwn logs
+set MODULES=wn legacy vn bnc sumo xwn glf ilfwn logs
 
 call :dbexists
 if not %DBEXISTS%==0 call :createdb
-for %%M in (%MODULES%) do call :process %DBTYPE%-%%M-schema.sql schema %DB%
-for %%M in (%MODULES%) do call :process %DBTYPE%-%%M-data.sql data %DB%
-for %%M in (%MODULES%) do call :process %DBTYPE%-%%M-constraints.sql constraints %DB%
-for %%M in (%MODULES%) do call :process %DBTYPE%-%%M-views.sql views %DB%
+for %%M in (%MODULES%) do call :process %DBTYPE%-%%M-schema.sql "schema-%%M" %DB%
+for %%M in (%MODULES%) do call :process %DBTYPE%-%%M-data.sql "data-%%M" %DB%
+for %%M in (%MODULES%) do call :process %DBTYPE%-%%M-constrain.sql "constrain-%%M" %DB% --force
+for %%M in (%MODULES%) do call :process %DBTYPE%-%%M-views.sql "views-%%M" %DB%
 goto :eof
 
 :process
@@ -46,4 +46,4 @@
 goto :eof
 
 :eof
-
+