Index: tests/exceptions/virtual-cast.cfa
===================================================================
--- tests/exceptions/virtual-cast.cfa	(revision 8edbe407c24c9d794ff7c63d67c463043f96ae3b)
+++ tests/exceptions/virtual-cast.cfa	(revision d286e94d541ce120a5b7bf87ada0ae8fd56f923b)
@@ -16,10 +16,10 @@
 // Hand defined alpha virtual type:
 struct __cfatid_struct_alpha {
-	__cfa__parent_vtable const * parent;
+	__cfavir_type_info parent;
 };
 
-__attribute__(( section(".gnu.linkonce.__cfatid_alpha") ))
+__attribute__(( cfa_linkonce ))
 struct __cfatid_struct_alpha __cfatid_alpha = {
-	(__cfa__parent_vtable *)0,
+	(__cfavir_type_info *)0,
 };
 
Index: tests/exceptions/virtual-poly.cfa
===================================================================
--- tests/exceptions/virtual-poly.cfa	(revision 8edbe407c24c9d794ff7c63d67c463043f96ae3b)
+++ tests/exceptions/virtual-poly.cfa	(revision d286e94d541ce120a5b7bf87ada0ae8fd56f923b)
@@ -10,10 +10,10 @@
 
 struct __cfatid_struct_mono_base {
-    __cfa__parent_vtable const * parent;
+    __cfavir_type_info const * parent;
 };
 
-__attribute__(( section(".gnu.linkonce.__cfatid_mono_base") ))
+__attribute__(( cfa_linkonce ))
 struct __cfatid_struct_mono_base __cfatid_mono_base = {
-    (__cfa__parent_vtable *)0,
+    (__cfavir_type_info *)0,
 };
 
@@ -58,5 +58,5 @@
 forall(U)
 struct __cfatid_struct_poly_base {
-    __cfa__parent_vtable const * parent;
+    __cfavir_type_info const * parent;
 };
 
@@ -87,5 +87,5 @@
 
 __cfatid_struct_poly_base(int) __cfatid_poly_base @= {
-	(__cfa__parent_vtable *)0,
+	(__cfavir_type_info *)0,
 };
 __cfatid_struct_poly_child(int) __cfatid_poly_child = {