diff --git a/tools/regression/geom/Test/T000/ref.conf b/tools/regression/geom/Test/T000/ref.conf
index a375ddfdd23e..069c69832543 100644
--- a/tools/regression/geom/Test/T000/ref.conf
+++ b/tools/regression/geom/Test/T000/ref.conf
@@ -1,23 +1,23 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <method>
+  <class>
     <ref>0x805ba60</ref>
-    <name>DEV-method</name>
-  </method>
-  <method>
+    <name>DEV-class</name>
+  </class>
+  <class>
     <ref>0x805b9a0</ref>
-    <name>MBREXT-method</name>
-  </method>
-  <method>
+    <name>MBREXT-class</name>
+  </class>
+  <class>
     <ref>0x805ba40</ref>
-    <name>MBR-method</name>
-  </method>
-  <method>
+    <name>MBR-class</name>
+  </class>
+  <class>
     <ref>0x805ba80</ref>
-    <name>BSD-method</name>
-  </method>
-  <method>
+    <name>BSD-class</name>
+  </class>
+  <class>
     <ref>0x805b980</ref>
-    <name>SIMDISK-method</name>
-  </method>
+    <name>SIMDISK-class</name>
+  </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T001/ref.conf b/tools/regression/geom/Test/T001/ref.conf
index 80a643e871d1..a0f445069c06 100644
--- a/tools/regression/geom/Test/T001/ref.conf
+++ b/tools/regression/geom/Test/T001/ref.conf
@@ -1,11 +1,11 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <method>
+  <class>
     <ref>0x8071cc0</ref>
-    <name>DEV-method</name>
+    <name>DEV-class</name>
     <geom>
       <ref>0x80c1580</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s3d</name>
       <rank>4</rank>
 	<consumer>
@@ -17,7 +17,7 @@
     </geom>
     <geom>
       <ref>0x80c1480</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s3c</name>
       <rank>4</rank>
 	<consumer>
@@ -29,7 +29,7 @@
     </geom>
     <geom>
       <ref>0x80c1380</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s3a</name>
       <rank>4</rank>
 	<consumer>
@@ -41,7 +41,7 @@
     </geom>
     <geom>
       <ref>0x80c1280</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s2c</name>
       <rank>4</rank>
 	<consumer>
@@ -53,7 +53,7 @@
     </geom>
     <geom>
       <ref>0x80c1180</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s1f</name>
       <rank>4</rank>
 	<consumer>
@@ -65,7 +65,7 @@
     </geom>
     <geom>
       <ref>0x80c1080</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s1e</name>
       <rank>4</rank>
 	<consumer>
@@ -77,7 +77,7 @@
     </geom>
     <geom>
       <ref>0x80bef80</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s1c</name>
       <rank>4</rank>
 	<consumer>
@@ -89,7 +89,7 @@
     </geom>
     <geom>
       <ref>0x80bee80</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s1b</name>
       <rank>4</rank>
 	<consumer>
@@ -101,7 +101,7 @@
     </geom>
     <geom>
       <ref>0x80bed80</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s1a</name>
       <rank>4</rank>
 	<consumer>
@@ -113,7 +113,7 @@
     </geom>
     <geom>
       <ref>0x80bea00</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s3</name>
       <rank>3</rank>
 	<consumer>
@@ -125,7 +125,7 @@
     </geom>
     <geom>
       <ref>0x80be780</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s2</name>
       <rank>3</rank>
 	<consumer>
@@ -137,7 +137,7 @@
     </geom>
     <geom>
       <ref>0x80be300</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s1</name>
       <rank>3</rank>
 	<consumer>
@@ -149,7 +149,7 @@
     </geom>
     <geom>
       <ref>0x80ba080</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0</name>
       <rank>2</rank>
 	<consumer>
@@ -159,17 +159,17 @@
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x8071c00</ref>
-    <name>MBREXT-method</name>
-  </method>
-  <method>
+    <name>MBREXT-class</name>
+  </class>
+  <class>
     <ref>0x8071ca0</ref>
-    <name>MBR-method</name>
+    <name>MBR-class</name>
     <geom>
       <ref>0x80ba0c0</ref>
-      <method><ref>0x8071ca0</ref></method>
+      <class><ref>0x8071ca0</ref></class>
       <name>ad0</name>
       <rank>2</rank>
       <config>
@@ -225,13 +225,13 @@
 	  </config>
 	</provider>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x8071ce0</ref>
-    <name>BSD-method</name>
+    <name>BSD-class</name>
     <geom>
       <ref>0x80beb00</ref>
-      <method><ref>0x8071ce0</ref></method>
+      <class><ref>0x8071ce0</ref></class>
       <name>ad0s3</name>
       <rank>3</rank>
       <config>
@@ -286,7 +286,7 @@
     </geom>
     <geom>
       <ref>0x80be880</ref>
-      <method><ref>0x8071ce0</ref></method>
+      <class><ref>0x8071ce0</ref></class>
       <name>ad0s2</name>
       <rank>3</rank>
       <config>
@@ -315,7 +315,7 @@
     </geom>
     <geom>
       <ref>0x80be400</ref>
-      <method><ref>0x8071ce0</ref></method>
+      <class><ref>0x8071ce0</ref></class>
       <name>ad0s1</name>
       <rank>3</rank>
       <config>
@@ -394,13 +394,13 @@
 	  </config>
 	</provider>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x8071be0</ref>
-    <name>SIMDISK-method</name>
+    <name>SIMDISK-class</name>
     <geom>
       <ref>0x80ba040</ref>
-      <method><ref>0x8071be0</ref></method>
+      <class><ref>0x8071be0</ref></class>
       <name>ad0</name>
       <rank>1</rank>
 	<provider>
@@ -410,5 +410,5 @@
 	  <name>ad0</name>
 	</provider>
     </geom>
-  </method>
+  </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T002/ref.conf b/tools/regression/geom/Test/T002/ref.conf
index 19c52005c63e..f9b95c647a60 100644
--- a/tools/regression/geom/Test/T002/ref.conf
+++ b/tools/regression/geom/Test/T002/ref.conf
@@ -1,11 +1,11 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <method>
+  <class>
     <ref>0x8071cc0</ref>
