diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 9386de5302..0ef50363d9 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -8,8 +8,8 @@ cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
 
 set(CMAKE_CXX_STANDARD 17) #<FS> Enable c++17 on all platforms
 
-set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING
-    "The root project/makefile/solution name. Defaults to SecondLife.")
+set(ROOT_PROJECT_NAME "Firestorm" CACHE STRING
+    "The root project/makefile/solution name. Defaults to Firestorm.")
 project(${ROOT_PROJECT_NAME})
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
@@ -23,8 +23,8 @@ if (WINDOWS)
 endif (WINDOWS)
 
 if (NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
-      "Build type.  One of: Debug Release RelWithDebInfo" FORCE)
+  set(CMAKE_BUILD_TYPE Release CACHE STRING
+      "Build type.  One of: Release RelWithDebInfo" FORCE)
 endif (NOT CMAKE_BUILD_TYPE)
 
 #<FS:AW optional opensim support>
diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh
index 3f92c1b439..353c760f9e 100755
--- a/scripts/configure_firestorm.sh
+++ b/scripts/configure_firestorm.sh
@@ -50,7 +50,7 @@ LL_ARGS_PASSTHRU=""
 JOBS="0"
 WANTS_NINJA=$FALSE
 WANTS_VSCODE=$FALSE
-USE_VSTOOL=$TRUE
+USE_VSTOOL=$FALSE
 TESTBUILD_PERIOD="0"
 SINGLEGRID_URI=""
 
@@ -88,7 +88,7 @@ showUsage()
     echo "  --ninja                  : Build using Ninja"
     echo "  --vscode                 : Exports compile commands for VSCode (Linux only)"
     echo "  --compiler-cache         : Try to detect and use compiler cache (needs also --ninja for OSX and Windows)"
-    echo "  --no-vstools             : Do not use vstool to setup project startup properties (windows only)"
+    echo "  --vstools                : Use vstool to setup project startup properties (Windows only)"
     echo
     echo "All arguments not in the above list will be passed through to LL's configure/build."
     echo
@@ -98,7 +98,7 @@ getArgs()
 # $* = the options passed in from main
 {
     if [ $# -gt 0 ]; then
-      while getoptex "clean build config version package no-package fmodstudio openal ninja vscode compiler-cache no-vstools jobs: platform: kdu opensim no-opensim singlegrid: avx avx2 tracy crashreporting testbuild: help chan: btype:" "$@" ; do
+      while getoptex "clean build config version package no-package fmodstudio openal ninja vscode compiler-cache vstools jobs: platform: kdu opensim no-opensim singlegrid: avx avx2 tracy crashreporting testbuild: help chan: btype:" "$@" ; do
 
           #ensure options are valid
           if [  -z "$OPTOPT"  ] ; then
@@ -138,7 +138,7 @@ getArgs()
           ninja)          WANTS_NINJA=$TRUE;;
           vscode)         WANTS_VSCODE=$TRUE;;
           compiler-cache) WANTS_CACHE=$TRUE;;
-		  no-vstools)     USE_VSTOOL=$FALSE;;
+          vstools)        USE_VSTOOL=$TRUE;;
 
           help)           showUsage && exit 0;;
 
@@ -578,7 +578,7 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then
 
     cmake -G "$TARGET" ../indra $CHANNEL ${GITHASH} $FMODSTUDIO $OPENAL $KDU $OPENSIM $SINGLEGRID $AVX_OPTIMIZATION $AVX2_OPTIMIZATION $TRACY_PROFILER $TESTBUILD $PACKAGE \
           $UNATTENDED -DLL_TESTS:BOOL=OFF -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE -DCMAKE_BUILD_TYPE:STRING=$BTYPE $CACHE_OPT \
-          $CRASH_REPORTING -DVIEWER_SYMBOL_FILE:STRING="${VIEWER_SYMBOL_FILE:-}" -DROOT_PROJECT_NAME:STRING=Firestorm $LL_ARGS_PASSTHRU ${VSCODE_FLAGS:-} | tee $LOG
+          $CRASH_REPORTING -DVIEWER_SYMBOL_FILE:STRING="${VIEWER_SYMBOL_FILE:-}" $LL_ARGS_PASSTHRU ${VSCODE_FLAGS:-} | tee $LOG
 
     if [ $TARGET_PLATFORM == "windows" -a $USE_VSTOOL -eq $TRUE ] ; then
         echo "Setting startup project via vstool"