diff --git a/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVBase.td b/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVBase.td
--- a/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVBase.td
+++ b/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVBase.td
@@ -73,9 +73,9 @@
         Attribute attr, DialectAsmPrinter &printer) const override;
   }];
 
-  // TODO: This has overlapping accessors with generated when switched to
-  // prefixed. Fix and update to _Both & then _Prefixed.
-  let emitAccessorPrefix = kEmitAccessorPrefix_Raw;
+  // TODO(https://github.com/llvm/llvm-project/issues/57887): Switch to
+  // _Prefixed accessors.
+  let emitAccessorPrefix = kEmitAccessorPrefix_Both;
 }
 
 //===----------------------------------------------------------------------===//
diff --git a/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVControlFlowOps.td b/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVControlFlowOps.td
--- a/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVControlFlowOps.td
+++ b/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVControlFlowOps.td
@@ -64,9 +64,6 @@
   let skipDefaultBuilders = 1;
 
   let extraClassDeclaration = [{
-    /// Returns the branch target block.
-    Block *getTarget() { return target(); }
-
     /// Returns the block arguments.
     operand_range getBlockArguments() { return targetOperands(); }
   }];
@@ -236,14 +233,14 @@
   );
 
   let results = (outs
-    Optional<SPV_Type>:$result
+    Optional<SPV_Type>:$return_value
   );
 
   let autogenSerialization = 0;
 
   let assemblyFormat = [{
     $callee `(` $arguments `)` attr-dict `:`
-    functional-type($arguments, results)
+      functional-type($arguments, results)
   }];
 }
 
diff --git a/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVCooperativeMatrixOps.td b/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVCooperativeMatrixOps.td
--- a/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVCooperativeMatrixOps.td
+++ b/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVCooperativeMatrixOps.td
@@ -39,7 +39,7 @@
     ```
   }];
 
-  let assemblyFormat = "attr-dict `:` $type";
+  let assemblyFormat = "attr-dict `:` $cooperative_matrix_type";
 
   let availability = [
     MinVersion<SPV_V_1_0>,
@@ -49,7 +49,7 @@
   ];
 
   let arguments = (ins
-    TypeAttr:$type
+    TypeAttr:$cooperative_matrix_type
   );
 
   let results = (outs
diff --git a/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVJointMatrixOps.td b/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVJointMatrixOps.td
--- a/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVJointMatrixOps.td
+++ b/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVJointMatrixOps.td
@@ -39,7 +39,7 @@
     ```
   }];
 
-  let assemblyFormat = "attr-dict `:` $type";
+  let assemblyFormat = "attr-dict `:` $joint_matrix_type";
 
   let availability = [
     MinVersion<SPV_V_1_0>,
@@ -49,7 +49,7 @@
   ];
 
   let arguments = (ins
-    TypeAttr:$type
+    TypeAttr:$joint_matrix_type
   );
 
   let results = (outs
diff --git a/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVStructureOps.td b/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVStructureOps.td
--- a/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVStructureOps.td
+++ b/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVStructureOps.td
@@ -311,10 +311,6 @@
   let autogenSerialization = 0;
 
   let extraClassDeclaration = [{
-    /// Returns the type of this function.
-    /// FIXME: Remove when SPIRV uses prefixed accessors.
-    FunctionType getFunctionType() { return function_type(); }
-
     /// Returns the argument types of this function.
     ArrayRef<Type> getArgumentTypes() { return getFunctionType().getInputs(); }