-    <name>DEV-method</name>
+    <name>DEV-class</name>
     <geom>
       <ref>0x80bb380</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s2</name>
       <rank>3</rank>
 	<consumer>
@@ -17,7 +17,7 @@
     </geom>
     <geom>
       <ref>0x80bb280</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s1</name>
       <rank>3</rank>
 	<consumer>
@@ -29,7 +29,7 @@
     </geom>
     <geom>
       <ref>0x80ba080</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0</name>
       <rank>2</rank>
 	<consumer>
@@ -39,17 +39,17 @@
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x8071c00</ref>
-    <name>MBREXT-method</name>
-  </method>
-  <method>
+    <name>MBREXT-class</name>
+  </class>
+  <class>
     <ref>0x8071ca0</ref>
-    <name>MBR-method</name>
+    <name>MBR-class</name>
     <geom>
       <ref>0x80ba0c0</ref>
-      <method><ref>0x8071ca0</ref></method>
+      <class><ref>0x8071ca0</ref></class>
       <name>ad0</name>
       <rank>2</rank>
       <config>
@@ -91,17 +91,17 @@
 	  </config>
 	</provider>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x8071ce0</ref>
-    <name>BSD-method</name>
-  </method>
-  <method>
+    <name>BSD-class</name>
+  </class>
+  <class>
     <ref>0x8071be0</ref>
-    <name>SIMDISK-method</name>
+    <name>SIMDISK-class</name>
     <geom>
       <ref>0x80ba040</ref>
-      <method><ref>0x8071be0</ref></method>
+      <class><ref>0x8071be0</ref></class>
       <name>ad0</name>
       <rank>1</rank>
 	<provider>
@@ -111,5 +111,5 @@
 	  <name>ad0</name>
 	</provider>
     </geom>
-  </method>
+  </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T003/ref.conf b/tools/regression/geom/Test/T003/ref.conf
index fedaa698e495..2fd1f58ea060 100644
--- a/tools/regression/geom/Test/T003/ref.conf
+++ b/tools/regression/geom/Test/T003/ref.conf
@@ -1,11 +1,11 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <method>
+  <class>
     <ref>0x8071cc0</ref>
-    <name>DEV-method</name>
+    <name>DEV-class</name>
     <geom>
       <ref>0x8124700</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s27</name>
       <rank>4</rank>
 	<consumer>
@@ -17,7 +17,7 @@
     </geom>
     <geom>
       <ref>0x8124600</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s26</name>
       <rank>4</rank>
 	<consumer>
@@ -29,7 +29,7 @@
     </geom>
     <geom>
       <ref>0x8124500</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s25</name>
       <rank>4</rank>
 	<consumer>
@@ -41,7 +41,7 @@
     </geom>
     <geom>
       <ref>0x8124400</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s24</name>
       <rank>4</rank>
 	<consumer>
@@ -53,7 +53,7 @@
     </geom>
     <geom>
       <ref>0x8124300</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s23</name>
       <rank>4</rank>
 	<consumer>
@@ -65,7 +65,7 @@
     </geom>
     <geom>
       <ref>0x8124200</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s22</name>
       <rank>4</rank>
 	<consumer>
@@ -77,7 +77,7 @@
     </geom>
     <geom>
       <ref>0x8124100</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s21</name>
       <rank>4</rank>
 	<consumer>
@@ -89,7 +89,7 @@
     </geom>
     <geom>
       <ref>0x8124000</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s20</name>
       <rank>4</rank>
 	<consumer>
@@ -101,7 +101,7 @@
     </geom>
     <geom>
       <ref>0x8101f00</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s19</name>
       <rank>4</rank>
 	<consumer>
@@ -113,7 +113,7 @@
     </geom>
     <geom>
       <ref>0x8101e00</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s18</name>
       <rank>4</rank>
 	<consumer>
@@ -125,7 +125,7 @@
     </geom>
     <geom>
       <ref>0x8101d00</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s17</name>
       <rank>4</rank>
 	<consumer>
@@ -137,7 +137,7 @@
     </geom>
     <geom>
       <ref>0x8101c00</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s16</name>
       <rank>4</rank>
 	<consumer>
@@ -149,7 +149,7 @@
     </geom>
     <geom>
       <ref>0x8101b00</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s15</name>
       <rank>4</rank>
 	<consumer>
@@ -161,7 +161,7 @@
     </geom>
     <geom>
       <ref>0x8101a00</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s14</name>
       <rank>4</rank>
 	<consumer>
@@ -173,7 +173,7 @@
     </geom>
     <geom>
       <ref>0x8101900</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s13</name>
       <rank>4</rank>
 	<consumer>
@@ -185,7 +185,7 @@
     </geom>
     <geom>
       <ref>0x8101800</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s12</name>
       <rank>4</rank>
 	<consumer>
@@ -197,7 +197,7 @@
     </geom>
     <geom>
       <ref>0x8101700</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s11</name>
       <rank>4</rank>
 	<consumer>
@@ -209,7 +209,7 @@
     </geom>
     <geom>
       <ref>0x8101600</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s10</name>
       <rank>4</rank>
 	<consumer>
@@ -221,7 +221,7 @@
     </geom>
     <geom>
       <ref>0x8101500</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s9</name>
       <rank>4</rank>
 	<consumer>
@@ -233,7 +233,7 @@
     </geom>
     <geom>
       <ref>0x8101400</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s8</name>
       <rank>4</rank>
 	<consumer>
@@ -245,7 +245,7 @@
     </geom>
     <geom>
       <ref>0x8101300</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s7</name>
       <rank>4</rank>
 	<consumer>
@@ -257,7 +257,7 @@
     </geom>
     <geom>
       <ref>0x8101200</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s6</name>
       <rank>4</rank>
 	<consumer>
@@ -269,7 +269,7 @@
     </geom>
     <geom>
       <ref>0x8101100</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s5</name>
       <rank>4</rank>
 	<consumer>
@@ -281,7 +281,7 @@
     </geom>
     <geom>
       <ref>0x80cc380</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s2</name>
       <rank>3</rank>
 	<consumer>
