diff --git a/toolchain/sem_ir/inst.h b/toolchain/sem_ir/inst.h
index f2f3554b8979..ae43afc861af 100644
--- a/toolchain/sem_ir/inst.h
+++ b/toolchain/sem_ir/inst.h
@@ -208,9 +208,7 @@ class Inst : public Printable<Inst> {
     }
   }
 
-  auto kind() const -> InstKind {
-    return InstKind::Make(static_cast<InstKind::RawEnumType>(kind_));
-  }
+  auto kind() const -> InstKind { return InstKind::FromInt(kind_); }
 
   // Gets the type of the value produced by evaluating this instruction.
   auto type_id() const -> TypeId { return type_id_; }
diff --git a/toolchain/sem_ir/inst_kind.h b/toolchain/sem_ir/inst_kind.h
index 541d9289d0f2..671c90cc0ac9 100644
--- a/toolchain/sem_ir/inst_kind.h
+++ b/toolchain/sem_ir/inst_kind.h
@@ -103,7 +103,7 @@ class InstKind : public CARBON_ENUM_BASE(InstKind) {
   constexpr auto Define(DefinitionInfo info) const -> Definition<TypedNodeId>;
 
   using EnumBase::AsInt;
-  using EnumBase::Make;
+  using EnumBase::FromInt;
 
   // Returns true if the kind matches any of the provided instructions' kinds.
   template <typename... InstT>