diff --git a/bin/gumbo_plugin_release/b-update-gumgo-plugin-versions.cmd b/bin/gumbo_plugin_release/b-update-gumgo-plugin-versions.cmd
index ad3edd5c..b88917bf 100755
--- a/bin/gumbo_plugin_release/b-update-gumgo-plugin-versions.cmd
+++ b/bin/gumbo_plugin_release/b-update-gumgo-plugin-versions.cmd
@@ -8,13 +8,13 @@ if [ -z ${SIREUM_HOME} ]; then                                #
   echo "Please set SIREUM_HOME env var"                       #
   exit -1                                                     #
 fi                                                            #
-exec ${SIREUM_HOME}/bin/sireum slang run -n "$0" "$@"         #
+exec "${SIREUM_HOME}/bin/sireum" slang run -n "$0" "$@"       #
 :BOF
 if not defined SIREUM_HOME (
   echo Please set SIREUM_HOME env var
   exit /B -1
 )
-%SIREUM_HOME%\bin\sireum.bat slang run -n "%0" %*
+"%SIREUM_HOME%\bin\sireum.bat" slang run -n "%0" %*
 exit /B %errorlevel%
 ::!#*/
 // #Sireum
diff --git a/bin/gumbo_plugin_release/c-osategumbo-update-site-builder.cmd b/bin/gumbo_plugin_release/c-osategumbo-update-site-builder.cmd
index b8b66d7f..ed00dc06 100644
--- a/bin/gumbo_plugin_release/c-osategumbo-update-site-builder.cmd
+++ b/bin/gumbo_plugin_release/c-osategumbo-update-site-builder.cmd
@@ -8,13 +8,13 @@ if [ -z ${SIREUM_HOME} ]; then                                #
   echo "Please set SIREUM_HOME env var"                       #
   exit -1                                                     #
 fi                                                            #
-exec ${SIREUM_HOME}/bin/sireum slang run -n "$0" "$@"         #
+exec "${SIREUM_HOME}/bin/sireum" slang run -n "$0" "$@"       #
 :BOF
 if not defined SIREUM_HOME (
   echo Please set SIREUM_HOME env var
   exit /B -1
 )
-%SIREUM_HOME%\bin\sireum.bat slang run -n "%0" %*
+"%SIREUM_HOME%\bin\sireum.bat" slang run -n "%0" %*
 exit /B %errorlevel%
 ::!#*/
 // #Sireum
diff --git a/bin/plugin_release/a-check-release.cmd b/bin/plugin_release/a-check-release.cmd
index ddc3824b..7318a86a 100644
--- a/bin/plugin_release/a-check-release.cmd
+++ b/bin/plugin_release/a-check-release.cmd
@@ -8,13 +8,13 @@ if [ -z ${SIREUM_HOME} ]; then                                #
   echo "Please set SIREUM_HOME env var"                       #
   exit -1                                                     #
 fi                                                            #
-exec ${SIREUM_HOME}/bin/sireum slang run -n "$0" "$@"         #
+exec "${SIREUM_HOME}/bin/sireum" slang run -n "$0" "$@"       #
 :BOF
 if not defined SIREUM_HOME (
   echo Please set SIREUM_HOME env var
   exit /B -1
 )
-%SIREUM_HOME%\bin\sireum.bat slang run -n "%0" %*
+"%SIREUM_HOME%\bin\sireum.bat" slang run -n "%0" %*
 exit /B %errorlevel%
 ::!#*/
 // #Sireum
diff --git a/bin/plugin_release/b-update-plugin-versions.cmd b/bin/plugin_release/b-update-plugin-versions.cmd
index 7e7882e3..c749fea9 100755
--- a/bin/plugin_release/b-update-plugin-versions.cmd
+++ b/bin/plugin_release/b-update-plugin-versions.cmd
@@ -8,13 +8,13 @@ if [ -z ${SIREUM_HOME} ]; then                                #
   echo "Please set SIREUM_HOME env var"                       #
   exit -1                                                     #
 fi                                                            #