@@ -293,7 +293,7 @@
     </geom>
     <geom>
       <ref>0x80cc280</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0s1</name>
       <rank>3</rank>
 	<consumer>
@@ -305,7 +305,7 @@
     </geom>
     <geom>
       <ref>0x80ba080</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0</name>
       <rank>2</rank>
 	<consumer>
@@ -315,13 +315,13 @@
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x8071c00</ref>
-    <name>MBREXT-method</name>
+    <name>MBREXT-class</name>
     <geom>
       <ref>0x80cc480</ref>
-      <method><ref>0x8071c00</ref></method>
+      <class><ref>0x8071c00</ref></class>
       <name>ad0s2</name>
       <rank>3</rank>
       <config>
@@ -657,13 +657,13 @@
 	  </config>
 	</provider>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x8071ca0</ref>
-    <name>MBR-method</name>
+    <name>MBR-class</name>
     <geom>
       <ref>0x80ba0c0</ref>
-      <method><ref>0x8071ca0</ref></method>
+      <class><ref>0x8071ca0</ref></class>
       <name>ad0</name>
       <rank>2</rank>
       <config>
@@ -705,17 +705,17 @@
 	  </config>
 	</provider>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x8071ce0</ref>
-    <name>BSD-method</name>
-  </method>
-  <method>
+    <name>BSD-class</name>
+  </class>
+  <class>
     <ref>0x8071be0</ref>
-    <name>SIMDISK-method</name>
+    <name>SIMDISK-class</name>
     <geom>
       <ref>0x80ba040</ref>
-      <method><ref>0x8071be0</ref></method>
+      <class><ref>0x8071be0</ref></class>
       <name>ad0</name>
       <rank>1</rank>
 	<provider>
@@ -725,5 +725,5 @@
 	  <name>ad0</name>
 	</provider>
     </geom>
-  </method>
+  </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T004/ref.conf b/tools/regression/geom/Test/T004/ref.conf
index 03e296ef8b5d..20b111a0ab09 100644
--- a/tools/regression/geom/Test/T004/ref.conf
+++ b/tools/regression/geom/Test/T004/ref.conf
@@ -1,11 +1,11 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <method>
+  <class>
     <ref>0x8071ce0</ref>
-    <name>DEV-method</name>
+    <name>DEV-class</name>
     <geom>
       <ref>0x80bef00</ref>
-      <method><ref>0x8071ce0</ref></method>
+      <class><ref>0x8071ce0</ref></class>
       <name>ad0s1h</name>
       <rank>4</rank>
 	<consumer>
@@ -17,7 +17,7 @@
     </geom>
     <geom>
       <ref>0x80bee00</ref>
-      <method><ref>0x8071ce0</ref></method>
+      <class><ref>0x8071ce0</ref></class>
       <name>ad0s1g</name>
       <rank>4</rank>
 	<consumer>
@@ -29,7 +29,7 @@
     </geom>
     <geom>
       <ref>0x80bed00</ref>
-      <method><ref>0x8071ce0</ref></method>
+      <class><ref>0x8071ce0</ref></class>
       <name>ad0s1f</name>
       <rank>4</rank>
 	<consumer>
@@ -41,7 +41,7 @@
     </geom>
     <geom>
       <ref>0x80bec00</ref>
-      <method><ref>0x8071ce0</ref></method>
+      <class><ref>0x8071ce0</ref></class>
       <name>ad0s1e</name>
       <rank>4</rank>
 	<consumer>
@@ -53,7 +53,7 @@
     </geom>
     <geom>
       <ref>0x80beb00</ref>
-      <method><ref>0x8071ce0</ref></method>
+      <class><ref>0x8071ce0</ref></class>
       <name>ad0s1d</name>
       <rank>4</rank>
 	<consumer>
@@ -65,7 +65,7 @@
     </geom>
     <geom>
       <ref>0x80bea00</ref>
-      <method><ref>0x8071ce0</ref></method>
+      <class><ref>0x8071ce0</ref></class>
       <name>ad0s1c</name>
       <rank>4</rank>
 	<consumer>
@@ -77,7 +77,7 @@
     </geom>
     <geom>
       <ref>0x80be900</ref>
-      <method><ref>0x8071ce0</ref></method>
+      <class><ref>0x8071ce0</ref></class>
       <name>ad0s1b</name>
       <rank>4</rank>
 	<consumer>
@@ -89,7 +89,7 @@
     </geom>
     <geom>
       <ref>0x80be800</ref>
-      <method><ref>0x8071ce0</ref></method>
+      <class><ref>0x8071ce0</ref></class>
       <name>ad0s1a</name>
       <rank>4</rank>
 	<consumer>
@@ -101,7 +101,7 @@
     </geom>
     <geom>
       <ref>0x80be200</ref>
-      <method><ref>0x8071ce0</ref></method>
+      <class><ref>0x8071ce0</ref></class>
       <name>ad0s1</name>
       <rank>3</rank>
 	<consumer>
@@ -113,7 +113,7 @@
     </geom>
     <geom>
       <ref>0x80ba080</ref>
-      <method><ref>0x8071ce0</ref></method>
+      <class><ref>0x8071ce0</ref></class>
       <name>ad0</name>
       <rank>2</rank>
 	<consumer>
@@ -123,17 +123,17 @@
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x8071c20</ref>
-    <name>MBREXT-method</name>
-  </method>
-  <method>
+    <name>MBREXT-class</name>
+  </class>
+  <class>
     <ref>0x8071cc0</ref>
-    <name>MBR-method</name>
+    <name>MBR-class</name>
     <geom>
       <ref>0x80ba0c0</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0</name>
       <rank>2</rank>
       <config>
@@ -161,13 +161,13 @@
 	  </config>
 	</provider>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x8071d00</ref>
-    <name>BSD-method</name>
+    <name>BSD-class</name>
     <geom>
       <ref>0x80be300</ref>
-      <method><ref>0x8071d00</ref></method>
+      <class><ref>0x8071d00</ref></class>
       <name>ad0s1</name>
       <rank>3</rank>
       <config>
@@ -285,13 +285,13 @@
 	  </config>
 	</provider>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x8071c00</ref>
