diff --git a/ginvoke.c b/ginvoke.c
index 986ca7850..6324536aa 100644
--- a/ginvoke.c
+++ b/ginvoke.c
@@ -100,8 +100,8 @@ get_ffi_type (GITypeInfo *info)
 	break;
       case GI_TYPE_TAG_UTF8:
       case GI_TYPE_TAG_FILENAME:
+      case GI_TYPE_TAG_SYMBOL:
       case GI_TYPE_TAG_ARRAY:
-      case GI_TYPE_TAG_INTERFACE:
       case GI_TYPE_TAG_GLIST:
       case GI_TYPE_TAG_GSLIST:
       case GI_TYPE_TAG_GHASH:
diff --git a/girepository.h b/girepository.h
index 7ad1067a1..179d85fcd 100644
--- a/girepository.h
+++ b/girepository.h
@@ -277,8 +277,8 @@ typedef enum {
   GI_TYPE_TAG_DOUBLE    = 17,
   GI_TYPE_TAG_UTF8      = 18,
   GI_TYPE_TAG_FILENAME  = 19,
-  GI_TYPE_TAG_ARRAY     = 20,
-  GI_TYPE_TAG_INTERFACE = 21,
+  GI_TYPE_TAG_SYMBOL    = 20,
+  GI_TYPE_TAG_ARRAY     = 21,
   GI_TYPE_TAG_GLIST     = 22,
   GI_TYPE_TAG_GSLIST    = 23,
   GI_TYPE_TAG_GHASH     = 24,
diff --git a/gmetadata.c b/gmetadata.c
index b68039043..d49347066 100644
--- a/gmetadata.c
+++ b/gmetadata.c
@@ -30,6 +30,11 @@
 #define ALIGN_VALUE(this, boundary) \
   (( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1)))
 
+static gboolean
+validate_blob (GMetadata     *metadata,
+	       guint32        offset,
+	       GError       **error);
+
 
 DirEntry *
 g_metadata_get_dir_entry (GMetadata *metadata,
@@ -419,9 +424,9 @@ validate_type_blob (GMetadata     *metadata,
 				     signature_offset, return_type, error))
 	return FALSE;
       break;
-    case TYPE_TAG_INTERFACE:
-      if (!validate_iface_type_blob (metadata, simple->offset, 
-				     signature_offset, return_type, error))
+    case TYPE_TAG_SYMBOL:
+      if (!validate_blob (metadata, simple->offset,
+			  error))
 	return FALSE;
       break;
     case TYPE_TAG_LIST:
diff --git a/gmetadata.h b/gmetadata.h
index a22ee235e..f300d8e92 100644
--- a/gmetadata.h
+++ b/gmetadata.h
@@ -95,10 +95,6 @@ typedef struct
   guint32 offset;
 } DirEntry;
 
-
-#define TYPE_POINTER_MASK 1 << 7
-#define TYPE_TAG_MASK         63
-
 typedef enum 
 {
   TYPE_TAG_VOID      =  0,
@@ -121,8 +117,8 @@ typedef enum
   TYPE_TAG_DOUBLE    = 17,
   TYPE_TAG_UTF8      = 18,
   TYPE_TAG_FILENAME  = 19,
-  TYPE_TAG_ARRAY     = 20,
-  TYPE_TAG_INTERFACE = 21,
+  TYPE_TAG_SYMBOL    = 20,
+  TYPE_TAG_ARRAY     = 21,
   TYPE_TAG_LIST      = 22,
   TYPE_TAG_SLIST     = 23,
   TYPE_TAG_HASH      = 24,