diff --git a/ext/vorbis/vorbisfile.c b/ext/vorbis/vorbisfile.c
index e7a4badd09..a07c78e65b 100644
--- a/ext/vorbis/vorbisfile.c
+++ b/ext/vorbis/vorbisfile.c
@@ -370,7 +370,7 @@ gst_vorbisfile_loop (GstElement *element)
           }
 	}
 	break;
-      case GST_FORMAT_UNIT:
+      case GST_FORMAT_UNITS:
 	if (vorbisfile->seek_accurate) {
           if (ov_pcm_seek (&vorbisfile->vf, (gdouble) vorbisfile->seek_value / GST_SECOND) == 0) {
             vorbisfile->need_discont = TRUE;
@@ -398,7 +398,7 @@ gst_vorbisfile_loop (GstElement *element)
     samples = (gint64) (ov_pcm_tell (&vorbisfile->vf));
 
     discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, time, 
-		    				  GST_FORMAT_UNIT, samples, NULL); 
+		    				  GST_FORMAT_UNITS, samples, NULL); 
 
     vorbisfile->need_discont = FALSE;
     gst_pad_push (vorbisfile->srcpad, GST_BUFFER (discont));
@@ -468,7 +468,7 @@ gst_vorbisfile_src_query (GstPad *pad, GstPadQueryType type,
     case GST_PAD_QUERY_TOTAL:
     {
       switch (*format) {
-        case GST_FORMAT_UNIT:
+        case GST_FORMAT_UNITS:
 	  *value = ov_pcm_total (&vorbisfile->vf, -1);
 	  break;
         case GST_FORMAT_BYTES:
@@ -494,7 +494,7 @@ gst_vorbisfile_src_query (GstPad *pad, GstPadQueryType type,
         case GST_FORMAT_TIME:
 	  *value = (gint64) (ov_time_tell (&vorbisfile->vf) * GST_SECOND);
 	  break;
-        case GST_FORMAT_UNIT:
+        case GST_FORMAT_UNITS:
 	  *value = ov_pcm_tell (&vorbisfile->vf);
 	  break;
         default:
@@ -530,10 +530,10 @@ gst_vorbisfile_src_event (GstPad *pad, GstEvent *event)
 	  vorbisfile->seek_format = GST_FORMAT_TIME;
 	  vorbisfile->seek_accurate = GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_ACCURATE;
 	  break;
-	case GST_FORMAT_UNIT:
+	case GST_FORMAT_UNITS:
 	  vorbisfile->seek_pending = TRUE;
 	  vorbisfile->seek_value = GST_EVENT_SEEK_OFFSET (event);
-	  vorbisfile->seek_format = GST_FORMAT_UNIT;
+	  vorbisfile->seek_format = GST_FORMAT_UNITS;
 	  vorbisfile->seek_accurate = GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_ACCURATE;
 	  break;
 	default:
diff --git a/testsuite/seeking/seek1.c b/testsuite/seeking/seek1.c
index f7841d01fa..c6394512a2 100644
--- a/testsuite/seeking/seek1.c
+++ b/testsuite/seeking/seek1.c
@@ -313,7 +313,7 @@ static seek_format seek_formats[] =
 {
   { "tim",  GST_FORMAT_TIME    },
   { "byt",  GST_FORMAT_BYTES   },
-  { "unt",  GST_FORMAT_UNIT    },
+  { "unt",  GST_FORMAT_UNITS   },
   { "buf",  GST_FORMAT_BUFFERS },
   { "def",  GST_FORMAT_DEFAULT },
   { NULL, 0 },