-    <name>SIMDISK-method</name>
+    <name>SIMDISK-class</name>
     <geom>
       <ref>0x80ba040</ref>
-      <method><ref>0x8071c00</ref></method>
+      <class><ref>0x8071c00</ref></class>
       <name>ad0</name>
       <rank>1</rank>
 	<provider>
@@ -301,5 +301,5 @@
 	  <name>ad0</name>
 	</provider>
     </geom>
-  </method>
+  </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T005/ref.conf b/tools/regression/geom/Test/T005/ref.conf
index 9c56e70d588c..aa3055c84bec 100644
--- a/tools/regression/geom/Test/T005/ref.conf
+++ b/tools/regression/geom/Test/T005/ref.conf
@@ -1,11 +1,11 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <method>
+  <class>
     <ref>0x8071cc0</ref>
-    <name>DEV-method</name>
+    <name>DEV-class</name>
     <geom>
       <ref>0x80bb500</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0c</name>
       <rank>3</rank>
 	<consumer>
@@ -17,7 +17,7 @@
     </geom>
     <geom>
       <ref>0x80bb400</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0b</name>
       <rank>3</rank>
 	<consumer>
@@ -29,7 +29,7 @@
     </geom>
     <geom>
       <ref>0x80bb300</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0a</name>
       <rank>3</rank>
 	<consumer>
@@ -41,7 +41,7 @@
     </geom>
     <geom>
       <ref>0x80ba080</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0</name>
       <rank>2</rank>
 	<consumer>
@@ -51,21 +51,21 @@
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x8071c00</ref>
-    <name>MBREXT-method</name>
-  </method>
-  <method>
+    <name>MBREXT-class</name>
+  </class>
+  <class>
     <ref>0x8071ca0</ref>
-    <name>MBR-method</name>
-  </method>
-  <method>
+    <name>MBR-class</name>
+  </class>
+  <class>
     <ref>0x8071ce0</ref>
-    <name>BSD-method</name>
+    <name>BSD-class</name>
     <geom>
       <ref>0x80ba0c0</ref>
-      <method><ref>0x8071ce0</ref></method>
+      <class><ref>0x8071ce0</ref></class>
       <name>ad0</name>
       <rank>2</rank>
       <config>
@@ -118,13 +118,13 @@
 	  </config>
 	</provider>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x8071be0</ref>
-    <name>SIMDISK-method</name>
+    <name>SIMDISK-class</name>
     <geom>
       <ref>0x80ba040</ref>
-      <method><ref>0x8071be0</ref></method>
+      <class><ref>0x8071be0</ref></class>
       <name>ad0</name>
       <rank>1</rank>
 	<provider>
@@ -134,5 +134,5 @@
 	  <name>ad0</name>
 	</provider>
     </geom>
-  </method>
+  </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T006/ref.conf b/tools/regression/geom/Test/T006/ref.conf
index 63fc0495271b..b49ddd3add41 100644
--- a/tools/regression/geom/Test/T006/ref.conf
+++ b/tools/regression/geom/Test/T006/ref.conf
@@ -1,11 +1,11 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <method>
+  <class>
     <ref>0x8071cc0</ref>
-    <name>DEV-method</name>
+    <name>DEV-class</name>
     <geom>
       <ref>0x80ba080</ref>
-      <method><ref>0x8071cc0</ref></method>
+      <class><ref>0x8071cc0</ref></class>
       <name>ad0</name>
       <rank>2</rank>
 	<consumer>
@@ -15,25 +15,25 @@
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x8071c00</ref>
-    <name>MBREXT-method</name>
-  </method>
-  <method>
+    <name>MBREXT-class</name>
+  </class>
+  <class>
     <ref>0x8071ca0</ref>
-    <name>MBR-method</name>
-  </method>
-  <method>
+    <name>MBR-class</name>
+  </class>
+  <class>
     <ref>0x8071ce0</ref>
-    <name>BSD-method</name>
-  </method>
-  <method>
+    <name>BSD-class</name>
+  </class>
+  <class>
     <ref>0x8071be0</ref>
-    <name>SIMDISK-method</name>
+    <name>SIMDISK-class</name>
     <geom>
       <ref>0x80ba040</ref>
-      <method><ref>0x8071be0</ref></method>
+      <class><ref>0x8071be0</ref></class>
       <name>ad0</name>
       <rank>1</rank>
 	<provider>
@@ -43,5 +43,5 @@
 	  <name>ad0</name>
 	</provider>
     </geom>
-  </method>
+  </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T007/ref.conf b/tools/regression/geom/Test/T007/ref.conf
index 69a88898e43d..a9abd7d7a177 100644
--- a/tools/regression/geom/Test/T007/ref.conf
+++ b/tools/regression/geom/Test/T007/ref.conf
@@ -1,23 +1,23 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <method>
+  <class>
     <ref>0x8071d00</ref>
-    <name>DEV-method</name>
-  </method>
-  <method>
+    <name>DEV-class</name>
+  </class>
+  <class>
     <ref>0x8071c40</ref>
-    <name>MBREXT-method</name>
-  </method>
-  <method>
+    <name>MBREXT-class</name>
+  </class>
+  <class>
     <ref>0x8071ce0</ref>
-    <name>MBR-method</name>
-  </method>
-  <method>
+    <name>MBR-class</name>
+  </class>
+  <class>
     <ref>0x8071d20</ref>
-    <name>BSD-method</name>
-  </method>
-  <method>
+    <name>BSD-class</name>
+  </class>
+  <class>
     <ref>0x8071c20</ref>
-    <name>SIMDISK-method</name>
-  </method>
+    <name>SIMDISK-class</name>
+  </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T008/ref.conf b/tools/regression/geom/Test/T008/ref.conf
index 69a88898e43d..a9abd7d7a177 100644
--- a/tools/regression/geom/Test/T008/ref.conf
+++ b/tools/regression/geom/Test/T008/ref.conf
@@ -1,23 +1,23 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <method>
+  <class>
     <ref>0x8071d00</ref>
-    <name>DEV-method</name>
-  </method>
-  <method>
+    <name>DEV-class</name>
+  </class>
+  <class>
     <ref>0x8071c40</ref>
