diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
index ba9822077e..912a2f0760 100644
--- a/build/jam/MainBuildRules
+++ b/build/jam/MainBuildRules
@@ -175,9 +175,9 @@ rule AssembleNasm
 actions AssembleNasm
 {
 	if test $(ASFLAGS) ; then
-		$(HAIKU_YASM) -d $(ASFLAGS) -f elf32 -o $(1) $(2);
+		$(HAIKU_NASM) -d $(ASFLAGS) -f elf32 -o $(1) $(2);
 	else
-		$(HAIKU_YASM) -f elf32 -o $(1) $(2);
+		$(HAIKU_NASM) -f elf32 -o $(1) $(2);
 	fi
 }
 
diff --git a/build/jam/images/AnybootImage b/build/jam/images/AnybootImage
index 4bc00b05a1..d926f3cace 100644
--- a/build/jam/images/AnybootImage
+++ b/build/jam/images/AnybootImage
@@ -14,7 +14,7 @@ rule BuildAnybootMBR binary : source {
 
 actions BuildAnybootMBR1 {
 	$(RM) $(1)
-	$(HAIKU_YASM) -f bin $(MBR_SOURCE) -O5 -o $(1)
+	$(HAIKU_NASM) -f bin $(MBR_SOURCE) -O5 -o $(1)
 }
 
 rule BuildAnybootImage anybootImage : mbrPart : isoPart : imageFile {
diff --git a/configure b/configure
index 0656ccd57a..7aaad6bd1f 100755
--- a/configure
+++ b/configure
@@ -687,7 +687,7 @@ if [ "$HAIKU_HOST_BUILD_ONLY" = 1 ]; then
 	HAIKU_OBJCOPY=$invalidCommand
 	HAIKU_RANLIB=$invalidCommand
 	HAIKU_ELFEDIT=$invalidCommand
-	HAIKU_YASM=$invalidCommand
+	HAIKU_NASM=$invalidCommand
 	HAIKU_STRIP=$invalidCommand
 else
 	if [ -n "$HAIKU_PACKAGING_ARCHS" ]; then
@@ -874,7 +874,7 @@ HAIKU_PACKAGING_ARCHS		?= ${HAIKU_PACKAGING_ARCHS} ;
 
 HAIKU_BUILD_ATTRIBUTES_DIR	?= ${HAIKU_BUILD_ATTRIBUTES_DIR} ;
 
-HAIKU_YASM					?= ${HAIKU_YASM} ;
+HAIKU_NASM					?= ${HAIKU_NASM} ;
 
 HOST_EXTENDED_REGEX_SED		?= ${HOST_EXTENDED_REGEX_SED} ;
 HOST_GCC_RAW_VERSION		?= ${HOST_GCC_RAW_VERSION} ;
diff --git a/src/apps/bootmanager/Jamfile b/src/apps/bootmanager/Jamfile
index 021dfe72da..b5960cb289 100644
--- a/src/apps/bootmanager/Jamfile
+++ b/src/apps/bootmanager/Jamfile
@@ -31,19 +31,19 @@ DoCatalogs BootManager : x-vnd.Haiku-BootManager : $(cataloguedSources) ;
 # Assemble the boot loader, and convert it into a header file
 
 # TODO: should be merged with the AssembleNasm rule
-rule AssembleYasmBin object : source
+rule AssembleNasmBin object : source
 {
 	SEARCH on $(source) = $(SUBDIR) ;
 	MakeLocateDebug $(object) ;
 	Depends $(object) : $(source) ;
 }
 
-actions AssembleYasmBin
+actions AssembleNasmBin
 {
-	$(HAIKU_YASM) -f bin -o $(1) $(2)
+	$(HAIKU_NASM) -f bin -o $(1) $(2)
 }
 
-AssembleYasmBin [ FGristFiles bootman.bin ] : bootman.S ;
+AssembleNasmBin [ FGristFiles bootman.bin ] : bootman.S ;
 
 DataFileToSourceFile [ FGristFiles BootLoader.h ] : [ FGristFiles bootman.bin ]
 	: kBootLoader : kBootLoaderSize ;
diff --git a/src/bin/writembr/Jamfile b/src/bin/writembr/Jamfile
index 1979c605cf..c1d91014a3 100644
--- a/src/bin/writembr/Jamfile
+++ b/src/bin/writembr/Jamfile
@@ -10,19 +10,19 @@ Application writembr :
 
 # Assemble the MBR code, and convert it into a header file
 
-rule AssembleYasmBin object : source
+rule AssembleNasmBin object : source
 {
 	SEARCH on $(source) = $(SUBDIR) ;
 	MakeLocateDebug $(object) ;
 	Depends $(object) : $(source) ;
 }
 
-actions AssembleYasmBin
+actions AssembleNasmBin
 {
-	$(HAIKU_YASM) -f bin -O5 -o $(1) $(2)
+	$(HAIKU_NASM) -f bin -O5 -o $(1) $(2)
 }
 
-AssembleYasmBin [ FGristFiles mbr.bin ] : mbr.S ;
+AssembleNasmBin [ FGristFiles mbr.bin ] : mbr.S ;
 
 DataFileToSourceFile [ FGristFiles MBR.h ] : [ FGristFiles mbr.bin ]
 	: kMBR : kMBRSize ;