diff --git a/dawn.json b/dawn.json
index 651edf0..3a666ee 100644
--- a/dawn.json
+++ b/dawn.json
@@ -428,7 +428,7 @@
         "members": [
             {"name": "label", "type": "char", "annotation": "const*", "length": "strlen", "optional": true},
             {"name": "layout", "type": "pipeline layout"},
-            {"name": "compute stage", "type": "pipeline stage descriptor"}
+            {"name": "compute stage", "type": "programmable stage descriptor"}
         ]
     },
     "cull mode": {
@@ -751,7 +751,7 @@
             {"name": "bind group layouts", "type": "bind group layout", "annotation": "const*", "length": "bind group layout count"}
         ]
     },
-    "pipeline stage descriptor": {
+    "programmable stage descriptor": {
         "category": "structure",
         "extensible": true,
         "members": [
@@ -1094,8 +1094,8 @@
         "members": [
             {"name": "label", "type": "char", "annotation": "const*", "length": "strlen", "optional": true},
             {"name": "layout", "type": "pipeline layout"},
-            {"name": "vertex stage", "type": "pipeline stage descriptor"},
-            {"name": "fragment stage", "type": "pipeline stage descriptor", "annotation": "const*", "optional": true},
+            {"name": "vertex stage", "type": "programmable stage descriptor"},
+            {"name": "fragment stage", "type": "programmable stage descriptor", "annotation": "const*", "optional": true},
             {"name": "vertex input", "type": "vertex input descriptor", "annotation": "const*", "optional": true},
             {"name": "primitive topology", "type": "primitive topology"},
             {"name": "rasterization state", "type": "rasterization state descriptor", "annotation": "const*", "optional": true},
diff --git a/examples/CHelloTriangle.cpp b/examples/CHelloTriangle.cpp
index 46daece..b3928a9 100644
--- a/examples/CHelloTriangle.cpp
+++ b/examples/CHelloTriangle.cpp
@@ -67,7 +67,7 @@
         descriptor.vertexStage.module = vsModule;
         descriptor.vertexStage.entryPoint = "main";
 
-        DawnPipelineStageDescriptor fragmentStage;
+        DawnProgrammableStageDescriptor fragmentStage;
         fragmentStage.nextInChain = nullptr;
         fragmentStage.module = fsModule;
         fragmentStage.entryPoint = "main";
diff --git a/src/dawn_native/ComputePipeline.cpp b/src/dawn_native/ComputePipeline.cpp
index a1e941b..6b20706 100644
--- a/src/dawn_native/ComputePipeline.cpp
+++ b/src/dawn_native/ComputePipeline.cpp
@@ -26,8 +26,8 @@
         }
 
         DAWN_TRY(device->ValidateObject(descriptor->layout));
-        DAWN_TRY(ValidatePipelineStageDescriptor(device, &descriptor->computeStage,
-                                                 descriptor->layout, SingleShaderStage::Compute));
+        DAWN_TRY(ValidateProgrammableStageDescriptor(
+            device, &descriptor->computeStage, descriptor->layout, SingleShaderStage::Compute));
         return {};
     }
 
diff --git a/src/dawn_native/Pipeline.cpp b/src/dawn_native/Pipeline.cpp
index 91b2ed0..a8c6e9b 100644
--- a/src/dawn_native/Pipeline.cpp
+++ b/src/dawn_native/Pipeline.cpp
@@ -20,10 +20,10 @@
 
 namespace dawn_native {
 
-    MaybeError ValidatePipelineStageDescriptor(const DeviceBase* device,
-                                               const PipelineStageDescriptor* descriptor,
-                                               const PipelineLayoutBase* layout,
-                                               SingleShaderStage stage) {
+    MaybeError ValidateProgrammableStageDescriptor(const DeviceBase* device,
+                                                   const ProgrammableStageDescriptor* descriptor,
+                                                   const PipelineLayoutBase* layout,
+                                                   SingleShaderStage stage) {
         DAWN_TRY(device->ValidateObject(descriptor->module));
 
         if (descriptor->entryPoint != std::string("main")) {
diff --git a/src/dawn_native/Pipeline.h b/src/dawn_native/Pipeline.h
index ea989ed..2159954 100644
--- a/src/dawn_native/Pipeline.h
+++ b/src/dawn_native/Pipeline.h
@@ -28,10 +28,10 @@
 
 namespace dawn_native {
 
-    MaybeError ValidatePipelineStageDescriptor(const DeviceBase* device,
-                                               const PipelineStageDescriptor* descriptor,
-                                               const PipelineLayoutBase* layout,
-                                               SingleShaderStage stage);
+    MaybeError ValidateProgrammableStageDescriptor(const DeviceBase* device,
+                                                   const ProgrammableStageDescriptor* descriptor,
+                                                   const PipelineLayoutBase* layout,
+                                                   SingleShaderStage stage);
 
     class PipelineBase : public ObjectBase {
       public:
diff --git a/src/dawn_native/RenderPipeline.cpp b/src/dawn_native/RenderPipeline.cpp
index b2a4424..fd5eebf 100644
--- a/src/dawn_native/RenderPipeline.cpp
+++ b/src/dawn_native/RenderPipeline.cpp
@@ -289,10 +289,10 @@
         }
 
         DAWN_TRY(ValidatePrimitiveTopology(descriptor->primitiveTopology));
-        DAWN_TRY(ValidatePipelineStageDescriptor(device, &descriptor->vertexStage,
-                                                 descriptor->layout, SingleShaderStage::Vertex));
-        DAWN_TRY(ValidatePipelineStageDescriptor(device, descriptor->fragmentStage,
-                                                 descriptor->layout, SingleShaderStage::Fragment));
+        DAWN_TRY(ValidateProgrammableStageDescriptor(
+            device, &descriptor->vertexStage, descriptor->layout, SingleShaderStage::Vertex));
+        DAWN_TRY(ValidateProgrammableStageDescriptor(
+            device, descriptor->fragmentStage, descriptor->layout, SingleShaderStage::Fragment));
 
         if (descriptor->rasterizationState) {
             DAWN_TRY(ValidateRasterizationStateDescriptor(descriptor->rasterizationState));
diff --git a/src/tests/end2end/TextureZeroInitTests.cpp b/src/tests/end2end/TextureZeroInitTests.cpp
index 81dfc47..40f069b 100644
--- a/src/tests/end2end/TextureZeroInitTests.cpp
+++ b/src/tests/end2end/TextureZeroInitTests.cpp
@@ -517,7 +517,7 @@
     // Create compute pipeline
     dawn::ComputePipelineDescriptor computePipelineDescriptor;
     computePipelineDescriptor.layout = utils::MakeBasicPipelineLayout(device, &bindGroupLayout);
-    dawn::PipelineStageDescriptor computeStage;
+    dawn::ProgrammableStageDescriptor computeStage;
     const char* cs =
         R"(#version 450
         layout(binding = 0) uniform texture2D sampleTex;
diff --git a/src/tests/unittests/wire/WireArgumentTests.cpp b/src/tests/unittests/wire/WireArgumentTests.cpp
index f9a7733..abb2bb6 100644
--- a/src/tests/unittests/wire/WireArgumentTests.cpp
+++ b/src/tests/unittests/wire/WireArgumentTests.cpp
@@ -166,7 +166,7 @@
     pipelineDescriptor.vertexStage.module = vsModule;
     pipelineDescriptor.vertexStage.entryPoint = "main";
 
-    DawnPipelineStageDescriptor fragmentStage;
+    DawnProgrammableStageDescriptor fragmentStage;
     fragmentStage.nextInChain = nullptr;
     fragmentStage.module = vsModule;
     fragmentStage.entryPoint = "main";
diff --git a/src/tests/unittests/wire/WireOptionalTests.cpp b/src/tests/unittests/wire/WireOptionalTests.cpp
index a997d46..9a38fd5 100644
--- a/src/tests/unittests/wire/WireOptionalTests.cpp
+++ b/src/tests/unittests/wire/WireOptionalTests.cpp
@@ -141,7 +141,7 @@
     pipelineDescriptor.vertexStage.module = vsModule;
     pipelineDescriptor.vertexStage.entryPoint = "main";
 
-    DawnPipelineStageDescriptor fragmentStage;
+    DawnProgrammableStageDescriptor fragmentStage;
     fragmentStage.nextInChain = nullptr;
     fragmentStage.module = vsModule;
     fragmentStage.entryPoint = "main";
diff --git a/src/utils/ComboRenderPipelineDescriptor.h b/src/utils/ComboRenderPipelineDescriptor.h
index 4d568b3..2be2f0a 100644
--- a/src/utils/ComboRenderPipelineDescriptor.h
+++ b/src/utils/ComboRenderPipelineDescriptor.h
@@ -40,7 +40,7 @@
         ComboRenderPipelineDescriptor(ComboRenderPipelineDescriptor&&) = delete;
         ComboRenderPipelineDescriptor& operator=(ComboRenderPipelineDescriptor&&) = delete;
 
-        dawn::PipelineStageDescriptor cFragmentStage;
+        dawn::ProgrammableStageDescriptor cFragmentStage;
 
         ComboVertexInputDescriptor cVertexInput;
         dawn::RasterizationStateDescriptor cRasterizationState;