-    <name>MBREXT-method</name>
-  </method>
-  <method>
+    <name>MBREXT-class</name>
+  </class>
+  <class>
     <ref>0x8071ce0</ref>
-    <name>MBR-method</name>
-  </method>
-  <method>
+    <name>MBR-class</name>
+  </class>
+  <class>
     <ref>0x8071d20</ref>
-    <name>BSD-method</name>
-  </method>
-  <method>
+    <name>BSD-class</name>
+  </class>
+  <class>
     <ref>0x8071c20</ref>
-    <name>SIMDISK-method</name>
-  </method>
+    <name>SIMDISK-class</name>
+  </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T009/ref.conf b/tools/regression/geom/Test/T009/ref.conf
index 9215bf44ed97..9fbe0023891a 100644
--- a/tools/regression/geom/Test/T009/ref.conf
+++ b/tools/regression/geom/Test/T009/ref.conf
@@ -1,23 +1,23 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <method>
+  <class>
     <ref>0x8071da0</ref>
-    <name>DEV-method</name>
-  </method>
-  <method>
+    <name>DEV-class</name>
+  </class>
+  <class>
     <ref>0x8071ce0</ref>
-    <name>MBREXT-method</name>
-  </method>
-  <method>
+    <name>MBREXT-class</name>
+  </class>
+  <class>
     <ref>0x8071d80</ref>
-    <name>MBR-method</name>
-  </method>
-  <method>
+    <name>MBR-class</name>
+  </class>
+  <class>
     <ref>0x8071dc0</ref>
-    <name>BSD-method</name>
-  </method>
-  <method>
+    <name>BSD-class</name>
+  </class>
+  <class>
     <ref>0x8071cc0</ref>
-    <name>SIMDISK-method</name>
-  </method>
+    <name>SIMDISK-class</name>
+  </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T010/ref.conf b/tools/regression/geom/Test/T010/ref.conf
index 4c3726ee8098..ab26e7226e87 100644
--- a/tools/regression/geom/Test/T010/ref.conf
+++ b/tools/regression/geom/Test/T010/ref.conf
@@ -1,11 +1,11 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <method>
+  <class>
     <ref>0x80725a0</ref>
-    <name>DEV-method</name>
+    <name>DEV-class</name>
     <geom>
       <ref>0x80ba200</ref>
-      <method><ref>0x80725a0</ref></method>
+      <class><ref>0x80725a0</ref></class>
       <name>ad0c</name>
       <rank>3</rank>
 	<consumer>
@@ -17,7 +17,7 @@
     </geom>
     <geom>
       <ref>0x80bb080</ref>
-      <method><ref>0x80725a0</ref></method>
+      <class><ref>0x80725a0</ref></class>
       <name>ad0</name>
       <rank>2</rank>
 	<consumer>
@@ -27,21 +27,21 @@
 	  <mode>r1w0e0</mode>
 	</consumer>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x80724a0</ref>
-    <name>MBREXT-method</name>
-  </method>
-  <method>
+    <name>MBREXT-class</name>
+  </class>
+  <class>
     <ref>0x8072560</ref>
-    <name>MBR-method</name>
-  </method>
-  <method>
+    <name>MBR-class</name>
+  </class>
+  <class>
     <ref>0x80725e0</ref>
-    <name>BSD-method</name>
+    <name>BSD-class</name>
     <geom>
       <ref>0x80bb0c0</ref>
-      <method><ref>0x80725e0</ref></method>
+      <class><ref>0x80725e0</ref></class>
       <name>ad0</name>
       <rank>2</rank>
       <config>
@@ -68,13 +68,13 @@
 	  </config>
 	</provider>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x8072460</ref>
-    <name>SIMDISK-method</name>
+    <name>SIMDISK-class</name>
     <geom>
       <ref>0x80bb040</ref>
-      <method><ref>0x8072460</ref></method>
+      <class><ref>0x8072460</ref></class>
       <name>ad0</name>
       <rank>1</rank>
 	<provider>
@@ -84,5 +84,5 @@
 	  <name>ad0</name>
 	</provider>
     </geom>
-  </method>
+  </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T010/testprg.c b/tools/regression/geom/Test/T010/testprg.c
index 0154f5e699e0..63237b2f98e5 100644
--- a/tools/regression/geom/Test/T010/testprg.c
+++ b/tools/regression/geom/Test/T010/testprg.c
@@ -65,7 +65,7 @@ thread_sim(void *ptr __unused)
 	rattle();
 	cp = g_dev_opendev("ad0", 1, 0, 0);
 	g_topology_lock();
-	gp = g_create_geomf("BSD-method", cp->provider, NULL);
+	gp = g_create_geomf("BSD-class", cp->provider, NULL);
 	g_topology_unlock();
 	printf("gp = %p\n", gp);
 	rattle();
diff --git a/tools/regression/geom/Test/T011/ref.conf b/tools/regression/geom/Test/T011/ref.conf
index 0a0716ce5395..911704065552 100644
--- a/tools/regression/geom/Test/T011/ref.conf
+++ b/tools/regression/geom/Test/T011/ref.conf
@@ -1,11 +1,11 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <method>
+  <class>
     <ref>0x8071c40</ref>
-    <name>DEV-method</name>
+    <name>DEV-class</name>
     <geom>
       <ref>0x80b70c0</ref>
-      <method><ref>0x8071c40</ref></method>
+      <class><ref>0x8071c40</ref></class>
       <name>ad0</name>
       <rank>2</rank>
 	<consumer>
@@ -15,25 +15,25 @@
 	  <mode>r1w0e0</mode>
 	</consumer>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x8071b40</ref>
-    <name>MBREXT-method</name>
-  </method>
-  <method>
+    <name>MBREXT-class</name>
+  </class>
+  <class>
     <ref>0x8071c00</ref>
-    <name>MBR-method</name>
-  </method>
-  <method>
+    <name>MBR-class</name>
+  </class>
+  <class>
     <ref>0x8071c80</ref>
-    <name>BSD-method</name>
-  </method>
-  <method>
+    <name>BSD-class</name>
+  </class>
+  <class>
     <ref>0x8071b00</ref>