-exec ${SIREUM_HOME}/bin/sireum slang run -n "$0" "$@"         #
+exec "${SIREUM_HOME}/bin/sireum" slang run -n "$0" "$@"       #
 :BOF
 if not defined SIREUM_HOME (
   echo Please set SIREUM_HOME env var
   exit /B -1
 )
-%SIREUM_HOME%\bin\sireum.bat slang run -n "%0" %*
+"%SIREUM_HOME%\bin\sireum.bat" slang run -n "%0" %*
 exit /B %errorlevel%
 ::!#*/
 // #Sireum
diff --git a/bin/plugin_release/c-osate-update-site-builder.cmd b/bin/plugin_release/c-osate-update-site-builder.cmd
index be3df481..782d9e1f 100644
--- a/bin/plugin_release/c-osate-update-site-builder.cmd
+++ b/bin/plugin_release/c-osate-update-site-builder.cmd
@@ -8,13 +8,13 @@ if [ -z ${SIREUM_HOME} ]; then                                #
   echo "Please set SIREUM_HOME env var"                       #
   exit -1                                                     #
 fi                                                            #
-exec ${SIREUM_HOME}/bin/sireum slang run -n "$0" "$@"         #
+exec "${SIREUM_HOME}/bin/sireum" slang run -n "$0" "$@"       #
 :BOF
 if not defined SIREUM_HOME (
   echo Please set SIREUM_HOME env var
   exit /B -1
 )
-%SIREUM_HOME%\bin\sireum.bat slang run -n "%0" %*
+"%SIREUM_HOME%\bin\sireum.bat" slang run -n "%0" %*
 exit /B %errorlevel%
 ::!#*/
 // #Sireum
diff --git a/bin/plugin_release/plugin-release-OLD.cmd b/bin/plugin_release/plugin-release-OLD.cmd
index fc8a384b..89915ba3 100755
--- a/bin/plugin_release/plugin-release-OLD.cmd
+++ b/bin/plugin_release/plugin-release-OLD.cmd
@@ -8,13 +8,13 @@ if [ -z ${SIREUM_HOME} ]; then                                #
   echo "Please set SIREUM_HOME env var"                       #
   exit -1                                                     #
 fi                                                            #
-exec ${SIREUM_HOME}/bin/sireum slang run -n "$0" "$@"         #
+exec "${SIREUM_HOME}/bin/sireum" slang run -n "$0" "$@"       #
 :BOF
 if not defined SIREUM_HOME (
   echo Please set SIREUM_HOME env var
   exit /B -1
 )
-%SIREUM_HOME%\bin\sireum.bat slang run -n "%0" %*
+"%SIREUM_HOME%\bin\sireum.bat" slang run -n "%0" %*
 exit /B %errorlevel%
 ::!#*/
 // #Sireum
diff --git a/bin/project-standalone.cmd b/bin/project-standalone.cmd
index 27702968..2f06b4ef 100755
--- a/bin/project-standalone.cmd
+++ b/bin/project-standalone.cmd
@@ -1,17 +1,17 @@
-::/*#! 2> /dev/null                                 #
-@ 2>/dev/null # 2>nul & echo off & goto BOF         #
-if [ -z ${SIREUM_HOME} ]; then                      #
-  echo "Please set SIREUM_HOME env var"             #
-  exit -1                                           #
-fi                                                  #
-exec ${SIREUM_HOME}/bin/sireum slang run "$0" "$@"  #
+::/*#! 2> /dev/null                                   #
+@ 2>/dev/null # 2>nul & echo off & goto BOF           #
+if [ -z ${SIREUM_HOME} ]; then                        #
+  echo "Please set SIREUM_HOME env var"               #
+  exit -1                                             #
+fi                                                    #
+exec "${SIREUM_HOME}/bin/sireum" slang run "$0" "$@"  #
 :BOF
 setlocal
 if not defined SIREUM_HOME (
   echo Please set SIREUM_HOME env var
   exit /B -1
 )
-%SIREUM_HOME%\bin\sireum.bat slang run -n "%0" %*
+"%SIREUM_HOME%\bin\sireum.bat" slang run -n "%0" %*
 exit /B %errorlevel%
 ::!#*/
 // #Sireum
