diff --git a/tools/make/viv_hls_ip_builder.mak b/tools/make/viv_hls_ip_builder.mak
index 10c5a83..a5d30ce 100644
--- a/tools/make/viv_hls_ip_builder.mak
+++ b/tools/make/viv_hls_ip_builder.mak
@@ -13,6 +13,7 @@
 # Prereqs:
 # - TOOLS_DIR must be defined globally
 # -------------------------------------------------------------------
+
 BUILD_VIVADO_HLS_IP = \
 	@ \
 	echo "========================================================"; \
@@ -28,7 +29,7 @@ BUILD_VIVADO_HLS_IP = \
 	cd $(5); \
 	echo "BUILDER: Building HLS IP..."; \
 	export VIV_ERR=0; \
-	vivado_hls -f $(call RESOLVE_PATH,$(TOOLS_DIR)/scripts/viv_generate_hls_ip.tcl) -l $(1).log || export VIV_ERR=$$?; \
+	vitis_hls -f $(call RESOLVE_PATH,$(TOOLS_DIR)/scripts/viv_generate_hls_ip.tcl) -l $(1).log || export VIV_ERR=$$?; \
 	$(TOOLS_DIR)/scripts/shared-ip-loc-manage.sh --path=$(5)/$(1) release; \
 	exit $$(($$VIV_ERR))
 
diff --git a/tools/scripts/launch_vlint.sh b/tools/scripts/launch_vlint.sh
index 9c82c9d..4deb48a 100755
--- a/tools/scripts/launch_vlint.sh
+++ b/tools/scripts/launch_vlint.sh
@@ -40,22 +40,12 @@ function print_color {
 # Functions
 #------------------------------------------
 
-export VLINT_PLATFORM=$(uname -o)
-function resolve_vlint_path {
-    if [[ $VLINT_PLATFORM = "Cygwin" ]]; then
-        echo $(cygpath -am $1)
-    else
-        echo $1
-    fi
-}
-
 # Replace any directories with the files they include
 function replace_dirs_with_source {
     for file in "$@"
     do
         if [ -d $file ]; then
-            # Quotes so that resolve_vlint_path converts all paths
-            echo "$(resolve_vlint_path "$(realpath $(find $file -maxdepth 1 -type f))") "
+            echo "resolve_viv_path $(realpath $(find $file -maxdepth 1 -type f)) "
         else
             echo "$file "
         fi
diff --git a/tools/scripts/setupenv_base.sh b/tools/scripts/setupenv_base.sh
index 8a7433b..2f3c732 100644
--- a/tools/scripts/setupenv_base.sh
+++ b/tools/scripts/setupenv_base.sh
@@ -170,6 +170,7 @@ if [[ ${VIVADO_VER^^} = "CMDLINE_ARG" ]]; then
     fi
 fi
 export VIVADO_PATH=$VIVADO_BASE_PATH/$VIVADO_VER
+export VIVADO_HLS_PATH=$VIVADO_BASE_PATH/../Vitis_HLS/$VIVADO_VER
 
 echo "Setting up a ${BITNESS}-bit FPGA build environment for the ${DISPLAY_NAME}..."
 #----------------------------------------------------------------------------
@@ -194,6 +195,9 @@ if [[ -e $VIVADO_PATH/.settings${BITNESS}-Vivado_Lab.sh ]]; then
 else
     $VIVADO_PATH/.settings${BITNESS}-Vivado.sh
 fi
+if [[ -e $(readlink -f $VIVADO_HLS_PATH)/.settings${BITNESS}-Vitis_HLS.sh ]]; then
+    $(readlink -f $VIVADO_HLS_PATH)/.settings${BITNESS}-Vitis_HLS.sh
+fi
 if [[ -e $(readlink -f $VIVADO_BASE_PATH/..)/DocNav/.settings${BITNESS}-DocNav.sh ]]; then
     $(readlink -f $VIVADO_BASE_PATH/..)/DocNav/.settings${BITNESS}-DocNav.sh
 fi