-    <name>SIMDISK-method</name>
+    <name>SIMDISK-class</name>
     <geom>
       <ref>0x80b7040</ref>
-      <method><ref>0x8071b00</ref></method>
+      <class><ref>0x8071b00</ref></class>
       <name>ad0</name>
       <rank>1</rank>
 	<provider>
@@ -43,5 +43,5 @@
 	  <name>ad0</name>
 	</provider>
     </geom>
-  </method>
+  </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T011/testprg.c b/tools/regression/geom/Test/T011/testprg.c
index d9dea04ba3d8..455f6ef96ea9 100644
--- a/tools/regression/geom/Test/T011/testprg.c
+++ b/tools/regression/geom/Test/T011/testprg.c
@@ -65,7 +65,7 @@ thread_sim(void *ptr __unused)
 	rattle();
 	cp = g_dev_opendev("ad0", 1, 0, 0);
 	g_topology_lock();
-	gp = g_insert_geom("BSD-method", cp);
+	gp = g_insert_geom("BSD-class", cp);
 	g_topology_unlock();
 	printf("gp = %p\n", gp);
 	rattle();
diff --git a/tools/regression/geom/Test/T012/ref.conf b/tools/regression/geom/Test/T012/ref.conf
index 640cafdfc2a6..5ae3f62300b6 100644
--- a/tools/regression/geom/Test/T012/ref.conf
+++ b/tools/regression/geom/Test/T012/ref.conf
@@ -1,11 +1,11 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <method>
+  <class>
     <ref>0x8072160</ref>
-    <name>SUNLABEL-method</name>
+    <name>SUNLABEL-class</name>
     <geom>
       <ref>0x80b8480</ref>
-      <method><ref>0x8072160</ref></method>
+      <class><ref>0x8072160</ref></class>
       <name>ad0</name>
       <rank>2</rank>
       <config>
@@ -112,7 +112,7 @@
     </geom>
     <geom>
       <ref>0x80b80c0</ref>
-      <method><ref>0x8072160</ref></method>
+      <class><ref>0x8072160</ref></class>
       <name>ad0</name>
       <rank>2</rank>
       <config>
@@ -178,13 +178,13 @@
 	  </config>
 	</provider>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x80722e0</ref>
-    <name>DEV-method</name>
+    <name>DEV-class</name>
     <geom>
       <ref>0x80c5100</ref>
-      <method><ref>0x80722e0</ref></method>
+      <class><ref>0x80722e0</ref></class>
       <name>ad0h</name>
       <rank>3</rank>
 	<consumer>
@@ -196,7 +196,7 @@
     </geom>
     <geom>
       <ref>0x80bbf80</ref>
-      <method><ref>0x80722e0</ref></method>
+      <class><ref>0x80722e0</ref></class>
       <name>ad0g</name>
       <rank>3</rank>
 	<consumer>
@@ -208,7 +208,7 @@
     </geom>
     <geom>
       <ref>0x80bbe00</ref>
-      <method><ref>0x80722e0</ref></method>
+      <class><ref>0x80722e0</ref></class>
       <name>ad0f</name>
       <rank>3</rank>
 	<consumer>
@@ -220,7 +220,7 @@
     </geom>
     <geom>
       <ref>0x80bbc80</ref>
-      <method><ref>0x80722e0</ref></method>
+      <class><ref>0x80722e0</ref></class>
       <name>ad0d</name>
       <rank>3</rank>
 	<consumer>
@@ -232,7 +232,7 @@
     </geom>
     <geom>
       <ref>0x80bbb00</ref>
-      <method><ref>0x80722e0</ref></method>
+      <class><ref>0x80722e0</ref></class>
       <name>ad0c</name>
       <rank>3</rank>
 	<consumer>
@@ -244,7 +244,7 @@
     </geom>
     <geom>
       <ref>0x80bb980</ref>
-      <method><ref>0x80722e0</ref></method>
+      <class><ref>0x80722e0</ref></class>
       <name>ad0b</name>
       <rank>3</rank>
 	<consumer>
@@ -256,7 +256,7 @@
     </geom>
     <geom>
       <ref>0x80bb900</ref>
-      <method><ref>0x80722e0</ref></method>
+      <class><ref>0x80722e0</ref></class>
       <name>ad0a</name>
       <rank>3</rank>
 	<consumer>
@@ -268,7 +268,7 @@
     </geom>
     <geom>
       <ref>0x80b86c0</ref>
-      <method><ref>0x80722e0</ref></method>
+      <class><ref>0x80722e0</ref></class>
       <name>ad0</name>
       <rank>2</rank>
 	<consumer>
@@ -280,7 +280,7 @@
     </geom>
     <geom>
       <ref>0x80bb580</ref>
-      <method><ref>0x80722e0</ref></method>
+      <class><ref>0x80722e0</ref></class>
       <name>ad0h</name>
       <rank>3</rank>
 	<consumer>
@@ -292,7 +292,7 @@
     </geom>
     <geom>
       <ref>0x80bb400</ref>
-      <method><ref>0x80722e0</ref></method>
+      <class><ref>0x80722e0</ref></class>
       <name>ad0c</name>
       <rank>3</rank>
 	<consumer>
@@ -304,7 +304,7 @@
     </geom>
     <geom>
       <ref>0x80bb200</ref>
-      <method><ref>0x80722e0</ref></method>
+      <class><ref>0x80722e0</ref></class>
       <name>ad0b</name>
       <rank>3</rank>
 	<consumer>
@@ -316,7 +316,7 @@
     </geom>
     <geom>
       <ref>0x80bb180</ref>
-      <method><ref>0x80722e0</ref></method>
+      <class><ref>0x80722e0</ref></class>
       <name>ad0a</name>
       <rank>3</rank>
 	<consumer>
@@ -328,7 +328,7 @@
     </geom>
     <geom>
       <ref>0x80b8240</ref>
-      <method><ref>0x80722e0</ref></method>
+      <class><ref>0x80722e0</ref></class>
       <name>ad0</name>
       <rank>2</rank>
 	<consumer>
@@ -338,25 +338,25 @@
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x80721e0</ref>
-    <name>MBREXT-method</name>
-  </method>
-  <method>
+    <name>MBREXT-class</name>
+  </class>
+  <class>
     <ref>0x80722a0</ref>
