diff --git a/source/memcard/memcard.cpp b/source/memcard/memcard.cpp
index 8e82e0828..8c6133a85 100644
--- a/source/memcard/memcard.cpp
+++ b/source/memcard/memcard.cpp
@@ -32,7 +32,7 @@
 	Tyepdefs && Defines
 	------------------- */
 
-#define	SAVENAMEHEADER		"SBSP: "
+#define	SAVENAMEHEADER		"SpongeBob"
 
 // for prlsr - use slot 1 only
 #define USE_SLOT_ONE_ONLY
@@ -511,7 +511,8 @@ void MemCard::FillHeaderDetails( unsigned char *HeaderBase, int FileLength, char
 		// Damn fool!
 		return;
 	}
-	sprintf(realFilename,"%s%s",SAVENAMEHEADER,Filename);
+//	sprintf(realFilename,"%s%s",SAVENAMEHEADER,Filename);
+	sprintf(realFilename,"%s",SAVENAMEHEADER);		// (pkg) SBSP modification
 
 	// Fill in the details
 	HeaderBase[ 3 ] = (char)BlockCount;
@@ -1341,16 +1342,18 @@ int MemCard::TestCheckSum(unsigned char *_result,unsigned char *_data,u32 _size)
   ---------------------------------------------------------------------- */
 void MemCard::CreateFName(char *fname)
 {
+	int	i;
+
 	sprintf( s_fnameBase, "%s", MEMCARD_BASE_FILENAME);
 
 	// Finally, add the users savename
-	strcat( s_fnameBase, "--------\0" );
-	for(int i=0;i<strlen(s_userFileName);i++)
+	for(i=0;i<strlen(s_userFileName);i++)
 	{
 		s_fnameBase[12+i]=s_userFileName[i];
 	}
+	s_fnameBase[12+i]='\0';
+
 
-	
 	MEMCARD_DBGMSG("MemCard filename set to '%s'", s_fnameBase );
 }
 
diff --git a/source/memcard/saveload.cpp b/source/memcard/saveload.cpp
index bf373b610..d159ce099 100644
--- a/source/memcard/saveload.cpp
+++ b/source/memcard/saveload.cpp
@@ -174,7 +174,7 @@ bool CSaveLoadDatabase::startSave(char *_filename,int _fileNum=-1)
 
 
 	// Start write to memcard
-	if(!MemCard::WriteFile(0,_fileNum,(u8*)_filename,(void*)m_tempBuffer,m_bufferSize,&callback))
+	if(!MemCard::WriteFile(0,_fileNum,(u8*)NULL,(void*)m_tempBuffer,m_bufferSize,&callback))
 	{
 		MEMCARD_DBGMSG("write error");
 		freeBuffer();