diff --git a/db/fixtures/ae_datastore/ManageIQ/System/Event/EmsEvent/EVM.class/request_approved.yaml b/db/fixtures/ae_datastore/ManageIQ/System/Event/EmsEvent/EVM.class/request_approved.yaml
deleted file mode 100644
index 20342614d63..00000000000
--- a/db/fixtures/ae_datastore/ManageIQ/System/Event/EmsEvent/EVM.class/request_approved.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: request_approved
-    inherits: 
-    description: 
-  fields:
-  - rel5:
-      value: "/System/Policy/request_approved"
diff --git a/db/fixtures/ae_datastore/ManageIQ/System/Event/EmsEvent/EVM.class/request_created.yaml b/db/fixtures/ae_datastore/ManageIQ/System/Event/EmsEvent/EVM.class/request_created.yaml
deleted file mode 100644
index 60cd9f95fa0..00000000000
--- a/db/fixtures/ae_datastore/ManageIQ/System/Event/EmsEvent/EVM.class/request_created.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: request_created
-    inherits: 
-    description: 
-  fields:
-  - rel5:
-      value: "/System/Policy/request_created"
diff --git a/db/fixtures/ae_datastore/ManageIQ/System/Event/EmsEvent/EVM.class/request_denied.yaml b/db/fixtures/ae_datastore/ManageIQ/System/Event/EmsEvent/EVM.class/request_denied.yaml
deleted file mode 100644
index eb19389b11f..00000000000
--- a/db/fixtures/ae_datastore/ManageIQ/System/Event/EmsEvent/EVM.class/request_denied.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: request_denied
-    inherits: 
-    description: 
-  fields:
-  - rel5:
-      value: "/System/Policy/request_denied"
diff --git a/db/fixtures/ae_datastore/ManageIQ/System/Event/EmsEvent/EVM.class/request_starting.yaml b/db/fixtures/ae_datastore/ManageIQ/System/Event/EmsEvent/EVM.class/request_starting.yaml
deleted file mode 100644
index eafd1439a16..00000000000
--- a/db/fixtures/ae_datastore/ManageIQ/System/Event/EmsEvent/EVM.class/request_starting.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: request_starting
-    inherits: 
-    description: 
-  fields:
-  - rel5:
-      value: "/System/Policy/request_starting"
diff --git a/db/fixtures/ae_datastore/ManageIQ/System/Event/EmsEvent/EVM.class/request_updated.yaml b/db/fixtures/ae_datastore/ManageIQ/System/Event/EmsEvent/EVM.class/request_updated.yaml
deleted file mode 100644
index 9ff0c3ca8b4..00000000000
--- a/db/fixtures/ae_datastore/ManageIQ/System/Event/EmsEvent/EVM.class/request_updated.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: request_updated
-    inherits: 
-    description: 
-  fields:
-  - rel5:
-      value: "/System/Policy/request_updated"
diff --git a/db/fixtures/ae_datastore/ManageIQ/System/Event/EmsEvent/EVM.class/request_pending.yaml b/db/fixtures/ae_datastore/ManageIQ/System/Event/RequestEvent/Request.class/request_pending.yaml
similarity index 100%
rename from db/fixtures/ae_datastore/ManageIQ/System/Event/EmsEvent/EVM.class/request_pending.yaml
rename to db/fixtures/ae_datastore/ManageIQ/System/Event/RequestEvent/Request.class/request_pending.yaml