diff --git a/subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json b/subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json
index 50128fb8d6..aa89dcd265 100644
--- a/subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json
+++ b/subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json
@@ -5524,7 +5524,7 @@
                     "GInitiallyUnowned",
                     "GObject"
                 ],
-                "klass": "Codec/Video",
+                "klass": "Codec/Video/Timestamper",
                 "long-name": "H.264 timestamper",
                 "pad-templates": {
                     "sink": {
@@ -5538,7 +5538,7 @@
                         "presence": "always"
                     }
                 },
-                "rank": "none"
+                "rank": "marginal"
             },
             "h265timestamper": {
                 "author": "Seungha Yang <seungha@centricular.com>",
@@ -5551,7 +5551,7 @@
                     "GInitiallyUnowned",
                     "GObject"
                 ],
-                "klass": "Codec/Video",
+                "klass": "Codec/Video/Timestamper",
                 "long-name": "H.265 timestamper",
                 "pad-templates": {
                     "sink": {
@@ -5565,7 +5565,7 @@
                         "presence": "always"
                     }
                 },
-                "rank": "none"
+                "rank": "marginal"
             }
         },
         "filename": "gstcodectimestamper",
diff --git a/subprojects/gst-plugins-bad/gst/codectimestamper/gsth264timestamper.c b/subprojects/gst-plugins-bad/gst/codectimestamper/gsth264timestamper.c
index d4f136d6df..0b1f553971 100644
--- a/subprojects/gst-plugins-bad/gst/codectimestamper/gsth264timestamper.c
+++ b/subprojects/gst-plugins-bad/gst/codectimestamper/gsth264timestamper.c
@@ -98,7 +98,7 @@ G_DEFINE_TYPE (GstH264Timestamper,
     gst_h264_timestamper, GST_TYPE_CODEC_TIMESTAMPER);
 
 GST_ELEMENT_REGISTER_DEFINE (h264timestamper, "h264timestamper",
-    GST_RANK_NONE, GST_TYPE_H264_TIMESTAMPER);
+    GST_RANK_MARGINAL, GST_TYPE_H264_TIMESTAMPER);
 
 static void
 gst_h264_timestamper_class_init (GstH264TimestamperClass * klass)
@@ -111,7 +111,7 @@ gst_h264_timestamper_class_init (GstH264TimestamperClass * klass)
   gst_element_class_add_static_pad_template (element_class, &srctemplate);
 
   gst_element_class_set_static_metadata (element_class, "H.264 timestamper",
-      "Codec/Video", "Timestamp H.264 streams",
+      "Codec/Video/Timestamper", "Timestamp H.264 streams",
       "Seungha Yang <seungha@centricular.com>");
 
   timestamper_class->start = GST_DEBUG_FUNCPTR (gst_h264_timestamper_start);
diff --git a/subprojects/gst-plugins-bad/gst/codectimestamper/gsth265timestamper.c b/subprojects/gst-plugins-bad/gst/codectimestamper/gsth265timestamper.c
index dab2a096f2..eb4ff6ad7d 100644
--- a/subprojects/gst-plugins-bad/gst/codectimestamper/gsth265timestamper.c
+++ b/subprojects/gst-plugins-bad/gst/codectimestamper/gsth265timestamper.c
@@ -98,7 +98,7 @@ G_DEFINE_TYPE (GstH265Timestamper,
     gst_h265_timestamper, GST_TYPE_CODEC_TIMESTAMPER);
 
 GST_ELEMENT_REGISTER_DEFINE (h265timestamper, "h265timestamper",
-    GST_RANK_NONE, GST_TYPE_H265_TIMESTAMPER);
+    GST_RANK_MARGINAL, GST_TYPE_H265_TIMESTAMPER);
 
 static void
 gst_h265_timestamper_class_init (GstH265TimestamperClass * klass)
@@ -111,7 +111,7 @@ gst_h265_timestamper_class_init (GstH265TimestamperClass * klass)
   gst_element_class_add_static_pad_template (element_class, &srctemplate);
 
   gst_element_class_set_static_metadata (element_class, "H.265 timestamper",
-      "Codec/Video", "Timestamp H.265 streams",
+      "Codec/Video/Timestamper", "Timestamp H.265 streams",
       "Seungha Yang <seungha@centricular.com>");
 
   timestamper_class->start = GST_DEBUG_FUNCPTR (gst_h265_timestamper_start);