diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
index 27a7ed42706..1b5be15ac1b 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -225,7 +225,7 @@ HRESULT d3d_input_layout_create(struct d3d_device *device,
 struct d3d_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) DECLSPEC_HIDDEN;
 
 /* ID3D10VertexShader */
-struct d3d10_vertex_shader
+struct d3d_vertex_shader
 {
     ID3D10VertexShader ID3D10VertexShader_iface;
     LONG refcount;
@@ -235,9 +235,9 @@ struct d3d10_vertex_shader
     ID3D10Device1 *device;
 };
 
-HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d_device *device,
+HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d3d_device *device,
         const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN;
-struct d3d10_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) DECLSPEC_HIDDEN;
+struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) DECLSPEC_HIDDEN;
 
 /* ID3D10GeometryShader */
 struct d3d10_geometry_shader
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index 65524d30f52..050b83e29a7 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -678,7 +678,7 @@ static void STDMETHODCALLTYPE d3d10_device_VSSetShader(ID3D10Device1 *iface,
         ID3D10VertexShader *shader)
 {
     struct d3d_device *This = impl_from_ID3D10Device(iface);
-    struct d3d10_vertex_shader *vs = unsafe_impl_from_ID3D10VertexShader(shader);
+    struct d3d_vertex_shader *vs = unsafe_impl_from_ID3D10VertexShader(shader);
 
     TRACE("iface %p, shader %p\n", iface, shader);
 
@@ -1385,7 +1385,7 @@ static void STDMETHODCALLTYPE d3d10_device_PSGetSamplers(ID3D10Device1 *iface,
 static void STDMETHODCALLTYPE d3d10_device_VSGetShader(ID3D10Device1 *iface, ID3D10VertexShader **shader)
 {
     struct d3d_device *device = impl_from_ID3D10Device(iface);
-    struct d3d10_vertex_shader *shader_impl;
+    struct d3d_vertex_shader *shader_impl;
     struct wined3d_shader *wined3d_shader;
 
     TRACE("iface %p, shader %p.\n", iface, shader);
@@ -2238,7 +2238,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device1 *
         const void *byte_code, SIZE_T byte_code_length, ID3D10VertexShader **shader)
 {
     struct d3d_device *This = impl_from_ID3D10Device(iface);
-    struct d3d10_vertex_shader *object;
+    struct d3d_vertex_shader *object;
     HRESULT hr;
 
     TRACE("iface %p, byte_code %p, byte_code_length %lu, shader %p\n",
@@ -2248,7 +2248,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device1 *
     if (!object)
         return E_OUTOFMEMORY;
 
-    hr = d3d10_vertex_shader_init(object, This, byte_code, byte_code_length);
+    hr = d3d_vertex_shader_init(object, This, byte_code, byte_code_length);
     if (FAILED(hr))
     {
         WARN("Failed to initialize vertex shader, hr %#x.\n", hr);
diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c
index bab6cbfa52e..b9be0a88b02 100644
--- a/dlls/d3d11/shader.c
+++ b/dlls/d3d11/shader.c
@@ -122,9 +122,9 @@ void shader_free_signature(struct wined3d_shader_signature *s)
     HeapFree(GetProcessHeap(), 0, s->elements);
 }
 
-static inline struct d3d10_vertex_shader *impl_from_ID3D10VertexShader(ID3D10VertexShader *iface)
+static inline struct d3d_vertex_shader *impl_from_ID3D10VertexShader(ID3D10VertexShader *iface)
 {
-    return CONTAINING_RECORD(iface, struct d3d10_vertex_shader, ID3D10VertexShader_iface);
+    return CONTAINING_RECORD(iface, struct d3d_vertex_shader, ID3D10VertexShader_iface);
 }
 
 /* IUnknown methods */
@@ -151,7 +151,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_QueryInterface(ID3D10Vertex
 
 static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_AddRef(ID3D10VertexShader *iface)
 {
-    struct d3d10_vertex_shader *This = impl_from_ID3D10VertexShader(iface);
+    struct d3d_vertex_shader *This = impl_from_ID3D10VertexShader(iface);
     ULONG refcount = InterlockedIncrement(&This->refcount);
 
     TRACE("%p increasing refcount to %u\n", This, refcount);
@@ -169,7 +169,7 @@ static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_AddRef(ID3D10VertexShader *if
 
 static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_Release(ID3D10VertexShader *iface)
 {
-    struct d3d10_vertex_shader *This = impl_from_ID3D10VertexShader(iface);
+    struct d3d_vertex_shader *This = impl_from_ID3D10VertexShader(iface);
     ULONG refcount = InterlockedDecrement(&This->refcount);
 
     TRACE("%p decreasing refcount to %u\n", This, refcount);
@@ -193,7 +193,7 @@ static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_Release(ID3D10VertexShader *i
 
 static void STDMETHODCALLTYPE d3d10_vertex_shader_GetDevice(ID3D10VertexShader *iface, ID3D10Device **device)
 {
-    struct d3d10_vertex_shader *shader = impl_from_ID3D10VertexShader(iface);
+    struct d3d_vertex_shader *shader = impl_from_ID3D10VertexShader(iface);
 
     TRACE("iface %p, device %p.\n", iface, device);
 
@@ -204,7 +204,7 @@ static void STDMETHODCALLTYPE d3d10_vertex_shader_GetDevice(ID3D10VertexShader *
 static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_GetPrivateData(ID3D10VertexShader *iface,
         REFGUID guid, UINT *data_size, void *data)
 {
-    struct d3d10_vertex_shader *shader = impl_from_ID3D10VertexShader(iface);
+    struct d3d_vertex_shader *shader = impl_from_ID3D10VertexShader(iface);
 
     TRACE("iface %p, guid %s, data_size %p, data %p.\n",
             iface, debugstr_guid(guid), data_size, data);
@@ -215,7 +215,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_GetPrivateData(ID3D10Vertex
 static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateData(ID3D10VertexShader *iface,
         REFGUID guid, UINT data_size, const void *data)
 {
-    struct d3d10_vertex_shader *shader = impl_from_ID3D10VertexShader(iface);
+    struct d3d_vertex_shader *shader = impl_from_ID3D10VertexShader(iface);
 
     TRACE("iface %p, guid %s, data_size %u, data %p.\n",
             iface, debugstr_guid(guid), data_size, data);
@@ -226,7 +226,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateData(ID3D10Vertex
 static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateDataInterface(ID3D10VertexShader *iface,
         REFGUID guid, const IUnknown *data)
 {
-    struct d3d10_vertex_shader *shader = impl_from_ID3D10VertexShader(iface);
+    struct d3d_vertex_shader *shader = impl_from_ID3D10VertexShader(iface);
 
     TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);
 
@@ -246,20 +246,20 @@ static const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl =
     d3d10_vertex_shader_SetPrivateDataInterface,
 };
 
-static void STDMETHODCALLTYPE d3d10_vertex_shader_wined3d_object_destroyed(void *parent)
+static void STDMETHODCALLTYPE d3d_vertex_shader_wined3d_object_destroyed(void *parent)
 {
-    struct d3d10_vertex_shader *shader = parent;
+    struct d3d_vertex_shader *shader = parent;
 
     wined3d_private_store_cleanup(&shader->private_store);
     HeapFree(GetProcessHeap(), 0, parent);
 }
 
-static const struct wined3d_parent_ops d3d10_vertex_shader_wined3d_parent_ops =
+static const struct wined3d_parent_ops d3d_vertex_shader_wined3d_parent_ops =
 {
-    d3d10_vertex_shader_wined3d_object_destroyed,
+    d3d_vertex_shader_wined3d_object_destroyed,
 };
 
-HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d_device *device,
+HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d3d_device *device,
         const void *byte_code, SIZE_T byte_code_length)
 {
     struct wined3d_shader_signature output_signature;
@@ -289,7 +289,7 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d_
     desc.max_version = 4;
 
     hr = wined3d_shader_create_vs(device->wined3d_device, &desc, shader,
-            &d3d10_vertex_shader_wined3d_parent_ops, &shader->wined3d_shader);
+            &d3d_vertex_shader_wined3d_parent_ops, &shader->wined3d_shader);
     shader_free_signature(&input_signature);
     shader_free_signature(&output_signature);
     if (FAILED(hr))
@@ -307,7 +307,7 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d_
     return S_OK;
 }
 
-struct d3d10_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface)
+struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface)
 {
     if (!iface)
         return NULL;