--- a/src/in_gsf/XSFPlayer_GSF.cpp
+++ b/src/in_gsf/XSFPlayer_GSF.cpp
@@ -119,7 +119,7 @@
 	return new GSFSoundDriver();
 }
 
-static void Map2SFSection(const std::vector<uint8_t> &section, int level)
+static void MapGSFSection(const std::vector<uint8_t> &section, int level)
 {
 	auto &data = loaderwork.rom;
 
@@ -134,7 +134,7 @@
 	memcpy(&data[offset], &section[12], size);
 }
 
-static bool Map2SF(XSFFile *xSF, int level)
+static bool MapGSF(XSFFile *xSF, int level)
 {
 	if (!xSF->IsValidType(0x22))
 		return false;
@@ -142,12 +142,12 @@
 	auto &programSection = xSF->GetProgramSection();
 
 	if (!programSection.empty())
-		Map2SFSection(programSection, level);
+		MapGSFSection(programSection, level);
 
 	return true;
 }
 
-static bool RecursiveLoad2SF(XSFFile *xSF, int level)
+static bool RecursiveLoadGSF(XSFFile *xSF, int level)
 {
 	if (level <= 10 && xSF->GetTagExists("_lib"))
 	{
@@ -156,11 +156,11 @@
 #else
 		auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue("_lib"), 8, 12));
 #endif
-		if (!RecursiveLoad2SF(libxSF.get(), level + 1))
+		if (!RecursiveLoadGSF(libxSF.get(), level + 1))
 			return false;
 	}
 
-	if (!Map2SF(xSF, level))
+	if (!MapGSF(xSF, level))
 		return false;
 
 	unsigned n = 2;
@@ -177,7 +177,7 @@
 #else
 			auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue(libTag), 8, 12));
 #endif
-			if (!RecursiveLoad2SF(libxSF.get(), level + 1))
+			if (!RecursiveLoadGSF(libxSF.get(), level + 1))
 				return false;
 		}
 	} while (found);
@@ -185,12 +185,12 @@
 	return true;
 }
 
-static bool Load2SF(XSFFile *xSF)
+static bool LoadGSF(XSFFile *xSF)
 {
 	loaderwork.rom.clear();
 	loaderwork.entry = 0;
 
-	return RecursiveLoad2SF(xSF, 1);
+	return RecursiveLoadGSF(xSF, 1);
 }
 
 XSFPlayer_GSF::XSFPlayer_GSF(const std::string &filename) : XSFPlayer()
@@ -207,7 +207,7 @@
 
 bool XSFPlayer_GSF::Load()
 {
-	if (!Load2SF(this->xSF.get()))
+	if (!LoadGSF(this->xSF.get()))
 		return false;
 
 	cpuIsMultiBoot = (loaderwork.entry >> 24) == 2;

--- a/src/in_snsf/XSFPlayer_SNSF.cpp
+++ b/src/in_snsf/XSFPlayer_SNSF.cpp
@@ -106,7 +106,7 @@
 	return true;
 }
 
-static void Map2SFSection(const std::vector<uint8_t> &section)
+static void MapSNSFSection(const std::vector<uint8_t> &section)
 {
 	auto &data = loaderwork.rom;
 
@@ -126,7 +126,7 @@
 	std::copy_n(&section[8], size, &data[offset]);
 }
 
-static bool Map2SF(XSFFile *xSF)
+static bool MapSNSF(XSFFile *xSF)
 {
 	if (!xSF->IsValidType(0x23))
 		return false;
@@ -157,12 +157,12 @@
 	}
 
 	if (!programSection.empty())
-		Map2SFSection(programSection);
+		MapSNSFSection(programSection);
 
 	return true;
 }
 
-static bool RecursiveLoad2SF(XSFFile *xSF, int level)
+static bool RecursiveLoadSNSF(XSFFile *xSF, int level)
 {
 	if (level <= 10 && xSF->GetTagExists("_lib"))
 	{
@@ -171,11 +171,11 @@
 #else
 		auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue("_lib"), 4, 8));
 #endif
-		if (!RecursiveLoad2SF(libxSF.get(), level + 1))
+		if (!RecursiveLoadSNSF(libxSF.get(), level + 1))
 			return false;
 	}
 
-	if (!Map2SF(xSF))
+	if (!MapSNSF(xSF))
 		return false;
 
 	unsigned n = 2;
@@ -192,7 +192,7 @@
 #else
 			auto libxSF = std::unique_ptr<XSFFile>(new XSFFile(ExtractDirectoryFromPath(xSF->GetFilename()) + xSF->GetTagValue(libTag), 4, 8));
 #endif
-			if (!RecursiveLoad2SF(libxSF.get(), level + 1))
+			if (!RecursiveLoadSNSF(libxSF.get(), level + 1))
 				return false;
 		}
 	} while (found);
@@ -200,14 +200,14 @@
 	return true;
 }
 
-static bool Load2SF(XSFFile *xSF)
+static bool LoadSNSF(XSFFile *xSF)
 {
 	loaderwork.rom.clear();
 	loaderwork.sram.clear();
 	loaderwork.first = false;
 	loaderwork.base = 0;
 
-	return RecursiveLoad2SF(xSF, 1);
+	return RecursiveLoadSNSF(xSF, 1);
 }
 
 XSFPlayer_SNSF::XSFPlayer_SNSF(const std::string &filename) : XSFPlayer()
@@ -224,7 +224,7 @@
 
 bool XSFPlayer_SNSF::Load()
 {
-	if (!Load2SF(this->xSF.get()))
+	if (!LoadSNSF(this->xSF.get()))
 		return false;
 
 	Settings.SoundSync = true;