diff --git a/xpinstall/wizard/mac/src/Deflation.c b/xpinstall/wizard/mac/src/Deflation.c
index 878b6649dece..031817ae2c73 100644
--- a/xpinstall/wizard/mac/src/Deflation.c
+++ b/xpinstall/wizard/mac/src/Deflation.c
@@ -149,8 +149,8 @@ EssentialFiles2Components(char *filename)
 		*tempStr = 'e';
 		
 		strcpy(finalStr, filename);
-		strcpy(&finalStr[prefixLen], "components");
-		strcpy(&finalStr[prefixLen + strlen("components")], &filename[prefixLen + strlen("essential files")]);
+		strcpy(&finalStr[prefixLen], "Components");
+		strcpy(&finalStr[prefixLen + strlen("Components")], &filename[prefixLen + strlen("essential files")]);
 		strcpy(filename, finalStr);
 	}
 
@@ -210,6 +210,7 @@ InflateFiles(void *hZip, void *hFind, short tgtVRefNum, long tgtDirID)
 		
 		/* create directories if file is nested in new subdirs */
 		SLASHES_2_COLONS(fullPathStr);
+		EssentialFiles2Components(fullPathStr);
 		err = DirCreateRecursive(fullPathStr);			
 		
 		if (err!=noErr)
@@ -224,8 +225,6 @@ InflateFiles(void *hZip, void *hFind, short tgtVRefNum, long tgtDirID)
 			continue; /* XXX do we want to do this? */
 		}
 		
-		EssentialFiles2Components(fullPathStr);
-
 		/* extract the file to its full path destination */
 		rv = ZIP_ExtractFile( hZip, filename, fullPathStr );
 		
diff --git a/xpinstall/wizard/mac/src/XPInstallGlue.c b/xpinstall/wizard/mac/src/XPInstallGlue.c
index 4164db5712d8..75c3f6725d42 100644
--- a/xpinstall/wizard/mac/src/XPInstallGlue.c
+++ b/xpinstall/wizard/mac/src/XPInstallGlue.c
@@ -226,7 +226,7 @@ RunAllXPIs(short xpiVRefNum, long xpiDirID, short vRefNum, long dirID)
 	Str255				installingStr;
 	
 	err = FSMakeFSSpec(vRefNum, dirID, "\p:viewer", &xpiProgDirSpec); /* temp dir */
-	err = FSMakeFSSpec(vRefNum, dirID, "\p:viewer:components", &xpiStubDirSpec); /* xpistub dir */
+	err = FSMakeFSSpec(vRefNum, dirID, "\p:viewer:Components", &xpiStubDirSpec); /* xpistub dir */
 	err = FSMakeFSSpec(gControls->opt->vRefNum, gControls->opt->dirID, 0, &tgtDirSpec);	/* program dir */
 	
 	ERR_CHECK_RET(LoadXPIStub(&xpi_initProc, &xpi_installProc, &xpi_exitProc, &connID, xpiStubDirSpec), err);