-    <name>MBR-method</name>
-  </method>
-  <method>
+    <name>MBR-class</name>
+  </class>
+  <class>
     <ref>0x8072320</ref>
-    <name>BSD-method</name>
-  </method>
-  <method>
+    <name>BSD-class</name>
+  </class>
+  <class>
     <ref>0x80721a0</ref>
-    <name>SIMDISK-method</name>
+    <name>SIMDISK-class</name>
     <geom>
       <ref>0x80b8400</ref>
-      <method><ref>0x80721a0</ref></method>
+      <class><ref>0x80721a0</ref></class>
       <name>ad0</name>
       <rank>1</rank>
 	<provider>
@@ -368,7 +368,7 @@
     </geom>
     <geom>
       <ref>0x80b8040</ref>
-      <method><ref>0x80721a0</ref></method>
+      <class><ref>0x80721a0</ref></class>
       <name>ad0</name>
       <rank>1</rank>
 	<provider>
@@ -378,5 +378,5 @@
 	  <name>ad0</name>
 	</provider>
     </geom>
-  </method>
+  </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T013/ref.conf b/tools/regression/geom/Test/T013/ref.conf
index 151133d0736b..939145da4d74 100644
--- a/tools/regression/geom/Test/T013/ref.conf
+++ b/tools/regression/geom/Test/T013/ref.conf
@@ -1,11 +1,11 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <method>
+  <class>
     <ref>0x8072220</ref>
-    <name>DEV-method</name>
+    <name>DEV-class</name>
     <geom>
       <ref>0x80b9380</ref>
-      <method><ref>0x8072220</ref></method>
+      <class><ref>0x8072220</ref></class>
       <name>da0c</name>
       <rank>3</rank>
 	<consumer>
@@ -17,7 +17,7 @@
     </geom>
     <geom>
       <ref>0x80b9200</ref>
-      <method><ref>0x8072220</ref></method>
+      <class><ref>0x8072220</ref></class>
       <name>da0b</name>
       <rank>3</rank>
 	<consumer>
@@ -29,7 +29,7 @@
     </geom>
     <geom>
       <ref>0x80b9180</ref>
-      <method><ref>0x8072220</ref></method>
+      <class><ref>0x8072220</ref></class>
       <name>da0a</name>
       <rank>3</rank>
 	<consumer>
@@ -41,7 +41,7 @@
     </geom>
     <geom>
       <ref>0x80b80c0</ref>
-      <method><ref>0x8072220</ref></method>
+      <class><ref>0x8072220</ref></class>
       <name>da0</name>
       <rank>2</rank>
 	<consumer>
@@ -51,21 +51,21 @@
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x80721e0</ref>
-    <name>MBREXT-method</name>
-  </method>
-  <method>
+    <name>MBREXT-class</name>
+  </class>
+  <class>
     <ref>0x80721a0</ref>
-    <name>MBR-method</name>
-  </method>
-  <method>
+    <name>MBR-class</name>
+  </class>
+  <class>
     <ref>0x8072260</ref>
-    <name>BSD-method</name>
+    <name>BSD-class</name>
     <geom>
       <ref>0x80b8140</ref>
-      <method><ref>0x8072260</ref></method>
+      <class><ref>0x8072260</ref></class>
       <name>da0</name>
       <rank>2</rank>
       <config>
@@ -118,13 +118,13 @@
 	  </config>
 	</provider>
     </geom>
-  </method>
-  <method>
+  </class>
+  <class>
     <ref>0x80720e0</ref>
-    <name>SIMDISK-method</name>
+    <name>SIMDISK-class</name>
     <geom>
       <ref>0x80b8040</ref>
-      <method><ref>0x80720e0</ref></method>
+      <class><ref>0x80720e0</ref></class>
       <name>da0</name>
       <rank>1</rank>
 	<provider>
@@ -134,5 +134,5 @@
 	  <name>da0</name>
 	</provider>
     </geom>
-  </method>
+  </class>
 </mesh>
diff --git a/tools/regression/geom/geom.c b/tools/regression/geom/geom.c
index 065612b16ad9..4a95458bbe89 100644
--- a/tools/regression/geom/geom.c
+++ b/tools/regression/geom/geom.c
@@ -123,7 +123,7 @@ main(int argc __unused, char **argv __unused)
 
 
 	setbuf(stdout, NULL);
-	printf("Sizeof g_method = %d\n", sizeof(struct g_method));
+	printf("Sizeof g_class = %d\n", sizeof(struct g_class));
 	printf("Sizeof g_geom = %d\n", sizeof(struct g_geom));
 	printf("Sizeof g_consumer = %d\n", sizeof(struct g_consumer));
 	printf("Sizeof g_provider = %d\n", sizeof(struct g_provider));
diff --git a/tools/regression/geom/geom_sim.h b/tools/regression/geom/geom_sim.h
index c0ed68ad5879..0eafb1ba4cf2 100644
--- a/tools/regression/geom/geom_sim.h
+++ b/tools/regression/geom/geom_sim.h
@@ -126,11 +126,11 @@ void g_simdisk_xml_save(char *name, char *file);
 void g_simdisk_stop(char *name);
 void g_simdisk_restart(char *name);
 
-#define DECLARE_GEOM_METHOD(method, name) 	\
+#define DECLARE_GEOM_CLASS(class, name) 	\
 	void					\
 	name##_init(void)			\
 	{					\
-		g_add_method(&method);		\
+		g_add_class(&class);		\
 	}
 
 void g_sunlabel_init(void);
diff --git a/tools/regression/geom/geom_simdev.c b/tools/regression/geom/geom_simdev.c
index 35134d5fda55..fb015f0ce0fb 100644
--- a/tools/regression/geom/geom_simdev.c
+++ b/tools/regression/geom/geom_simdev.c
@@ -49,7 +49,7 @@
 
 
 static struct g_geom *