diff --git a/bin/project.cmd b/bin/project.cmd
index 60f3186f..7b24c703 100755
--- a/bin/project.cmd
+++ b/bin/project.cmd
@@ -1,17 +1,17 @@
-::/*#! 2> /dev/null                                 #
-@ 2>/dev/null # 2>nul & echo off & goto BOF         #
-if [ -z ${SIREUM_HOME} ]; then                      #
-  echo "Please set SIREUM_HOME env var"             #
-  exit -1                                           #
-fi                                                  #
-exec ${SIREUM_HOME}/bin/sireum slang run "$0" "$@"  #
+::/*#! 2> /dev/null                                   #
+@ 2>/dev/null # 2>nul & echo off & goto BOF           #
+if [ -z ${SIREUM_HOME} ]; then                        #
+  echo "Please set SIREUM_HOME env var"               #
+  exit -1                                             #
+fi                                                    #
+exec "${SIREUM_HOME}/bin/sireum" slang run "$0" "$@"  #
 :BOF
 setlocal
 if not defined SIREUM_HOME (
   echo Please set SIREUM_HOME env var
   exit /B -1
 )
-%SIREUM_HOME%\bin\sireum.bat slang run "%0" %*
+"%SIREUM_HOME%\bin\sireum.bat" slang run "%0" %*
 exit /B %errorlevel%
 ::!#*/
 // #Sireum
diff --git a/common/bin/project.cmd b/common/bin/project.cmd
index 42fcbb30..8abee342 100755
--- a/common/bin/project.cmd
+++ b/common/bin/project.cmd
@@ -1,17 +1,17 @@
-::/*#! 2> /dev/null                                 #
-@ 2>/dev/null # 2>nul & echo off & goto BOF         #
-if [ -z ${SIREUM_HOME} ]; then                      #
-  echo "Please set SIREUM_HOME env var"             #
-  exit -1                                           #
-fi                                                  #
-exec ${SIREUM_HOME}/bin/sireum slang run "$0" "$@"  #
+::/*#! 2> /dev/null                                   #
+@ 2>/dev/null # 2>nul & echo off & goto BOF           #
+if [ -z ${SIREUM_HOME} ]; then                        #
+  echo "Please set SIREUM_HOME env var"               #
+  exit -1                                             #
+fi                                                    #
+exec "${SIREUM_HOME}/bin/sireum" slang run "$0" "$@"  #
 :BOF
 setlocal
 if not defined SIREUM_HOME (
   echo Please set SIREUM_HOME env var
   exit /B -1
 )
-%SIREUM_HOME%\bin\sireum.bat slang run "%0" %*
+"%SIREUM_HOME%\bin\sireum.bat" slang run "%0" %*
 exit /B %errorlevel%
 ::!#*/
 // #Sireum
diff --git a/common/shared/src/main/scala/org/sireum/hamr/codegen/common/util/test/regen.cmd b/common/shared/src/main/scala/org/sireum/hamr/codegen/common/util/test/regen.cmd
index 9e795a83..e19179ad 100755
--- a/common/shared/src/main/scala/org/sireum/hamr/codegen/common/util/test/regen.cmd
+++ b/common/shared/src/main/scala/org/sireum/hamr/codegen/common/util/test/regen.cmd
@@ -8,13 +8,13 @@ if [ -z ${SIREUM_HOME} ]; then                                #
   echo "Please set SIREUM_HOME env var"                       #
   exit -1                                                     #
 fi                                                            #
-exec ${SIREUM_HOME}/bin/sireum slang run -n "$0" "$@"         #
+exec "${SIREUM_HOME}/bin/sireum" slang run -n "$0" "$@"       #
 :BOF
 if not defined SIREUM_HOME (
   echo Please set SIREUM_HOME env var
   exit /B -1
 )
-%SIREUM_HOME%\bin\sireum.bat slang run -n "%0" %*
+"%SIREUM_HOME%\bin\sireum.bat" slang run -n "%0" %*
 exit /B %errorlevel%
 ::!#*/
 // #Sireum