diff --git a/ChangeLog b/ChangeLog
index 5a10b6016..975b9c23b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,12 @@
 	* src/core/config_mgr.cpp:
 	Add support for user-configurable backgound artwork
 
+	* src/core/mmp.cpp:
+	* data/samples/drumsynth/r_b:
+	* data/samples/drumsynth/r_n_b:
+	- Fix incorrect replacement for drumsynth/misc
+	- Replace r&b,r_b with r_n_b
+
 2008-09-20	Paul Giblock <drfaygo/at/gmail/dot/com>
 
 	* plugins/sf2_player/sf2_player.cpp:
diff --git a/data/samples/drumsynth/r_b/Hat_O.ds b/data/samples/drumsynth/r_n_b/Hat_O.ds
similarity index 100%
rename from data/samples/drumsynth/r_b/Hat_O.ds
rename to data/samples/drumsynth/r_n_b/Hat_O.ds
diff --git a/data/samples/drumsynth/r_b/S_hollow.ds b/data/samples/drumsynth/r_n_b/S_hollow.ds
similarity index 100%
rename from data/samples/drumsynth/r_b/S_hollow.ds
rename to data/samples/drumsynth/r_n_b/S_hollow.ds
diff --git a/data/samples/drumsynth/r_b/clapfilt.ds b/data/samples/drumsynth/r_n_b/clapfilt.ds
similarity index 100%
rename from data/samples/drumsynth/r_b/clapfilt.ds
rename to data/samples/drumsynth/r_n_b/clapfilt.ds
diff --git a/data/samples/drumsynth/r_b/hat.ds b/data/samples/drumsynth/r_n_b/hat.ds
similarity index 100%
rename from data/samples/drumsynth/r_b/hat.ds
rename to data/samples/drumsynth/r_n_b/hat.ds
diff --git a/data/samples/drumsynth/r_b/hat_rattle.ds b/data/samples/drumsynth/r_n_b/hat_rattle.ds
similarity index 100%
rename from data/samples/drumsynth/r_b/hat_rattle.ds
rename to data/samples/drumsynth/r_n_b/hat_rattle.ds
diff --git a/data/samples/drumsynth/r_b/k_hard.ds b/data/samples/drumsynth/r_n_b/k_hard.ds
similarity index 100%
rename from data/samples/drumsynth/r_b/k_hard.ds
rename to data/samples/drumsynth/r_n_b/k_hard.ds
diff --git a/data/samples/drumsynth/r_b/k_muffle.ds b/data/samples/drumsynth/r_n_b/k_muffle.ds
similarity index 100%
rename from data/samples/drumsynth/r_b/k_muffle.ds
rename to data/samples/drumsynth/r_n_b/k_muffle.ds
diff --git a/data/samples/drumsynth/r_b/k_soft.ds b/data/samples/drumsynth/r_n_b/k_soft.ds
similarity index 100%
rename from data/samples/drumsynth/r_b/k_soft.ds
rename to data/samples/drumsynth/r_n_b/k_soft.ds
diff --git a/data/samples/drumsynth/r_b/old_kik.ds b/data/samples/drumsynth/r_n_b/old_kik.ds
similarity index 100%
rename from data/samples/drumsynth/r_b/old_kik.ds
rename to data/samples/drumsynth/r_n_b/old_kik.ds
diff --git a/data/samples/drumsynth/r_b/popclap.ds b/data/samples/drumsynth/r_n_b/popclap.ds
similarity index 100%
rename from data/samples/drumsynth/r_b/popclap.ds
rename to data/samples/drumsynth/r_n_b/popclap.ds
diff --git a/data/samples/drumsynth/r_b/popsnare.ds b/data/samples/drumsynth/r_n_b/popsnare.ds
similarity index 100%
rename from data/samples/drumsynth/r_b/popsnare.ds
rename to data/samples/drumsynth/r_n_b/popsnare.ds
diff --git a/data/samples/drumsynth/r_b/s_pitch.ds b/data/samples/drumsynth/r_n_b/s_pitch.ds
similarity index 100%
rename from data/samples/drumsynth/r_b/s_pitch.ds
rename to data/samples/drumsynth/r_n_b/s_pitch.ds
diff --git a/data/samples/drumsynth/r_b/s_spit.ds b/data/samples/drumsynth/r_n_b/s_spit.ds
similarity index 100%
rename from data/samples/drumsynth/r_b/s_spit.ds
rename to data/samples/drumsynth/r_n_b/s_spit.ds
diff --git a/data/samples/drumsynth/r_b/snare&hat.ds b/data/samples/drumsynth/r_n_b/snare&hat.ds
similarity index 100%
rename from data/samples/drumsynth/r_b/snare&hat.ds
rename to data/samples/drumsynth/r_n_b/snare&hat.ds
diff --git a/data/samples/drumsynth/r_b/x_backwd.ds b/data/samples/drumsynth/r_n_b/x_backwd.ds
similarity index 100%
rename from data/samples/drumsynth/r_b/x_backwd.ds
rename to data/samples/drumsynth/r_n_b/x_backwd.ds
diff --git a/src/core/mmp.cpp b/src/core/mmp.cpp
index 395d5257d..df539ba51 100644
--- a/src/core/mmp.cpp
+++ b/src/core/mmp.cpp
@@ -653,20 +653,6 @@ void multimediaProject::upgrade( void )
 		}
 	}
 
-	if( version < "0.4.0-beta" )
-	{
-		QDomNodeList list;
-		list = elementsByTagName( "audiofileprocessor" );
-		for( int i = 0; !list.item( i ).isNull(); ++i )
-		{
-			QDomElement el = list.item( i ).toElement();
-			QString s = el.attribute( "src" );
-			s.replace( "drumsynth/misc ", "drumsynth/misc_" );
-			s.replace( "drumsynth/r&b", "drumsynth/r_b" );
-			el.setAttribute( "src", s );
-		}
-	}
-
 	if( version < "0.4.0-beta1" )
 	{
 		// convert binary effect-key-blobs to XML
@@ -706,15 +692,19 @@ void multimediaProject::upgrade( void )
 			}
 		}
 	}
-/*	if( version < "0.4.0-beta" )
+	if( version < "0.4.0-rc2" )
 	{
-		QDomNodeList list;
-		while( !( list = elementsByTagName( "lb302" ) ).isEmpty() )
+		QDomNodeList list = elementsByTagName( "audiofileprocessor" );
+		for( int i = 0; !list.item( i ).isNull(); ++i )
 		{
-			QDomElement el = list.item( 0 ).toElement();
-			el.setTagName( "lb303" );
+			QDomElement el = list.item( i ).toElement();
+			QString s = el.attribute( "src" );
+			s.replace( "drumsynth/misc ", "drumsynth/misc_" );
+			s.replace( "drumsynth/r&b", "drumsynth/r_n_b" );
+			s.replace( "drumsynth/r_b", "drumsynth/r_n_b" );
+			el.setAttribute( "src", s );
 		}
-	}*/
+	}
 
 	// Time-signature
 	if ( !m_head.hasAttribute( "timesig_numerator" ) )