diff --git a/subprojects/gst-plugins-bad/sys/nvcodec/gstnvh264encoder.cpp b/subprojects/gst-plugins-bad/sys/nvcodec/gstnvh264encoder.cpp
index 87142e246a..2ac53695a7 100644
--- a/subprojects/gst-plugins-bad/sys/nvcodec/gstnvh264encoder.cpp
+++ b/subprojects/gst-plugins-bad/sys/nvcodec/gstnvh264encoder.cpp
@@ -17,14 +17,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-/**
- * element-nvcudah264enc:
- *
- * NVIDIA CUDA mode H.264 encoder
- *
- * Since: 1.22
- */
-
 /**
  * element-nvd3d11h264enc:
  *
@@ -2298,16 +2290,16 @@ gst_nv_h264_encoder_register_cuda (GstPlugin * plugin, GstCudaContext * context,
     (GInstanceInitFunc) gst_nv_h264_encoder_init,
   };
 
-  type_name = g_strdup ("GstNvCudaH264Enc");
-  feature_name = g_strdup ("nvcudah264enc");
+  type_name = g_strdup ("GstNvH264Enc");
+  feature_name = g_strdup ("nvh264enc");
 
   gint index = 0;
   while (g_type_from_name (type_name)) {
     index++;
     g_free (type_name);
     g_free (feature_name);
-    type_name = g_strdup_printf ("GstNvCudaH264Device%dEnc", index);
-    feature_name = g_strdup_printf ("nvcudah264device%denc", index);
+    type_name = g_strdup_printf ("GstNvH264Device%dEnc", index);
+    feature_name = g_strdup_printf ("nvh264device%denc", index);
   }
 
   type = g_type_register_static (GST_TYPE_NV_ENCODER, type_name,
diff --git a/subprojects/gst-plugins-bad/sys/nvcodec/gstnvh265encoder.cpp b/subprojects/gst-plugins-bad/sys/nvcodec/gstnvh265encoder.cpp
index e76e9ed444..e082375968 100644
--- a/subprojects/gst-plugins-bad/sys/nvcodec/gstnvh265encoder.cpp
+++ b/subprojects/gst-plugins-bad/sys/nvcodec/gstnvh265encoder.cpp
@@ -17,14 +17,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-/**
- * element-nvcudah265enc:
- *
- * NVIDIA CUDA mode H.265 encoder
- *
- * Since: 1.22
- */
-
 /**
  * element-nvd3d11h265enc:
  *
@@ -2356,16 +2348,16 @@ gst_nv_h265_encoder_register_cuda (GstPlugin * plugin, GstCudaContext * context,
     (GInstanceInitFunc) gst_nv_h265_encoder_init,
   };
 
-  type_name = g_strdup ("GstNvCudaH265Enc");
-  feature_name = g_strdup ("nvcudah265enc");
+  type_name = g_strdup ("GstNvH265Enc");
+  feature_name = g_strdup ("nvh265enc");
 
   gint index = 0;
   while (g_type_from_name (type_name)) {
     index++;
     g_free (type_name);
     g_free (feature_name);
-    type_name = g_strdup_printf ("GstNvCudaH265Device%dEnc", index);
-    feature_name = g_strdup_printf ("nvcudah265device%denc", index);
+    type_name = g_strdup_printf ("GstNvH265Device%dEnc", index);
+    feature_name = g_strdup_printf ("nvh265device%denc", index);
   }
 
   type = g_type_register_static (GST_TYPE_NV_ENCODER, type_name,
diff --git a/subprojects/gst-plugins-bad/sys/nvcodec/plugin.c b/subprojects/gst-plugins-bad/sys/nvcodec/plugin.c
index 2c5ed5a59c..f9818062a0 100644
--- a/subprojects/gst-plugins-bad/sys/nvcodec/plugin.c
+++ b/subprojects/gst-plugins-bad/sys/nvcodec/plugin.c
@@ -295,13 +295,13 @@ plugin_init (GstPlugin * plugin)
         }
       }
 #endif
-      cdata =
-          gst_nv_h264_encoder_register_cuda (plugin, context, GST_RANK_NONE);
+      cdata = gst_nv_h264_encoder_register_cuda (plugin,
+          context, GST_RANK_PRIMARY + 1);
       if (cdata)
         h264_enc_cdata = g_list_append (h264_enc_cdata, cdata);
 
-      cdata =
-          gst_nv_h265_encoder_register_cuda (plugin, context, GST_RANK_NONE);
+      cdata = gst_nv_h265_encoder_register_cuda (plugin,
+          context, GST_RANK_PRIMARY + 1);
       if (cdata)
         h265_enc_cdata = g_list_append (h265_enc_cdata, cdata);
     }