diff --git a/data/samples/bassloops/briff01.ogg b/data/samples/bassloops/briff01 - 140 BPM.ogg
similarity index 98%
rename from data/samples/bassloops/briff01.ogg
rename to data/samples/bassloops/briff01 - 140 BPM.ogg
index a307df85f..0b9cc32f7 100644
Binary files a/data/samples/bassloops/briff01.ogg and b/data/samples/bassloops/briff01 - 140 BPM.ogg differ
diff --git a/data/samples/bassloops/rave_bass01.ogg b/data/samples/bassloops/rave_bass01 - 180 BPM.ogg
similarity index 98%
rename from data/samples/bassloops/rave_bass01.ogg
rename to data/samples/bassloops/rave_bass01 - 180 BPM.ogg
index 920ff4a74..335195747 100644
Binary files a/data/samples/bassloops/rave_bass01.ogg and b/data/samples/bassloops/rave_bass01 - 180 BPM.ogg differ
diff --git a/data/samples/bassloops/rave_bass02.ogg b/data/samples/bassloops/rave_bass02 - 180 BPM.ogg
similarity index 97%
rename from data/samples/bassloops/rave_bass02.ogg
rename to data/samples/bassloops/rave_bass02 - 180 BPM.ogg
index ff38123df..230d99d2e 100644
Binary files a/data/samples/bassloops/rave_bass02.ogg and b/data/samples/bassloops/rave_bass02 - 180 BPM.ogg differ
diff --git a/data/samples/bassloops/tb303_01.ogg b/data/samples/bassloops/tb303_01 - 123 BPM.ogg
similarity index 98%
rename from data/samples/bassloops/tb303_01.ogg
rename to data/samples/bassloops/tb303_01 - 123 BPM.ogg
index 41e1b1fc4..105720175 100644
Binary files a/data/samples/bassloops/tb303_01.ogg and b/data/samples/bassloops/tb303_01 - 123 BPM.ogg differ
diff --git a/data/samples/bassloops/techno_bass01.ogg b/data/samples/bassloops/techno_bass01 - 140 BPM.ogg
similarity index 92%
rename from data/samples/bassloops/techno_bass01.ogg
rename to data/samples/bassloops/techno_bass01 - 140 BPM.ogg
index 15c2c8e32..55cd204dd 100644
Binary files a/data/samples/bassloops/techno_bass01.ogg and b/data/samples/bassloops/techno_bass01 - 140 BPM.ogg differ
diff --git a/data/samples/bassloops/techno_bass02.ogg b/data/samples/bassloops/techno_bass02 - 140 BPM.ogg
similarity index 92%
rename from data/samples/bassloops/techno_bass02.ogg
rename to data/samples/bassloops/techno_bass02 - 140 BPM.ogg
index 08691f435..c1f3e8637 100644
Binary files a/data/samples/bassloops/techno_bass02.ogg and b/data/samples/bassloops/techno_bass02 - 140 BPM.ogg differ
diff --git a/data/samples/bassloops/techno_synth01.ogg b/data/samples/bassloops/techno_synth01 - 140 BPM.ogg
similarity index 86%
rename from data/samples/bassloops/techno_synth01.ogg
rename to data/samples/bassloops/techno_synth01 - 140 BPM.ogg
index 95c3d96ae..1086bb0c8 100644
Binary files a/data/samples/bassloops/techno_synth01.ogg and b/data/samples/bassloops/techno_synth01 - 140 BPM.ogg differ
diff --git a/data/samples/bassloops/techno_synth02.ogg b/data/samples/bassloops/techno_synth02 - 140 BPM.ogg
similarity index 87%
rename from data/samples/bassloops/techno_synth02.ogg
rename to data/samples/bassloops/techno_synth02 - 140 BPM.ogg
index dfa972e1d..afb27172b 100644
Binary files a/data/samples/bassloops/techno_synth02.ogg and b/data/samples/bassloops/techno_synth02 - 140 BPM.ogg differ
diff --git a/data/samples/bassloops/techno_synth03.ogg b/data/samples/bassloops/techno_synth03 - 130 BPM.ogg
similarity index 92%
rename from data/samples/bassloops/techno_synth03.ogg
rename to data/samples/bassloops/techno_synth03 - 130 BPM.ogg
index c27cda653..bffff9517 100644
Binary files a/data/samples/bassloops/techno_synth03.ogg and b/data/samples/bassloops/techno_synth03 - 130 BPM.ogg differ
diff --git a/data/samples/bassloops/techno_synth04.ogg b/data/samples/bassloops/techno_synth04 - 140 BPM.ogg
similarity index 99%
rename from data/samples/bassloops/techno_synth04.ogg
rename to data/samples/bassloops/techno_synth04 - 140 BPM.ogg
index 0e9a37398..9dd34f33a 100644
Binary files a/data/samples/bassloops/techno_synth04.ogg and b/data/samples/bassloops/techno_synth04 - 140 BPM.ogg differ
diff --git a/data/samples/beats/909beat01.ogg b/data/samples/beats/909beat01 - 122 BPM.ogg
similarity index 99%
rename from data/samples/beats/909beat01.ogg
rename to data/samples/beats/909beat01 - 122 BPM.ogg
index 1892eb91b..2bae51357 100644
Binary files a/data/samples/beats/909beat01.ogg and b/data/samples/beats/909beat01 - 122 BPM.ogg differ
diff --git a/data/samples/beats/break01.ogg b/data/samples/beats/break01 - 168 BPM.ogg
similarity index 94%
rename from data/samples/beats/break01.ogg
rename to data/samples/beats/break01 - 168 BPM.ogg
index d1f5769bd..5d9bd2f4b 100644
Binary files a/data/samples/beats/break01.ogg and b/data/samples/beats/break01 - 168 BPM.ogg differ
diff --git a/data/samples/beats/break02.ogg b/data/samples/beats/break02 - 141 BPM.ogg
similarity index 89%
rename from data/samples/beats/break02.ogg
rename to data/samples/beats/break02 - 141 BPM.ogg
index 17243cd9e..653662c75 100644
Binary files a/data/samples/beats/break02.ogg and b/data/samples/beats/break02 - 141 BPM.ogg differ
diff --git a/data/samples/beats/break03.ogg b/data/samples/beats/break03 - 168 BPM.ogg
similarity index 95%
rename from data/samples/beats/break03.ogg
rename to data/samples/beats/break03 - 168 BPM.ogg
index f806be70a..3b3a4b346 100644
Binary files a/data/samples/beats/break03.ogg and b/data/samples/beats/break03 - 168 BPM.ogg differ
diff --git a/data/samples/beats/electro_beat01.ogg b/data/samples/beats/electro_beat01 - 120 BPM.ogg
similarity index 99%
rename from data/samples/beats/electro_beat01.ogg
rename to data/samples/beats/electro_beat01 - 120 BPM.ogg
index 57cd690fc..29352b683 100644
Binary files a/data/samples/beats/electro_beat01.ogg and b/data/samples/beats/electro_beat01 - 120 BPM.ogg differ
diff --git a/data/samples/beats/electro_beat02.ogg b/data/samples/beats/electro_beat02 - 119 BPM.ogg
similarity index 98%
rename from data/samples/beats/electro_beat02.ogg
rename to data/samples/beats/electro_beat02 - 119 BPM.ogg
index b89260bab..775b64d88 100644
Binary files a/data/samples/beats/electro_beat02.ogg and b/data/samples/beats/electro_beat02 - 119 BPM.ogg differ
diff --git a/data/samples/beats/house_loop01.ogg b/data/samples/beats/house_loop01 - 142 BPM.ogg
similarity index 98%
rename from data/samples/beats/house_loop01.ogg
rename to data/samples/beats/house_loop01 - 142 BPM.ogg
index 09f3a260b..9f04d1deb 100644
Binary files a/data/samples/beats/house_loop01.ogg and b/data/samples/beats/house_loop01 - 142 BPM.ogg differ
diff --git a/data/samples/beats/jungle01.ogg b/data/samples/beats/jungle01 - 168 BPM.ogg
similarity index 98%
rename from data/samples/beats/jungle01.ogg
rename to data/samples/beats/jungle01 - 168 BPM.ogg
index 9662e4514..b7196044f 100644
Binary files a/data/samples/beats/jungle01.ogg and b/data/samples/beats/jungle01 - 168 BPM.ogg differ
diff --git a/data/samples/beats/rave_hihat01.ogg b/data/samples/beats/rave_hihat01 - 180 BPM.ogg
similarity index 98%
rename from data/samples/beats/rave_hihat01.ogg
rename to data/samples/beats/rave_hihat01 - 180 BPM.ogg
index 236f447a8..632bb0bec 100644
Binary files a/data/samples/beats/rave_hihat01.ogg and b/data/samples/beats/rave_hihat01 - 180 BPM.ogg differ
diff --git a/data/samples/beats/rave_hihat02.ogg b/data/samples/beats/rave_hihat02 - 180 BPM.ogg
similarity index 98%
rename from data/samples/beats/rave_hihat02.ogg
rename to data/samples/beats/rave_hihat02 - 180 BPM.ogg
index 33329bd55..a6e5426f4 100644
Binary files a/data/samples/beats/rave_hihat02.ogg and b/data/samples/beats/rave_hihat02 - 180 BPM.ogg differ
diff --git a/data/samples/beats/rave_kick01.ogg b/data/samples/beats/rave_kick01 - 180 BPM.ogg
similarity index 98%
rename from data/samples/beats/rave_kick01.ogg
rename to data/samples/beats/rave_kick01 - 180 BPM.ogg
index 79f99ffb8..5633f6e1c 100644
Binary files a/data/samples/beats/rave_kick01.ogg and b/data/samples/beats/rave_kick01 - 180 BPM.ogg differ
diff --git a/data/samples/beats/rave_kick02.ogg b/data/samples/beats/rave_kick02 - 180 BPM.ogg
similarity index 97%
rename from data/samples/beats/rave_kick02.ogg
rename to data/samples/beats/rave_kick02 - 180 BPM.ogg
index 463112869..c57cfc0d9 100644
Binary files a/data/samples/beats/rave_kick02.ogg and b/data/samples/beats/rave_kick02 - 180 BPM.ogg differ
diff --git a/data/samples/beats/rave_snare01.ogg b/data/samples/beats/rave_snare01 - 180 BPM.ogg
similarity index 98%
rename from data/samples/beats/rave_snare01.ogg
rename to data/samples/beats/rave_snare01 - 180 BPM.ogg
index ceec2d6e0..6e17a6af3 100644
Binary files a/data/samples/beats/rave_snare01.ogg and b/data/samples/beats/rave_snare01 - 180 BPM.ogg differ
diff --git a/data/samples/latin/latin_brass01.ogg b/data/samples/latin/latin_brass01 - 140 BPM.ogg
similarity index 95%
rename from data/samples/latin/latin_brass01.ogg
rename to data/samples/latin/latin_brass01 - 140 BPM.ogg
index 3bf7dcd27..ac9a2c59b 100644
Binary files a/data/samples/latin/latin_brass01.ogg and b/data/samples/latin/latin_brass01 - 140 BPM.ogg differ
diff --git a/data/samples/latin/latin_guitar01.ogg b/data/samples/latin/latin_guitar01 - 126 BPM.ogg
similarity index 95%
rename from data/samples/latin/latin_guitar01.ogg
rename to data/samples/latin/latin_guitar01 - 126 BPM.ogg
index 25685013d..3c316ec3b 100644
Binary files a/data/samples/latin/latin_guitar01.ogg and b/data/samples/latin/latin_guitar01 - 126 BPM.ogg differ
diff --git a/data/samples/latin/latin_guitar02.ogg b/data/samples/latin/latin_guitar02 - 140 BPM.ogg
similarity index 92%
rename from data/samples/latin/latin_guitar02.ogg
rename to data/samples/latin/latin_guitar02 - 140 BPM.ogg
index 3fe4269a2..55b218d98 100644
Binary files a/data/samples/latin/latin_guitar02.ogg and b/data/samples/latin/latin_guitar02 - 140 BPM.ogg differ
diff --git a/data/samples/latin/latin_guitar03.ogg b/data/samples/latin/latin_guitar03 - 120 BPM.ogg
similarity index 90%
rename from data/samples/latin/latin_guitar03.ogg
rename to data/samples/latin/latin_guitar03 - 120 BPM.ogg
index 0ae9bb3f7..1f6a9275e 100644
Binary files a/data/samples/latin/latin_guitar03.ogg and b/data/samples/latin/latin_guitar03 - 120 BPM.ogg differ
diff --git a/include/DataFile.h b/include/DataFile.h
index dc82315ad..ceda9b829 100644
--- a/include/DataFile.h
+++ b/include/DataFile.h
@@ -127,7 +127,8 @@ private:
 	void upgrade_mixerRename();
 	void upgrade_bbTcoRename();
 	void upgrade_sampleAndHold();
