diff --git a/index.bs b/index.bs
index 41b9e1b..55edd7a 100644
--- a/index.bs
+++ b/index.bs
@@ -38,9 +38,6 @@ urlPrefix: https://w3c.github.io/sensors/; spec: GENERIC-SENSOR
     text: user identifying; url: user-identifying
     text: generic mitigations; url: mitigation-strategies
     text: supported sensor options
-    text: automation
-    text: mock sensor type
-    text: mock sensor reading values
 urlPrefix: https://www.w3.org/TR/screen-orientation/; spec: SCREEN-ORIENTATION
   type: dfn
     text: current orientation type;  url: dfn-current-orientation-type
@@ -428,42 +425,35 @@ Abstract Operations {#abstract-opertaions}
 
 Automation {#automation}
 ==========
-This section extends the [=automation=] section defined in the Generic Sensor API [[GENERIC-SENSOR]]
-to provide mocking information about the [=acceleration=] applied to the X, Y and Z axis of a device
-that hosts the sensor for the purposes of testing a user agent's implementation of {{Accelerometer}},
-{{LinearAccelerationSensor}} and {{GravitySensor}} APIs.
 
-<h3 id="mock-accelerometer-type">Mock Sensor Type</h3>
+This section extends [[GENERIC-SENSOR#automation]] by providing [=Accelerometer=]-specific virtual sensor metadata.
 
-The {{Accelerometer}} class has an associated [=mock sensor type=] which is
-<a for="MockSensorType" enum-value>"accelerometer"</a>, its [=mock sensor reading values=]
-dictionary is defined as follows:
+Accelerometer automation {#accelerometer-automation}
+-----------------------
 
-<pre class="idl">
-  dictionary AccelerometerReadingValues {
-    required double? x;
-    required double? y;
-    required double? z;
-  };
-</pre>
+The [=per-type virtual sensor metadata=] [=map=] must have the following [=map/entry=]:
+: [=map/key=]
+:: "`accelerometer`"
+: [=map/value=]
+:: A [=virtual sensor metadata=] whose [=virtual sensor metadata/virtual sensor type=] is [=Accelerometer=] and [=reading parsing algorithm=] is [=parse xyz reading=].
 
-The {{LinearAccelerationSensor}} class has an associated [=mock sensor type=] which is
-<a for="MockSensorType" enum-value>"linear-acceleration"</a>, its [=mock sensor reading values=]
-dictionary is defined as follows:
+Linear Accelerometer automation {#linear-accelerometer-automation}
+-----------------------
 
-<pre class="idl">
-  dictionary LinearAccelerationReadingValues : AccelerometerReadingValues {
-  };
-</pre>
+The [=per-type virtual sensor metadata=] [=map=] must have the following [=map/entry=]:
+: [=map/key=]
+:: "`linear-acceleration`"
+: [=map/value=]
+:: A [=virtual sensor metadata=] whose [=virtual sensor metadata/virtual sensor type=] is [=Linear Acceleration Sensor=] and [=reading parsing algorithm=] is [=parse xyz reading=].
 
-The {{GravitySensor}} class has an associated [=mock sensor type=] which is
-<a for="MockSensorType" enum-value>"gravity"</a>, its [=mock sensor reading values=]
-dictionary is defined as follows:
+Gravity automation {#gravity-automation}
+-----------------------
 
-<pre class="idl">
-  dictionary GravityReadingValues : AccelerometerReadingValues {
-  };
-</pre>
+The [=per-type virtual sensor metadata=] [=map=] must have the following [=map/entry=]:
+: [=map/key=]
+:: "`gravity`"
+: [=map/value=]
+:: A [=virtual sensor metadata=] whose [=virtual sensor metadata/virtual sensor type=] is [=Gravity Sensor=] and [=reading parsing algorithm=] is [=parse xyz reading=].
 
 Acknowledgements {#acknowledgements}
 ================