diff --git a/rustc_codegen_spirv/src/symbols.rs b/rustc_codegen_spirv/src/symbols.rs
index 01ec131cab..a7a2e9373e 100644
--- a/rustc_codegen_spirv/src/symbols.rs
+++ b/rustc_codegen_spirv/src/symbols.rs
@@ -38,12 +38,21 @@ fn make_storage_classes() -> HashMap<Symbol, StorageClass> {
         ("atomic_counter", AtomicCounter),
         ("image", Image),
         ("storage_buffer", StorageBuffer),
-        ("callable_data_nv", CallableDataNV),
-        ("incoming_callable_data_nv", IncomingCallableDataNV),
-        ("ray_payload_nv", RayPayloadNV),
-        ("hit_attribute_nv", HitAttributeNV),
-        ("incoming_ray_payload_nv", IncomingRayPayloadNV),
-        ("shader_record_buffer_nv", ShaderRecordBufferNV),
+        ("callable_data_khr", StorageClass::CallableDataKHR),
+        (
+            "incoming_callable_data_khr",
+            StorageClass::IncomingCallableDataKHR,
+        ),
+        ("ray_payload_khr", StorageClass::RayPayloadKHR),
+        ("hit_attribute_khr", StorageClass::HitAttributeKHR),
+        (
+            "incoming_ray_payload_khr",
+            StorageClass::IncomingRayPayloadKHR,
+        ),
+        (
+            "shader_record_buffer_khr",
+            StorageClass::ShaderRecordBufferKHR,
+        ),
         ("physical_storage_buffer", PhysicalStorageBuffer),
     ]
     .iter()
diff --git a/spirv-std/src/lib.rs b/spirv-std/src/lib.rs
index d6744cc72e..c835d32c57 100644
--- a/spirv-std/src/lib.rs
+++ b/spirv-std/src/lib.rs
@@ -50,12 +50,12 @@ pointer_addrspace!("push_constant", PushConstant, false);
 pointer_addrspace!("atomic_counter", AtomicCounter, true);
 pointer_addrspace!("image", Image, true);
 pointer_addrspace!("storage_buffer", StorageBuffer, true);
-pointer_addrspace!("callable_data_nv", CallableDataNV, true);
-pointer_addrspace!("incoming_callable_data_nv", IncomingCallableDataNV, true);
-pointer_addrspace!("ray_payload_nv", RayPayloadNV, true);
-pointer_addrspace!("hit_attribute_nv", HitAttributeNV, true);
-pointer_addrspace!("incoming_ray_payload_nv", IncomingRayPayloadNV, true);
-pointer_addrspace!("shader_record_buffer_nv", ShaderRecordBufferNV, true);
+pointer_addrspace!("callable_data_khr", CallableDataKHR, true);
+pointer_addrspace!("incoming_callable_data_khr", IncomingCallableDataKHR, true);
+pointer_addrspace!("ray_payload_khr", RayPayloadKHR, true);
+pointer_addrspace!("hit_attribute_khr", HitAttributeKHR, true);
+pointer_addrspace!("incoming_ray_payload_khr", IncomingRayPayloadKHR, true);
+pointer_addrspace!("shader_record_buffer_khr", ShaderRecordBufferKHR, true);
 pointer_addrspace!("physical_storage_buffer", PhysicalStorageBuffer, true);
 
 #[allow(non_camel_case_types)]