-	void upgrade_midiCCIndexing();
+  	void upgrade_midiCCIndexing();
+	void upgrade_loopsRename();
 
 	// List of all upgrade methods
 	static const std::vector<UpgradeMethod> UPGRADE_METHODS;
diff --git a/src/core/DataFile.cpp b/src/core/DataFile.cpp
index b87d06931..b83e1bebb 100644
--- a/src/core/DataFile.cpp
+++ b/src/core/DataFile.cpp
@@ -80,7 +80,8 @@ const std::vector<DataFile::UpgradeMethod> DataFile::UPGRADE_METHODS = {
 	&DataFile::upgrade_automationNodes  ,   &DataFile::upgrade_extendedNoteRange,
 	&DataFile::upgrade_defaultTripleOscillatorHQ,
 	&DataFile::upgrade_mixerRename      ,   &DataFile::upgrade_bbTcoRename,
-	&DataFile::upgrade_sampleAndHold    ,   &DataFile::upgrade_midiCCIndexing
+	&DataFile::upgrade_sampleAndHold    ,   &DataFile::upgrade_midiCCIndexing,
+	&DataFile::upgrade_loopsRename
 };
 
 // Vector of all versions that have upgrade routines.
@@ -1807,7 +1808,76 @@ void DataFile::upgrade_sampleAndHold()
 		// Correct old random wave LFO speeds
 		if (e.attribute("wave").toInt() == 6)
 		{
-			e.setAttribute("speed",0.01f);
+			e.setAttribute("speed", 0.01f);
+		}
+	}
+}
+
+
+// Change loops' filenames in <sampleclip>s
+void DataFile::upgrade_loopsRename()
+{
+	static constexpr auto loopBPMs = std::array{
+		std::pair{"bassloops/briff01", "140"},
+		std::pair{"bassloops/rave_bass01", "180"},
+		std::pair{"bassloops/rave_bass02", "180"},
+		std::pair{"bassloops/tb303_01", "123"},
+		std::pair{"bassloops/techno_bass01", "140"},
+		std::pair{"bassloops/techno_bass02", "140"},
+		std::pair{"bassloops/techno_synth01", "140"},
+		std::pair{"bassloops/techno_synth02", "140"},
+		std::pair{"bassloops/techno_synth03", "130"},
+		std::pair{"bassloops/techno_synth04", "140"},
+		std::pair{"beats/909beat01", "122"},
+		std::pair{"beats/break01", "168"},
+		std::pair{"beats/break02", "141"},
+		std::pair{"beats/break03", "168"},
+		std::pair{"beats/electro_beat01", "120"},
+		std::pair{"beats/electro_beat02", "119"},
+		std::pair{"beats/house_loop01", "142"},
+		std::pair{"beats/jungle01", "168"},
+		std::pair{"beats/rave_hihat01", "180"},
+		std::pair{"beats/rave_hihat02", "180"},
+		std::pair{"beats/rave_kick01", "180"},
+		std::pair{"beats/rave_kick02", "180"},
+		std::pair{"beats/rave_snare01", "180"},
+		std::pair{"latin/latin_brass01", "140"},
+		std::pair{"latin/latin_guitar01", "126"},
+		std::pair{"latin/latin_guitar02", "140"},
+		std::pair{"latin/latin_guitar03", "120"},
+	};
+
+	const QString prefix = "factorysample:",
+		  extension = ".ogg";
+
+	// Replace loop sample names
+	for (const auto& [elem, srcAttrs] : ELEMENTS_WITH_RESOURCES)
+	{
+		auto elements = elementsByTagName(elem);
+
+		for (const auto& srcAttr : srcAttrs)
+		{
+			for (int i = 0; i < elements.length(); ++i)
+			{
+				auto item = elements.item(i).toElement();
+
+				if (item.isNull() || !item.hasAttribute(srcAttr)) { continue; }
+				for (const auto& cur : loopBPMs)
+				{
+					QString x = cur.first, // loop name
+						y = cur.second,    // BPM
+						srcVal = item.attribute(srcAttr),
+						pattern = prefix + x + extension;
+
+					if (srcVal == pattern)
+					{
+						// Add " - X BPM" to filename
+						item.setAttribute(srcAttr, 
+								prefix + x + " - " + y + " BPM" +
+								extension);
+					}
+				}
+			}
 		}
 	}
 }
@@ -1984,5 +2054,4 @@ unsigned int DataFile::legacyFileVersion()
 	return std::distance( UPGRADE_VERSIONS.begin(), firstRequiredUpgrade );
 }
 
-
 } // namespace lmms