-dev_taste(struct g_method *mp, struct g_provider *pp, struct thread *tp __unused, int insist __unused)
+dev_taste(struct g_class *mp, struct g_provider *pp, struct thread *tp __unused, int insist __unused)
 {
 	struct g_geom *gp;
 	struct g_consumer *cp;
@@ -57,7 +57,7 @@ dev_taste(struct g_method *mp, struct g_provider *pp, struct thread *tp __unused
 	g_trace(G_T_TOPOLOGY, "dev_taste(%s,%s)", mp->name, pp->name);
 	g_topology_assert();
 	LIST_FOREACH(cp, &pp->consumers, consumers) {
-		if (cp->geom->method == mp) {
+		if (cp->geom->class == mp) {
 			g_topology_unlock();
 			return (NULL);
 		}
@@ -87,13 +87,13 @@ g_dev_orphan(struct g_consumer *cp, struct thread *tp __unused)
 }
 
 
-static struct g_method dev_method	= {
-	"DEV-method",
+static struct g_class dev_class	= {
+	"DEV-class",
 	dev_taste,
 	NULL,
 	g_dev_orphan,
 	NULL,
-	G_METHOD_INITSTUFF
+	G_CLASS_INITSTUFF
 };
 
 static struct g_geom *
@@ -101,7 +101,7 @@ g_dev_findg(char *name)
 {
 	struct g_geom *gp;
 
-	LIST_FOREACH(gp, &dev_method.geom, geom)
+	LIST_FOREACH(gp, &dev_class.geom, geom)
 		if (!strcmp(gp->name, name))
 			break;
 	return (gp);
@@ -111,7 +111,7 @@ void
 g_dev_init(void *junk __unused)
 {
 
-	g_add_method(&dev_method);
+	g_add_class(&dev_class);
 }
 
 
diff --git a/tools/regression/geom/geom_simdisk.c b/tools/regression/geom/geom_simdisk.c
index 8c877c954d76..de5d1f951475 100644
--- a/tools/regression/geom/geom_simdisk.c
+++ b/tools/regression/geom/geom_simdisk.c
@@ -47,13 +47,13 @@
 
 #include "geom_simdisk.h"
 
-struct g_method g_simdisk_method = {
-	"SIMDISK-method",
+struct g_class g_simdisk_class = {
+	"SIMDISK-class",
 	NULL,
 	g_std_access,
 	NULL,
 	NULL,
-	G_METHOD_INITSTUFF
+	G_CLASS_INITSTUFF
 };
 
 static void
@@ -125,7 +125,7 @@ g_simdisk_start(struct bio *bp)
 void
 g_simdisk_init(void)
 {
-	g_add_method(&g_simdisk_method);
+	g_add_class(&g_simdisk_class);
 }
 
 struct g_geom *
@@ -137,7 +137,7 @@ g_simdisk_create(char *name, struct simdisk_softc *sc)
 
 	printf("g_simdisk_create(\"%s\", %p)\n", name, sc);
 	g_topology_lock();
-	gp = g_new_geomf(&g_simdisk_method, "%s", name);
+	gp = g_new_geomf(&g_simdisk_class, "%s", name);
 	gp->start = g_simdisk_start;
 	gp->softc = sc;
 
@@ -169,7 +169,7 @@ g_simdisk_destroy(char *name)
 {
 	struct g_geom *gp;
 
-	LIST_FOREACH(gp, &g_simdisk_method.geom, geom) {
+	LIST_FOREACH(gp, &g_simdisk_class.geom, geom) {
 		if (strcmp(name, gp->name))
 			continue;
 		gp->flags |= G_GEOM_WITHER;
@@ -228,7 +228,7 @@ g_simdisk_stop(char *name)
 	struct simdisk_softc *sc;
 
 	g_trace(G_T_TOPOLOGY, "g_simdisk_stop(%s)", name);
-	LIST_FOREACH(gp, &g_simdisk_method.geom, geom) {
+	LIST_FOREACH(gp, &g_simdisk_class.geom, geom) {
 		if (strcmp(name, gp->name))
 			continue;
 		sc = gp->softc;
@@ -245,7 +245,7 @@ g_simdisk_restart(char *name)
 	struct bio *bp;
 
 	g_trace(G_T_TOPOLOGY, "g_simdisk_restart(%s)", name);
-	LIST_FOREACH(gp, &g_simdisk_method.geom, geom) {
+	LIST_FOREACH(gp, &g_simdisk_class.geom, geom) {
 		if (strcmp(name, gp->name))
 			continue;
 		sc = gp->softc;
diff --git a/tools/regression/geom/geom_simdisk.h b/tools/regression/geom/geom_simdisk.h
index b997b95e4e36..cd5783699f6e 100644
--- a/tools/regression/geom/geom_simdisk.h
+++ b/tools/regression/geom/geom_simdisk.h
@@ -55,7 +55,7 @@ struct simdisk_softc {
 	TAILQ_HEAD(,bio)	sort;
 };
 
-extern struct g_method g_simdisk_method;
+extern struct g_class g_simdisk_class;
 
 struct sector * g_simdisk_findsector(struct simdisk_softc *sc, off_t off, int create);
 struct g_geom *g_simdisk_create(char *name, struct simdisk_softc *sc);
diff --git a/tools/regression/geom/geom_simdisk_xml.c b/tools/regression/geom/geom_simdisk_xml.c
index 3037fdf2b553..f4cf025f6199 100644
--- a/tools/regression/geom/geom_simdisk_xml.c
+++ b/tools/regression/geom/geom_simdisk_xml.c
@@ -64,7 +64,7 @@ g_simdisk_xml_save(char *name, char *file)
 	FILE *f;
 	u_char *p;
 
-	LIST_FOREACH(gp, &g_simdisk_method.geom, geom) {
+	LIST_FOREACH(gp, &g_simdisk_class.geom, geom) {
 		if (strcmp(name, gp->name))
 			continue;
 		sc = gp->softc;
@@ -76,7 +76,7 @@ g_simdisk_xml_save(char *name, char *file)
 #if 0
 		{
 		struct sbuf *sb;
-		sb = g_conf_specific(&g_simdisk_method, gp, NULL, NULL);
+		sb = g_conf_specific(&g_simdisk_class, gp, NULL, NULL);
 		fprintf(f, "  <config>%s</config>\n", sbuf_data(sb));
 		}
 #endif