diff --git a/modules/rds.py b/modules/rds.py
index bfe962b..4a5acc8 100644
--- a/modules/rds.py
+++ b/modules/rds.py
@@ -36,7 +36,7 @@ class RT_Set(uecp.commands.RadioTextSetCommand):
                 | self._radiotext.a_b_toggle
             )
             data += [mel, flags]
-            data += list(self._radiotext.text.encode("rp-rds", "replace"))
+            data += list(self._radiotext.text.encode("radiodatasystem", "replace"))
         return data
 
 DEBUG = False
diff --git a/rds_codec.py b/rds_codec.py
index d41f27f..c28427f 100644
--- a/rds_codec.py
+++ b/rds_codec.py
@@ -339,7 +339,7 @@ _CODEC_INFO = codecs.CodecInfo(
 
 
 def _rds_lookup(name: str):
-    if name in ('rp-rds', 'rds-charset', 'rds_charset'):
+    if name in ('radiodatasystem', 'rds-charset', 'rds_charset'):
         return _CODEC_INFO
     return None