diff -r 00c77e22fb64 -r 631788774f96 libpurple/media/backend-fs2.c
--- a/libpurple/media/backend-fs2.c	Tue May 25 02:03:21 2021 -0500
+++ b/libpurple/media/backend-fs2.c	Tue May 25 22:58:34 2021 -0500
@@ -173,7 +173,7 @@
 G_DEFINE_TYPE_WITH_CODE(PurpleMediaBackendFs2, purple_media_backend_fs2,
 		G_TYPE_OBJECT,
 		G_ADD_PRIVATE(PurpleMediaBackendFs2)
-		G_IMPLEMENT_INTERFACE(PURPLE_TYPE_MEDIA_BACKEND,
+		G_IMPLEMENT_INTERFACE(PURPLE_MEDIA_TYPE_BACKEND,
 				purple_media_backend_iface_init));
 
 static void
@@ -416,7 +416,7 @@
 		const GValue *value, GParamSpec *pspec)
 {
 	PurpleMediaBackendFs2Private *priv;
-	g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(object));
+	g_return_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(object));
 
 	priv = purple_media_backend_fs2_get_instance_private(
 			PURPLE_MEDIA_BACKEND_FS2(object));
@@ -454,7 +454,7 @@
 		GValue *value, GParamSpec *pspec)
 {
 	PurpleMediaBackendFs2Private *priv;
-	g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(object));
+	g_return_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(object));
 
 	priv = purple_media_backend_fs2_get_instance_private(
 			PURPLE_MEDIA_BACKEND_FS2(object));
@@ -724,7 +724,7 @@
 	PurpleMediaBackendFs2Private *priv;
 	PurpleMediaBackendFs2Session *session = NULL;
 
-	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL);
+	g_return_val_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(self), NULL);
 
 	priv = purple_media_backend_fs2_get_instance_private(self);
 
@@ -740,7 +740,7 @@
 	PurpleMediaBackendFs2Private *priv;
 	FsParticipant *participant = NULL;
 
-	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL);
+	g_return_val_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(self), NULL);
 
 	priv = purple_media_backend_fs2_get_instance_private(self);
 
@@ -757,7 +757,7 @@
 	PurpleMediaBackendFs2Private *priv;
 	GList *streams;
 
-	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL);
+	g_return_val_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(self), NULL);
 
 	priv = purple_media_backend_fs2_get_instance_private(self);
 	streams = priv->streams;
@@ -779,7 +779,7 @@
 	PurpleMediaBackendFs2Private *priv;
 	GList *streams, *ret = NULL;
 
-	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL);
+	g_return_val_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(self), NULL);
 
 	priv = purple_media_backend_fs2_get_instance_private(self);
 	streams = priv->streams;
@@ -807,7 +807,7 @@
 	FsSession *fssession;
 	GList *values;
 
-	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL);
+	g_return_val_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(self), NULL);
 	g_return_val_if_fail(FS_IS_STREAM(stream), NULL);
 
 	g_object_get(stream, "session", &fssession, NULL);
@@ -919,7 +919,7 @@
 		return;
 	}
 
-	if (!FS_IS_CONFERENCE(src) || !PURPLE_IS_MEDIA_BACKEND(self) ||
+	if (!FS_IS_CONFERENCE(src) || !PURPLE_MEDIA_IS_BACKEND(self) ||
 			priv->conference != FS_CONFERENCE(src))
 		return;
 
@@ -2094,7 +2094,7 @@
 	PurpleMediaBackendFs2Stream *stream;
 	GError *err = NULL;
 
-	g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self));
+	g_return_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(self));
 
 	priv = purple_media_backend_fs2_get_instance_private(
 			PURPLE_MEDIA_BACKEND_FS2(self));
@@ -2139,7 +2139,7 @@
 	PurpleMediaBackendFs2Private *priv;
 	gboolean ret = FALSE;
 
-	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), FALSE);
+	g_return_val_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(self), FALSE);
 
 	priv = purple_media_backend_fs2_get_instance_private(
 			PURPLE_MEDIA_BACKEND_FS2(self));
@@ -2209,7 +2209,7 @@
 	GList *fscodecs;
 	GList *codecs;
 
-	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL);
+	g_return_val_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(self), NULL);
 
 	session = get_session(PURPLE_MEDIA_BACKEND_FS2(self), sess_id);
 
@@ -2231,7 +2231,7 @@
 	PurpleMediaBackendFs2Stream *stream;
 	GList *candidates = NULL;
 
-	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL);
+	g_return_val_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(self), NULL);
 
 	stream = get_stream(PURPLE_MEDIA_BACKEND_FS2(self),
 			sess_id, participant);
@@ -2252,7 +2252,7 @@
 	GList *fscodecs;
 	GError *err = NULL;
 
-	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), FALSE);
+	g_return_val_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(self), FALSE);
 	stream = get_stream(PURPLE_MEDIA_BACKEND_FS2(self),
 			sess_id, participant);
 
@@ -2307,7 +2307,7 @@
 	GError *err = NULL;
 	gboolean result;
 
-	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), FALSE);
+	g_return_val_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(self), FALSE);
 
 	session = get_session(PURPLE_MEDIA_BACKEND_FS2(self), sess_id);
 	if (!session)
@@ -2340,7 +2340,7 @@
 	GError *err = NULL;
 	gboolean result;
 
-	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), FALSE);
+	g_return_val_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(self), FALSE);
 
 	stream = get_stream(PURPLE_MEDIA_BACKEND_FS2(self), sess_id,
 			participant);
@@ -2389,7 +2389,7 @@
 	FsCodec *fscodec;
 	GError *err = NULL;
 
-	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), FALSE);
+	g_return_val_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(self), FALSE);
 
 	session = get_session(PURPLE_MEDIA_BACKEND_FS2(self), sess_id);
 
@@ -2446,7 +2446,7 @@
 	guint i;
 	GstStructure *sdes;
 
-	g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self));
+	g_return_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(self));
 
 	priv = purple_media_backend_fs2_get_instance_private(
 			PURPLE_MEDIA_BACKEND_FS2(self));
@@ -2490,7 +2490,7 @@
 	PurpleMediaBackendFs2Session *session;
 	FsDTMFEvent event;
 
-	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), FALSE);
+	g_return_val_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(self), FALSE);
 
 	session = get_session(PURPLE_MEDIA_BACKEND_FS2(self), sess_id);
 	if (session == NULL)
@@ -2579,7 +2579,7 @@
 	PurpleMediaBackendFs2Private *priv;
 	GList *sessions;
 
-	g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self));
+	g_return_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(self));
 
 	priv = purple_media_backend_fs2_get_instance_private(self);
 
@@ -2612,7 +2612,7 @@
 #ifdef USE_VV
 	GList *streams;
 
-	g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self));
+	g_return_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(self));
 
 	purple_prefs_set_int("/purple/media/audio/volume/output", level);
 
@@ -2638,7 +2638,7 @@
 {
 	PurpleMediaBackendFs2Stream *stream;
 
-	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), FALSE);
+	g_return_val_if_fail(PURPLE_MEDIA_IS_BACKEND_FS2(self), FALSE);
 	stream = get_stream(PURPLE_MEDIA_BACKEND_FS2(self),
 			sess_id, participant);