diff --git a/gst/rtpmanager/rtpsession.c b/gst/rtpmanager/rtpsession.c
index 1ac18a7fe5..786a8557c0 100644
--- a/gst/rtpmanager/rtpsession.c
+++ b/gst/rtpmanager/rtpsession.c
@@ -1699,7 +1699,7 @@ update_arrival_stats (RTPSession * sess, RTPArrivalStats * arrival,
     gboolean rtp, GstBuffer * buffer, GstClockTime current_time,
     GstClockTime running_time, guint64 ntpnstime)
 {
-  GstMetaNetAddress *meta;
+  GstNetAddressMeta *meta;
   GstRTPBuffer rtpb;
 
   /* get time of arrival */
@@ -1719,7 +1719,7 @@ update_arrival_stats (RTPSession * sess, RTPArrivalStats * arrival,
   }
 
   /* for netbuffer we can store the IP address to check for collisions */
-  meta = gst_buffer_get_meta_net_address (buffer);
+  meta = gst_buffer_get_net_address_meta (buffer);
   if (meta) {
     arrival->have_address = TRUE;
     memcpy (&arrival->address, &meta->naddr, sizeof (GstNetAddress));
diff --git a/gst/udp/gstdynudpsink.c b/gst/udp/gstdynudpsink.c
index a78f9d7731..b34dc60bfc 100644
--- a/gst/udp/gstdynudpsink.c
+++ b/gst/udp/gstdynudpsink.c
@@ -178,14 +178,14 @@ gst_dynudpsink_render (GstBaseSink * bsink, GstBuffer * buffer)
   gint ret;
   gsize size;
   guint8 *data;
-  GstMetaNetAddress *meta;
+  GstNetAddressMeta *meta;
   struct sockaddr_in theiraddr;
   guint16 destport;
   guint32 destaddr;
 
   memset (&theiraddr, 0, sizeof (theiraddr));
 
-  meta = gst_buffer_get_meta_net_address (buffer);
+  meta = gst_buffer_get_net_address_meta (buffer);
 
   if (meta == NULL) {
     GST_DEBUG ("Received buffer is not a GstNetBuffer, skipping");
diff --git a/gst/udp/gstudp.c b/gst/udp/gstudp.c
index 3b77865aa4..2ea852a359 100644
--- a/gst/udp/gstudp.c
+++ b/gst/udp/gstudp.c
@@ -39,7 +39,7 @@ plugin_init (GstPlugin * plugin)
   /* register info of the netaddress metadata so that we can use it from
    * multiple threads right away. Note that the plugin loading is always
    * serialized */
-  gst_meta_net_address_get_info ();
+  gst_net_address_meta_get_info ();
 
   if (!gst_element_register (plugin, "udpsink", GST_RANK_NONE,
           GST_TYPE_UDPSINK))
diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
index 51a04467fb..059cdadc75 100644
--- a/gst/udp/gstudpsrc.c
+++ b/gst/udp/gstudpsrc.c
@@ -394,7 +394,7 @@ static GstFlowReturn
 gst_udpsrc_create (GstPushSrc * psrc, GstBuffer ** buf)
 {
   GstUDPSrc *udpsrc;
-  GstMetaNetAddress *meta;
+  GstNetAddressMeta *meta;
   GstBuffer *outbuf;
   union gst_sockaddr
   {
@@ -529,7 +529,7 @@ no_select:
       gst_memory_new_wrapped (0, pktdata, g_free, pktsize, offset, ret));
 
   /* use buffer metadata so receivers can also track the address */
-  meta = gst_buffer_add_meta_net_address (outbuf);
+  meta = gst_buffer_add_net_address_meta (outbuf);
 
   switch (sa.sa.sa_family) {
     case AF_INET: