diff --git a/toolchain/lowering/lowering_handle.cpp b/toolchain/lowering/lowering_handle.cpp
index 8daa896280a8..e4fb758376f5 100644
--- a/toolchain/lowering/lowering_handle.cpp
+++ b/toolchain/lowering/lowering_handle.cpp
@@ -157,9 +157,10 @@ auto LoweringHandleFunctionDeclaration(LoweringFunctionContext& /*context*/,
       << node;
 }
 
-auto LoweringHandleIndex(LoweringFunctionContext& context,
-                         SemanticsNodeId node_id, SemanticsNode node) -> void {
-  auto [tuple_node_id, index_node_id] = node.GetAsIndex();
+auto LoweringHandleTupleIndex(LoweringFunctionContext& context,
+                              SemanticsNodeId node_id, SemanticsNode node)
+    -> void {
+  auto [tuple_node_id, index_node_id] = node.GetAsTupleIndex();
   auto* llvm_type =
       context.GetType(context.semantics_ir().GetNode(tuple_node_id).type_id());
   auto index_node = context.semantics_ir().GetNode(index_node_id);
@@ -221,10 +222,10 @@ auto LoweringHandleStringLiteral(LoweringFunctionContext& /*context*/,
   CARBON_FATAL() << "TODO: Add support: " << node;
 }
 
-auto LoweringHandleStructMemberAccess(LoweringFunctionContext& context,
-                                      SemanticsNodeId node_id,
-                                      SemanticsNode node) -> void {
-  auto [struct_id, member_index] = node.GetAsStructMemberAccess();
+auto LoweringHandleStructAccess(LoweringFunctionContext& context,
+                                SemanticsNodeId node_id, SemanticsNode node)
+    -> void {
+  auto [struct_id, member_index] = node.GetAsStructAccess();
   auto struct_type_id = context.semantics_ir().GetNode(struct_id).type_id();
   auto* llvm_type = context.GetType(struct_type_id);
 
diff --git a/toolchain/semantics/semantics_handle_index.cpp b/toolchain/semantics/semantics_handle_index.cpp
index 31b82e5ac407..8d8a682b61a8 100644
--- a/toolchain/semantics/semantics_handle_index.cpp
+++ b/toolchain/semantics/semantics_handle_index.cpp
@@ -44,7 +44,7 @@ auto SemanticsHandleIndexExpression(SemanticsContext& context,
           context.semantics_ir().StringifyType(name_node.type_id()));
     } else {
       context.AddNodeAndPush(
-          parse_node, SemanticsNode::Index::Make(
+          parse_node, SemanticsNode::TupleIndex::Make(
                           parse_node, type_block[index_val.getZExtValue()],
                           name_node_id, index_node_id));
       return true;
diff --git a/toolchain/semantics/semantics_handle_name.cpp b/toolchain/semantics/semantics_handle_name.cpp
index 1cdf61334583..3f0ea604003f 100644
--- a/toolchain/semantics/semantics_handle_name.cpp
+++ b/toolchain/semantics/semantics_handle_name.cpp
@@ -36,7 +36,7 @@ auto SemanticsHandleMemberAccessExpression(SemanticsContext& context,
             name_id == field_name_id) {
           context.AddNodeAndPush(
               parse_node,
-              SemanticsNode::StructMemberAccess::Make(
+              SemanticsNode::StructAccess::Make(
                   parse_node, field_type_id, base_id, SemanticsMemberIndex(i)));
           return true;
         }
diff --git a/toolchain/semantics/semantics_ir.cpp b/toolchain/semantics/semantics_ir.cpp
index 42b6aaeb86d5..b79f0a467c51 100644
--- a/toolchain/semantics/semantics_ir.cpp
+++ b/toolchain/semantics/semantics_ir.cpp
@@ -232,7 +232,6 @@ static auto GetTypePrecedence(SemanticsNodeKind kind) -> int {
     case SemanticsNodeKind::Call:
     case SemanticsNodeKind::Dereference:
     case SemanticsNodeKind::FunctionDeclaration:
-    case SemanticsNodeKind::Index:
     case SemanticsNodeKind::IntegerLiteral:
     case SemanticsNodeKind::Invalid:
     case SemanticsNodeKind::Namespace:
@@ -240,10 +239,11 @@ static auto GetTypePrecedence(SemanticsNodeKind kind) -> int {
     case SemanticsNodeKind::Return:
     case SemanticsNodeKind::ReturnExpression:
     case SemanticsNodeKind::StringLiteral:
-    case SemanticsNodeKind::StructMemberAccess:
+    case SemanticsNodeKind::StructAccess:
     case SemanticsNodeKind::StructTypeField:
     case SemanticsNodeKind::StructValue:
     case SemanticsNodeKind::StubReference:
+    case SemanticsNodeKind::TupleIndex:
     case SemanticsNodeKind::TupleValue:
     case SemanticsNodeKind::UnaryOperatorNot:
     case SemanticsNodeKind::VarStorage:
@@ -376,16 +376,16 @@ auto SemanticsIR::StringifyType(SemanticsTypeId type_id,
       case SemanticsNodeKind::Dereference:
       case SemanticsNodeKind::CrossReference:
       case SemanticsNodeKind::FunctionDeclaration:
-      case SemanticsNodeKind::Index:
       case SemanticsNodeKind::IntegerLiteral:
       case SemanticsNodeKind::Namespace:
       case SemanticsNodeKind::RealLiteral:
       case SemanticsNodeKind::Return:
       case SemanticsNodeKind::ReturnExpression:
       case SemanticsNodeKind::StringLiteral:
-      case SemanticsNodeKind::StructMemberAccess:
+      case SemanticsNodeKind::StructAccess:
       case SemanticsNodeKind::StructValue:
       case SemanticsNodeKind::StubReference:
+      case SemanticsNodeKind::TupleIndex:
       case SemanticsNodeKind::TupleValue:
       case SemanticsNodeKind::UnaryOperatorNot:
       case SemanticsNodeKind::VarStorage:
@@ -464,14 +464,14 @@ auto GetSemanticsExpressionCategory(const SemanticsIR& semantics_ir,
       case SemanticsNodeKind::UnaryOperatorNot:
         return SemanticsExpressionCategory::Value;
 
-      case SemanticsNodeKind::StructMemberAccess: {
-        auto [base_id, member_index] = node.GetAsStructMemberAccess();
+      case SemanticsNodeKind::StructAccess: {
+        auto [base_id, member_index] = node.GetAsStructAccess();
         node_id = base_id;
         continue;
       }
 
-      case SemanticsNodeKind::Index: {
-        auto [base_id, index_id] = node.GetAsIndex();
+      case SemanticsNodeKind::TupleIndex: {
+        auto [base_id, index_id] = node.GetAsTupleIndex();
         node_id = base_id;
         continue;
       }
diff --git a/toolchain/semantics/semantics_ir_formatter.cpp b/toolchain/semantics/semantics_ir_formatter.cpp
index 7caab129457f..6f6b85449df7 100644
--- a/toolchain/semantics/semantics_ir_formatter.cpp
+++ b/toolchain/semantics/semantics_ir_formatter.cpp
@@ -18,10 +18,8 @@ namespace {
 // TODOs / future work ideas:
 // - Add a documentation file for the textual format and link to the
 //   naming section here.
-// - Consider harmonizing `FooLiteral` vs. `foo_value` node names vs.
-//   IR names.
-//   - Also consider representing these as just `value` or `literal`
-//     in the IR and using the type to distinguish.
+// - Consider representing literals as just `literal` in the IR and using the
+//   type to distinguish.
 // - Add block names based on the control flow construct names (`for`,
 //   `if`, `then`, `else`, ...). Either base this on the semantics or
 //   just on the keywords used to build that control flow -- little
diff --git a/toolchain/semantics/semantics_node.h b/toolchain/semantics/semantics_node.h
index a21305920a26..59dc84a8aa18 100644
--- a/toolchain/semantics/semantics_node.h
+++ b/toolchain/semantics/semantics_node.h
@@ -386,9 +386,6 @@ class SemanticsNode {
       FactoryNoType<SemanticsNodeKind::FunctionDeclaration,
                     SemanticsFunctionId /*function_id*/>;
 
-  using Index = Factory<SemanticsNodeKind::Index, SemanticsNodeId /*tuple_id*/,
-                        SemanticsNodeId /*index*/>;
-
   using IntegerLiteral = Factory<SemanticsNodeKind::IntegerLiteral,
                                  SemanticsIntegerLiteralId /*integer_id*/>;
 
@@ -409,9 +406,9 @@ class SemanticsNode {
   using StringLiteral = Factory<SemanticsNodeKind::StringLiteral,
                                 SemanticsStringId /*string_id*/>;
 
-  using StructMemberAccess = Factory<SemanticsNodeKind::StructMemberAccess,
-                                     SemanticsNodeId /*struct_id*/,
-                                     SemanticsMemberIndex /*ref_index*/>;
+  using StructAccess =
+      Factory<SemanticsNodeKind::StructAccess, SemanticsNodeId /*struct_id*/,
+              SemanticsMemberIndex /*ref_index*/>;
 
   using StructType =
       Factory<SemanticsNodeKind::StructType, SemanticsNodeBlockId /*refs_id*/>;
@@ -426,6 +423,10 @@ class SemanticsNode {
   using StubReference =
       Factory<SemanticsNodeKind::StubReference, SemanticsNodeId /*node_id*/>;
 
+  using TupleIndex =
+      Factory<SemanticsNodeKind::TupleIndex, SemanticsNodeId /*tuple_id*/,
+              SemanticsNodeId /*index*/>;
+
   using TupleType =
       Factory<SemanticsNodeKind::TupleType, SemanticsTypeBlockId /*refs_id*/>;
 
diff --git a/toolchain/semantics/semantics_node_kind.def b/toolchain/semantics/semantics_node_kind.def
index bd1d0294e25b..983deef380d8 100644
--- a/toolchain/semantics/semantics_node_kind.def
+++ b/toolchain/semantics/semantics_node_kind.def
@@ -50,7 +50,7 @@ CARBON_SEMANTICS_NODE_KIND_IMPL(Assign, "assign", None, NotTerminator)
 CARBON_SEMANTICS_NODE_KIND_IMPL(BinaryOperatorAdd, "add", Typed, NotTerminator)
 CARBON_SEMANTICS_NODE_KIND_IMPL(BindName, "bind_name", Typed, NotTerminator)
 CARBON_SEMANTICS_NODE_KIND_IMPL(BlockArg, "block_arg", Typed, NotTerminator)
-CARBON_SEMANTICS_NODE_KIND_IMPL(BoolLiteral, "bool_value", Typed, NotTerminator)
+CARBON_SEMANTICS_NODE_KIND_IMPL(BoolLiteral, "bool_literal", Typed, NotTerminator)
 CARBON_SEMANTICS_NODE_KIND_IMPL(Branch, "br", None, Terminator)
 CARBON_SEMANTICS_NODE_KIND_IMPL(BranchIf, "br", None, TerminatorSequence)
 CARBON_SEMANTICS_NODE_KIND_IMPL(BranchWithArg, "br", None, Terminator)
@@ -61,17 +61,17 @@ CARBON_SEMANTICS_NODE_KIND_IMPL(Dereference, "dereference", Typed,
                                 NotTerminator)
 CARBON_SEMANTICS_NODE_KIND_IMPL(FunctionDeclaration, "fn_decl", Untyped,
                                 NotTerminator)
-CARBON_SEMANTICS_NODE_KIND_IMPL(Index, "tuple_index", Typed, NotTerminator)
-CARBON_SEMANTICS_NODE_KIND_IMPL(IntegerLiteral, "int_value", Typed,
+CARBON_SEMANTICS_NODE_KIND_IMPL(IntegerLiteral, "int_literal", Typed,
                                 NotTerminator)
 CARBON_SEMANTICS_NODE_KIND_IMPL(Namespace, "namespace", Untyped, NotTerminator)
 CARBON_SEMANTICS_NODE_KIND_IMPL(PointerType, "ptr_type", Typed, NotTerminator)
-CARBON_SEMANTICS_NODE_KIND_IMPL(RealLiteral, "real_value", Typed, NotTerminator)
+CARBON_SEMANTICS_NODE_KIND_IMPL(RealLiteral, "real_literal", Typed,
+                                NotTerminator)
 CARBON_SEMANTICS_NODE_KIND_IMPL(Return, "return", None, Terminator)
 CARBON_SEMANTICS_NODE_KIND_IMPL(ReturnExpression, "return", None, Terminator)
-CARBON_SEMANTICS_NODE_KIND_IMPL(StringLiteral, "string_value", Typed,
+CARBON_SEMANTICS_NODE_KIND_IMPL(StringLiteral, "string_literal", Typed,
                                 NotTerminator)
-CARBON_SEMANTICS_NODE_KIND_IMPL(StructMemberAccess, "struct_access", Typed,
+CARBON_SEMANTICS_NODE_KIND_IMPL(StructAccess, "struct_access", Typed,
                                 NotTerminator)
 CARBON_SEMANTICS_NODE_KIND_IMPL(StructType, "struct_type", Typed, NotTerminator)
 CARBON_SEMANTICS_NODE_KIND_IMPL(StructTypeField, "struct_type_field", None,
@@ -80,6 +80,7 @@ CARBON_SEMANTICS_NODE_KIND_IMPL(StructValue, "struct_value", Typed,
                                 NotTerminator)
 CARBON_SEMANTICS_NODE_KIND_IMPL(StubReference, "stub_reference", Typed,
                                 NotTerminator)
+CARBON_SEMANTICS_NODE_KIND_IMPL(TupleIndex, "tuple_index", Typed, NotTerminator)
 CARBON_SEMANTICS_NODE_KIND_IMPL(TupleType, "tuple_type", Typed, NotTerminator)
 CARBON_SEMANTICS_NODE_KIND_IMPL(TupleValue, "tuple_value", Typed, NotTerminator)
 CARBON_SEMANTICS_NODE_KIND_IMPL(UnaryOperatorNot, "not", Typed, NotTerminator)
diff --git a/toolchain/semantics/testdata/basics/builtin_types.carbon b/toolchain/semantics/testdata/basics/builtin_types.carbon
index df3a4b1650bc..b9da04af8707 100644
--- a/toolchain/semantics/testdata/basics/builtin_types.carbon
+++ b/toolchain/semantics/testdata/basics/builtin_types.carbon
@@ -73,13 +73,13 @@ var test_type: type = i32;
 // CHECK:STDOUT:
 // CHECK:STDOUT: package {
 // CHECK:STDOUT:   %test_i32: i32 = var
-// CHECK:STDOUT:   %.loc7: i32 = int_value 0
+// CHECK:STDOUT:   %.loc7: i32 = int_literal 0
 // CHECK:STDOUT:   assign %test_i32, %.loc7
 // CHECK:STDOUT:   %test_f64: f64 = var
-// CHECK:STDOUT:   %.loc8: f64 = real_value 1e-1
+// CHECK:STDOUT:   %.loc8: f64 = real_literal 1e-1
 // CHECK:STDOUT:   assign %test_f64, %.loc8
 // CHECK:STDOUT:   %test_str: String = var
-// CHECK:STDOUT:   %.loc9: String = string_value "Test"
+// CHECK:STDOUT:   %.loc9: String = string_literal "Test"
 // CHECK:STDOUT:   assign %test_str, %.loc9
 // CHECK:STDOUT:   %test_type: type = var
 // CHECK:STDOUT:   assign %test_type, i32
diff --git a/toolchain/semantics/testdata/basics/fail_non_type_as_type.carbon b/toolchain/semantics/testdata/basics/fail_non_type_as_type.carbon
index 8a9dd9c6d5dd..28a3523a0fd7 100644
--- a/toolchain/semantics/testdata/basics/fail_non_type_as_type.carbon
+++ b/toolchain/semantics/testdata/basics/fail_non_type_as_type.carbon
@@ -44,6 +44,6 @@ var x: type = 42;
 // CHECK:STDOUT:
 // CHECK:STDOUT: package {
 // CHECK:STDOUT:   %x: type = var
-// CHECK:STDOUT:   %.loc10: i32 = int_value 42
+// CHECK:STDOUT:   %.loc10: i32 = int_literal 42
 // CHECK:STDOUT:   assign %x, <error>
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/basics/parens.carbon b/toolchain/semantics/testdata/basics/parens.carbon
index c79a037de837..a4aed23c15d5 100644
--- a/toolchain/semantics/testdata/basics/parens.carbon
+++ b/toolchain/semantics/testdata/basics/parens.carbon
@@ -46,8 +46,8 @@ var test_i32: i32 = ((1) + (2));
 // CHECK:STDOUT:
 // CHECK:STDOUT: package {
 // CHECK:STDOUT:   %test_i32: i32 = var
-// CHECK:STDOUT:   %.loc7_23: i32 = int_value 1
-// CHECK:STDOUT:   %.loc7_29: i32 = int_value 2
+// CHECK:STDOUT:   %.loc7_23: i32 = int_literal 1
+// CHECK:STDOUT:   %.loc7_29: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc7_26: i32 = add %.loc7_23, %.loc7_29
 // CHECK:STDOUT:   assign %test_i32, %.loc7_26
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/function/call/fail_param_count.carbon b/toolchain/semantics/testdata/function/call/fail_param_count.carbon
index b6d5bdb684b6..767074959551 100644
--- a/toolchain/semantics/testdata/function/call/fail_param_count.carbon
+++ b/toolchain/semantics/testdata/function/call/fail_param_count.carbon
@@ -203,17 +203,17 @@ fn Main() {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Main() {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc18_8.1: i32 = int_value 1
+// CHECK:STDOUT:   %.loc18_8.1: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc18_8.2: i32 = stub_reference %.loc18_8.1
-// CHECK:STDOUT:   %.loc25_8.1: i32 = int_value 0
+// CHECK:STDOUT:   %.loc25_8.1: i32 = int_literal 0
 // CHECK:STDOUT:   %.loc25_8.2: i32 = stub_reference %.loc25_8.1
-// CHECK:STDOUT:   %.loc25_11.1: i32 = int_value 1
+// CHECK:STDOUT:   %.loc25_11.1: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc25_11.2: i32 = stub_reference %.loc25_11.1
-// CHECK:STDOUT:   %.loc40_8.1: i32 = int_value 0
+// CHECK:STDOUT:   %.loc40_8.1: i32 = int_literal 0
 // CHECK:STDOUT:   %.loc40_8.2: i32 = stub_reference %.loc40_8.1
-// CHECK:STDOUT:   %.loc40_11.1: i32 = int_value 1
+// CHECK:STDOUT:   %.loc40_11.1: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc40_11.2: i32 = stub_reference %.loc40_11.1
-// CHECK:STDOUT:   %.loc55_8.1: i32 = int_value 0
+// CHECK:STDOUT:   %.loc55_8.1: i32 = int_literal 0
 // CHECK:STDOUT:   %.loc55_8.2: i32 = stub_reference %.loc55_8.1
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/function/call/fail_param_type.carbon b/toolchain/semantics/testdata/function/call/fail_param_type.carbon
index fa6ec6b76212..42b1a2ab3e13 100644
--- a/toolchain/semantics/testdata/function/call/fail_param_type.carbon
+++ b/toolchain/semantics/testdata/function/call/fail_param_type.carbon
@@ -86,7 +86,7 @@ fn Main() {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Main() {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc16_7.1: f64 = real_value 10e-1
+// CHECK:STDOUT:   %.loc16_7.1: f64 = real_literal 10e-1
 // CHECK:STDOUT:   %.loc16_7.2: f64 = stub_reference %.loc16_7.1
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/function/call/fail_return_type_mismatch.carbon b/toolchain/semantics/testdata/function/call/fail_return_type_mismatch.carbon
index f4ef4a1cdce7..ab04dc2892f4 100644
--- a/toolchain/semantics/testdata/function/call/fail_return_type_mismatch.carbon
+++ b/toolchain/semantics/testdata/function/call/fail_return_type_mismatch.carbon
@@ -72,7 +72,7 @@ fn Run() {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Foo() -> f64 {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc7: f64 = real_value 10e-1
+// CHECK:STDOUT:   %.loc7: f64 = real_literal 10e-1
 // CHECK:STDOUT:   return %.loc7
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
diff --git a/toolchain/semantics/testdata/function/call/i32.carbon b/toolchain/semantics/testdata/function/call/i32.carbon
index 23e652e3d81b..65e51527a2d0 100644
--- a/toolchain/semantics/testdata/function/call/i32.carbon
+++ b/toolchain/semantics/testdata/function/call/i32.carbon
@@ -91,7 +91,7 @@ fn Main() {
 // CHECK:STDOUT: fn @Main() {
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   %b: i32 = var
-// CHECK:STDOUT:   %.loc12_21.1: i32 = int_value 1
+// CHECK:STDOUT:   %.loc12_21.1: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc12_21.2: i32 = stub_reference %.loc12_21.1
 // CHECK:STDOUT:   %.loc12_20: i32 = call @Echo(%.loc12_21.2)
 // CHECK:STDOUT:   assign %b, %.loc12_20
diff --git a/toolchain/semantics/testdata/function/call/more_param_ir.carbon b/toolchain/semantics/testdata/function/call/more_param_ir.carbon
index a0094ed467b9..e56940ce894c 100644
--- a/toolchain/semantics/testdata/function/call/more_param_ir.carbon
+++ b/toolchain/semantics/testdata/function/call/more_param_ir.carbon
@@ -126,17 +126,17 @@ fn Main() {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Main() {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc11_7: i32 = int_value 1
-// CHECK:STDOUT:   %.loc11_11: i32 = int_value 2
+// CHECK:STDOUT:   %.loc11_7: i32 = int_literal 1
+// CHECK:STDOUT:   %.loc11_11: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc11_9: i32 = add %.loc11_7, %.loc11_11
-// CHECK:STDOUT:   %.loc11_15: i32 = int_value 3
+// CHECK:STDOUT:   %.loc11_15: i32 = int_literal 3
 // CHECK:STDOUT:   %.loc11_13.1: i32 = add %.loc11_9, %.loc11_15
 // CHECK:STDOUT:   %.loc11_13.2: i32 = stub_reference %.loc11_13.1
-// CHECK:STDOUT:   %.loc11_18: i32 = int_value 4
-// CHECK:STDOUT:   %.loc11_22: i32 = int_value 5
+// CHECK:STDOUT:   %.loc11_18: i32 = int_literal 4
+// CHECK:STDOUT:   %.loc11_22: i32 = int_literal 5
 // CHECK:STDOUT:   %.loc11_20.1: i32 = add %.loc11_18, %.loc11_22
 // CHECK:STDOUT:   %.loc11_20.2: i32 = stub_reference %.loc11_20.1
-// CHECK:STDOUT:   %.loc11_25.1: i32 = int_value 6
+// CHECK:STDOUT:   %.loc11_25.1: i32 = int_literal 6
 // CHECK:STDOUT:   %.loc11_25.2: i32 = stub_reference %.loc11_25.1
 // CHECK:STDOUT:   %.loc11_6.1: type = tuple_type ()
 // CHECK:STDOUT:   %.loc11_6.2: () = call @Foo(%.loc11_13.2, %.loc11_20.2, %.loc11_25.2)
diff --git a/toolchain/semantics/testdata/function/call/params_one.carbon b/toolchain/semantics/testdata/function/call/params_one.carbon
index 13b1a18c0a73..252495205fa3 100644
--- a/toolchain/semantics/testdata/function/call/params_one.carbon
+++ b/toolchain/semantics/testdata/function/call/params_one.carbon
@@ -86,7 +86,7 @@ fn Main() {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Main() {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc10_7.1: i32 = int_value 1
+// CHECK:STDOUT:   %.loc10_7.1: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc10_7.2: i32 = stub_reference %.loc10_7.1
 // CHECK:STDOUT:   %.loc10_6.1: type = tuple_type ()
 // CHECK:STDOUT:   %.loc10_6.2: () = call @Foo(%.loc10_7.2)
diff --git a/toolchain/semantics/testdata/function/call/params_one_comma.carbon b/toolchain/semantics/testdata/function/call/params_one_comma.carbon
index 596041714848..e1d7d9025a82 100644
--- a/toolchain/semantics/testdata/function/call/params_one_comma.carbon
+++ b/toolchain/semantics/testdata/function/call/params_one_comma.carbon
@@ -97,11 +97,11 @@ fn Main() {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Main() {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc10_7.1: i32 = int_value 1
+// CHECK:STDOUT:   %.loc10_7.1: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc10_7.2: i32 = stub_reference %.loc10_7.1
 // CHECK:STDOUT:   %.loc10_6.1: type = tuple_type ()
 // CHECK:STDOUT:   %.loc10_6.2: () = call @Foo(%.loc10_7.2)
-// CHECK:STDOUT:   %.loc11_7.1: i32 = int_value 1
+// CHECK:STDOUT:   %.loc11_7.1: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc11_7.2: i32 = stub_reference %.loc11_7.1
 // CHECK:STDOUT:   %.loc11_6: () = call @Foo(%.loc11_7.2)
 // CHECK:STDOUT:   return
diff --git a/toolchain/semantics/testdata/function/call/params_two.carbon b/toolchain/semantics/testdata/function/call/params_two.carbon
index 1cd9f0b549b7..da85124cb701 100644
--- a/toolchain/semantics/testdata/function/call/params_two.carbon
+++ b/toolchain/semantics/testdata/function/call/params_two.carbon
@@ -98,9 +98,9 @@ fn Main() {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Main() {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc10_7.1: i32 = int_value 1
+// CHECK:STDOUT:   %.loc10_7.1: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc10_7.2: i32 = stub_reference %.loc10_7.1
-// CHECK:STDOUT:   %.loc10_10.1: i32 = int_value 2
+// CHECK:STDOUT:   %.loc10_10.1: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc10_10.2: i32 = stub_reference %.loc10_10.1
 // CHECK:STDOUT:   %.loc10_6.1: type = tuple_type ()
 // CHECK:STDOUT:   %.loc10_6.2: () = call @Foo(%.loc10_7.2, %.loc10_10.2)
diff --git a/toolchain/semantics/testdata/function/call/params_two_comma.carbon b/toolchain/semantics/testdata/function/call/params_two_comma.carbon
index 0dd54e5005dc..e2c5fc5e6123 100644
--- a/toolchain/semantics/testdata/function/call/params_two_comma.carbon
+++ b/toolchain/semantics/testdata/function/call/params_two_comma.carbon
@@ -115,15 +115,15 @@ fn Main() {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Main() {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc10_7.1: i32 = int_value 1
+// CHECK:STDOUT:   %.loc10_7.1: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc10_7.2: i32 = stub_reference %.loc10_7.1
-// CHECK:STDOUT:   %.loc10_10.1: i32 = int_value 2
+// CHECK:STDOUT:   %.loc10_10.1: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc10_10.2: i32 = stub_reference %.loc10_10.1
 // CHECK:STDOUT:   %.loc10_6.1: type = tuple_type ()
 // CHECK:STDOUT:   %.loc10_6.2: () = call @Foo(%.loc10_7.2, %.loc10_10.2)
-// CHECK:STDOUT:   %.loc11_7.1: i32 = int_value 1
+// CHECK:STDOUT:   %.loc11_7.1: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc11_7.2: i32 = stub_reference %.loc11_7.1
-// CHECK:STDOUT:   %.loc11_10.1: i32 = int_value 2
+// CHECK:STDOUT:   %.loc11_10.1: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc11_10.2: i32 = stub_reference %.loc11_10.1
 // CHECK:STDOUT:   %.loc11_6: () = call @Foo(%.loc11_7.2, %.loc11_10.2)
 // CHECK:STDOUT:   return
diff --git a/toolchain/semantics/testdata/if/fail_reachable_fallthrough.carbon b/toolchain/semantics/testdata/if/fail_reachable_fallthrough.carbon
index 77fdfb274178..4b612a6fcfdf 100644
--- a/toolchain/semantics/testdata/if/fail_reachable_fallthrough.carbon
+++ b/toolchain/semantics/testdata/if/fail_reachable_fallthrough.carbon
@@ -162,7 +162,7 @@ fn If3(b: bool) -> i32 {
 // CHECK:STDOUT:   if %b br !.loc9 else br !.loc8
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc9:
-// CHECK:STDOUT:   %.loc9: i32 = int_value 1
+// CHECK:STDOUT:   %.loc9: i32 = int_literal 1
 // CHECK:STDOUT:   return %.loc9
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc8:
@@ -179,7 +179,7 @@ fn If3(b: bool) -> i32 {
 // CHECK:STDOUT:   br !.1
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc20:
-// CHECK:STDOUT:   %.loc20: i32 = int_value 2
+// CHECK:STDOUT:   %.loc20: i32 = int_literal 2
 // CHECK:STDOUT:   return %.loc20
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.1:
@@ -190,7 +190,7 @@ fn If3(b: bool) -> i32 {
 // CHECK:STDOUT:   if %b br !.loc29 else br !.1
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc29:
-// CHECK:STDOUT:   %.loc29: i32 = int_value 1
+// CHECK:STDOUT:   %.loc29: i32 = int_literal 1
 // CHECK:STDOUT:   return %.loc29
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.1:
diff --git a/toolchain/semantics/testdata/if/fail_scope.carbon b/toolchain/semantics/testdata/if/fail_scope.carbon
index d7a594b2c1b1..984c961997ec 100644
--- a/toolchain/semantics/testdata/if/fail_scope.carbon
+++ b/toolchain/semantics/testdata/if/fail_scope.carbon
@@ -88,7 +88,7 @@ fn VarScope(b: bool) -> i32 {
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc9:
 // CHECK:STDOUT:   %n: i32 = var
-// CHECK:STDOUT:   %.loc9: i32 = int_value 2
+// CHECK:STDOUT:   %.loc9: i32 = int_literal 2
 // CHECK:STDOUT:   assign %n, %.loc9
 // CHECK:STDOUT:   return %n
 // CHECK:STDOUT:
diff --git a/toolchain/semantics/testdata/if/unreachable_fallthrough.carbon b/toolchain/semantics/testdata/if/unreachable_fallthrough.carbon
index e88bbb2f0ef4..a5d6feb77819 100644
--- a/toolchain/semantics/testdata/if/unreachable_fallthrough.carbon
+++ b/toolchain/semantics/testdata/if/unreachable_fallthrough.carbon
@@ -80,10 +80,10 @@ fn If(b: bool) -> i32 {
 // CHECK:STDOUT:   if %b br !.loc9 else br !.loc11
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc9:
-// CHECK:STDOUT:   %.loc9: i32 = int_value 1
+// CHECK:STDOUT:   %.loc9: i32 = int_literal 1
 // CHECK:STDOUT:   return %.loc9
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc11:
-// CHECK:STDOUT:   %.loc11: i32 = int_value 2
+// CHECK:STDOUT:   %.loc11: i32 = int_literal 2
 // CHECK:STDOUT:   return %.loc11
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/if_expression/constant_condition.carbon b/toolchain/semantics/testdata/if_expression/constant_condition.carbon
index ebcdcfec1f6e..6db63cc2e582 100644
--- a/toolchain/semantics/testdata/if_expression/constant_condition.carbon
+++ b/toolchain/semantics/testdata/if_expression/constant_condition.carbon
@@ -130,19 +130,19 @@ fn G() -> i32 {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @A() -> i32 {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc7: i32 = int_value 1
+// CHECK:STDOUT:   %.loc7: i32 = int_literal 1
 // CHECK:STDOUT:   return %.loc7
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @B() -> i32 {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc8: i32 = int_value 2
+// CHECK:STDOUT:   %.loc8: i32 = int_literal 2
 // CHECK:STDOUT:   return %.loc8
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @F() -> i32 {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc11_13: bool = bool_value true
+// CHECK:STDOUT:   %.loc11_13: bool = bool_literal true
 // CHECK:STDOUT:   if %.loc11_13 br !.loc11_24 else br !.loc11_33
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc11_24:
@@ -160,7 +160,7 @@ fn G() -> i32 {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @G() -> i32 {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc15_13: bool = bool_value false
+// CHECK:STDOUT:   %.loc15_13: bool = bool_literal false
 // CHECK:STDOUT:   if %.loc15_13 br !.loc15_25 else br !.loc15_34
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc15_25:
diff --git a/toolchain/semantics/testdata/if_expression/control_flow.carbon b/toolchain/semantics/testdata/if_expression/control_flow.carbon
index b1e73412d38d..0d4c0252e84e 100644
--- a/toolchain/semantics/testdata/if_expression/control_flow.carbon
+++ b/toolchain/semantics/testdata/if_expression/control_flow.carbon
@@ -103,13 +103,13 @@ fn F(b: bool) -> i32 {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @A() -> i32 {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc7: i32 = int_value 1
+// CHECK:STDOUT:   %.loc7: i32 = int_literal 1
 // CHECK:STDOUT:   return %.loc7
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @B() -> i32 {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc8: i32 = int_value 2
+// CHECK:STDOUT:   %.loc8: i32 = int_literal 2
 // CHECK:STDOUT:   return %.loc8
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
diff --git a/toolchain/semantics/testdata/if_expression/nested.carbon b/toolchain/semantics/testdata/if_expression/nested.carbon
index 87ca9994b720..b6acf3ad0fbd 100644
--- a/toolchain/semantics/testdata/if_expression/nested.carbon
+++ b/toolchain/semantics/testdata/if_expression/nested.carbon
@@ -134,11 +134,11 @@ fn F(a: bool, b: bool, c: bool) -> i32 {
 // CHECK:STDOUT:   if %b br !.loc8_30 else br !.loc8_37
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc8_30:
-// CHECK:STDOUT:   %.loc8_30: i32 = int_value 1
+// CHECK:STDOUT:   %.loc8_30: i32 = int_literal 1
 // CHECK:STDOUT:   br !.loc8_20.2(%.loc8_30)
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc8_37:
-// CHECK:STDOUT:   %.loc8_37: i32 = int_value 2
+// CHECK:STDOUT:   %.loc8_37: i32 = int_literal 2
 // CHECK:STDOUT:   br !.loc8_20.2(%.loc8_37)
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc8_20.2:
@@ -149,11 +149,11 @@ fn F(a: bool, b: bool, c: bool) -> i32 {
 // CHECK:STDOUT:   if %c br !.loc8_54 else br !.loc8_61
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc8_54:
-// CHECK:STDOUT:   %.loc8_54: i32 = int_value 3
+// CHECK:STDOUT:   %.loc8_54: i32 = int_literal 3
 // CHECK:STDOUT:   br !.loc8_44.2(%.loc8_54)
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc8_61:
-// CHECK:STDOUT:   %.loc8_61: i32 = int_value 4
+// CHECK:STDOUT:   %.loc8_61: i32 = int_literal 4
 // CHECK:STDOUT:   br !.loc8_44.2(%.loc8_61)
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc8_44.2:
diff --git a/toolchain/semantics/testdata/index/element_access.carbon b/toolchain/semantics/testdata/index/element_access.carbon
index 1920052024fc..8445c90b845d 100644
--- a/toolchain/semantics/testdata/index/element_access.carbon
+++ b/toolchain/semantics/testdata/index/element_access.carbon
@@ -54,7 +54,7 @@ var c: i32 = b[0];
 // CHECK:STDOUT:   {kind: VarStorage, type: type1},
 // CHECK:STDOUT:   {kind: BindName, arg0: str2, arg1: node+15, type: type1},
 // CHECK:STDOUT:   {kind: IntegerLiteral, arg0: int1, type: type1},
-// CHECK:STDOUT:   {kind: Index, arg0: node+12, arg1: node+17, type: type1},
+// CHECK:STDOUT:   {kind: TupleIndex, arg0: node+12, arg1: node+17, type: type1},
 // CHECK:STDOUT:   {kind: Assign, arg0: node+15, arg1: node+18},
 // CHECK:STDOUT: ]
 // CHECK:STDOUT: node_blocks: [
@@ -99,7 +99,7 @@ var c: i32 = b[0];
 // CHECK:STDOUT:   %.loc7_13.2: (type,) = tuple_value (%.loc7_9)
 // CHECK:STDOUT:   %.loc7_13.3: type = tuple_type (i32)
 // CHECK:STDOUT:   %a: (i32,) = var
-// CHECK:STDOUT:   %.loc7_18.1: i32 = int_value 12
+// CHECK:STDOUT:   %.loc7_18.1: i32 = int_literal 12
 // CHECK:STDOUT:   %.loc7_18.2: i32 = stub_reference %.loc7_18.1
 // CHECK:STDOUT:   %.loc7_21: (i32,) = tuple_value (%.loc7_18.2)
 // CHECK:STDOUT:   assign %a, %.loc7_21
@@ -108,7 +108,7 @@ var c: i32 = b[0];
 // CHECK:STDOUT:   %b: (i32,) = var
 // CHECK:STDOUT:   assign %b, %a
 // CHECK:STDOUT:   %c: i32 = var
-// CHECK:STDOUT:   %.loc9_16: i32 = int_value 0
+// CHECK:STDOUT:   %.loc9_16: i32 = int_literal 0
 // CHECK:STDOUT:   %.loc9_17: i32 = tuple_index %b, %.loc9_16
 // CHECK:STDOUT:   assign %c, %.loc9_17
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/index/fail_empty_tuple_access.carbon b/toolchain/semantics/testdata/index/fail_empty_tuple_access.carbon
index 589c07486511..3664b0e412c5 100644
--- a/toolchain/semantics/testdata/index/fail_empty_tuple_access.carbon
+++ b/toolchain/semantics/testdata/index/fail_empty_tuple_access.carbon
@@ -76,6 +76,6 @@ fn Run() {
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   %.loc13_4.1: type = tuple_type ()
 // CHECK:STDOUT:   %.loc13_4.2: () = call @F()
-// CHECK:STDOUT:   %.loc13_7: i32 = int_value 0
+// CHECK:STDOUT:   %.loc13_7: i32 = int_literal 0
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/index/fail_large_index.carbon b/toolchain/semantics/testdata/index/fail_large_index.carbon
index cc3e028267ed..786ce8e90e84 100644
--- a/toolchain/semantics/testdata/index/fail_large_index.carbon
+++ b/toolchain/semantics/testdata/index/fail_large_index.carbon
@@ -100,7 +100,7 @@ var c: i32 = b[0xFFFFFFFFFFFFFFFFF];
 // CHECK:STDOUT:   %.loc7_13.2: (type,) = tuple_value (%.loc7_9)
 // CHECK:STDOUT:   %.loc7_13.3: type = tuple_type (i32)
 // CHECK:STDOUT:   %a: (i32,) = var
-// CHECK:STDOUT:   %.loc7_18.1: i32 = int_value 12
+// CHECK:STDOUT:   %.loc7_18.1: i32 = int_literal 12
 // CHECK:STDOUT:   %.loc7_18.2: i32 = stub_reference %.loc7_18.1
 // CHECK:STDOUT:   %.loc7_21: (i32,) = tuple_value (%.loc7_18.2)
 // CHECK:STDOUT:   assign %a, %.loc7_21
@@ -109,6 +109,6 @@ var c: i32 = b[0xFFFFFFFFFFFFFFFFF];
 // CHECK:STDOUT:   %b: (i32,) = var
 // CHECK:STDOUT:   assign %b, %a
 // CHECK:STDOUT:   %c: i32 = var
-// CHECK:STDOUT:   %.loc12: i32 = int_value -1
+// CHECK:STDOUT:   %.loc12: i32 = int_literal -1
 // CHECK:STDOUT:   assign %c, <error>
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/index/fail_name_not_found.carbon b/toolchain/semantics/testdata/index/fail_name_not_found.carbon
index 6b070bba4fc2..f437b5147cc8 100644
--- a/toolchain/semantics/testdata/index/fail_name_not_found.carbon
+++ b/toolchain/semantics/testdata/index/fail_name_not_found.carbon
@@ -60,7 +60,7 @@ fn Main() {
 // CHECK:STDOUT: fn @Main() {
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   %b: i32 = var
-// CHECK:STDOUT:   %.loc11: i32 = int_value 0
+// CHECK:STDOUT:   %.loc11: i32 = int_literal 0
 // CHECK:STDOUT:   assign %b, <error>
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/index/fail_non_deterministic_type.carbon b/toolchain/semantics/testdata/index/fail_non_deterministic_type.carbon
index aeb4b43a272f..d5c13fc308c8 100644
--- a/toolchain/semantics/testdata/index/fail_non_deterministic_type.carbon
+++ b/toolchain/semantics/testdata/index/fail_non_deterministic_type.carbon
@@ -105,14 +105,14 @@ var c: i32 = a[b];
 // CHECK:STDOUT:   %.loc7_17.2: (type, type) = tuple_value (%.loc7_9, %.loc7_14)
 // CHECK:STDOUT:   %.loc7_17.3: type = tuple_type (i32, i32)
 // CHECK:STDOUT:   %a: (i32, i32) = var
-// CHECK:STDOUT:   %.loc7_22.1: i32 = int_value 2
+// CHECK:STDOUT:   %.loc7_22.1: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc7_22.2: i32 = stub_reference %.loc7_22.1
-// CHECK:STDOUT:   %.loc7_25.1: i32 = int_value 3
+// CHECK:STDOUT:   %.loc7_25.1: i32 = int_literal 3
 // CHECK:STDOUT:   %.loc7_25.2: i32 = stub_reference %.loc7_25.1
 // CHECK:STDOUT:   %.loc7_26: (i32, i32) = tuple_value (%.loc7_22.2, %.loc7_25.2)
 // CHECK:STDOUT:   assign %a, %.loc7_26
 // CHECK:STDOUT:   %b: i32 = var
-// CHECK:STDOUT:   %.loc8: i32 = int_value 0
+// CHECK:STDOUT:   %.loc8: i32 = int_literal 0
 // CHECK:STDOUT:   assign %b, %.loc8
 // CHECK:STDOUT:   %c: i32 = var
 // CHECK:STDOUT:   assign %c, <error>
diff --git a/toolchain/semantics/testdata/index/fail_non_int_indexing.carbon b/toolchain/semantics/testdata/index/fail_non_int_indexing.carbon
index e3c4400e6974..e3d2fc94f554 100644
--- a/toolchain/semantics/testdata/index/fail_non_int_indexing.carbon
+++ b/toolchain/semantics/testdata/index/fail_non_int_indexing.carbon
@@ -98,13 +98,13 @@ var b: i32 = a[2.6];
 // CHECK:STDOUT:   %.loc7_17.2: (type, type) = tuple_value (%.loc7_9, %.loc7_14)
 // CHECK:STDOUT:   %.loc7_17.3: type = tuple_type (i32, i32)
 // CHECK:STDOUT:   %a: (i32, i32) = var
-// CHECK:STDOUT:   %.loc7_22.1: i32 = int_value 12
+// CHECK:STDOUT:   %.loc7_22.1: i32 = int_literal 12
 // CHECK:STDOUT:   %.loc7_22.2: i32 = stub_reference %.loc7_22.1
-// CHECK:STDOUT:   %.loc7_26.1: i32 = int_value 6
+// CHECK:STDOUT:   %.loc7_26.1: i32 = int_literal 6
 // CHECK:STDOUT:   %.loc7_26.2: i32 = stub_reference %.loc7_26.1
 // CHECK:STDOUT:   %.loc7_27: (i32, i32) = tuple_value (%.loc7_22.2, %.loc7_26.2)
 // CHECK:STDOUT:   assign %a, %.loc7_27
 // CHECK:STDOUT:   %b: i32 = var
-// CHECK:STDOUT:   %.loc11: f64 = real_value 26e-1
+// CHECK:STDOUT:   %.loc11: f64 = real_literal 26e-1
 // CHECK:STDOUT:   assign %b, <error>
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/index/fail_non_tuple_access.carbon b/toolchain/semantics/testdata/index/fail_non_tuple_access.carbon
index 001ffb568235..c8fc3526ba2a 100644
--- a/toolchain/semantics/testdata/index/fail_non_tuple_access.carbon
+++ b/toolchain/semantics/testdata/index/fail_non_tuple_access.carbon
@@ -54,7 +54,7 @@ fn Main() {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Main() {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc11_3: i32 = int_value 0
-// CHECK:STDOUT:   %.loc11_5: i32 = int_value 1
+// CHECK:STDOUT:   %.loc11_3: i32 = int_literal 0
+// CHECK:STDOUT:   %.loc11_5: i32 = int_literal 1
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/index/fail_out_of_bound_access.carbon b/toolchain/semantics/testdata/index/fail_out_of_bound_access.carbon
index b2afc0fb89e8..ef0e1eb62af7 100644
--- a/toolchain/semantics/testdata/index/fail_out_of_bound_access.carbon
+++ b/toolchain/semantics/testdata/index/fail_out_of_bound_access.carbon
@@ -97,13 +97,13 @@ var b: i32 = a[2];
 // CHECK:STDOUT:   %.loc7_17.2: (type, type) = tuple_value (%.loc7_9, %.loc7_14)
 // CHECK:STDOUT:   %.loc7_17.3: type = tuple_type (i32, i32)
 // CHECK:STDOUT:   %a: (i32, i32) = var
-// CHECK:STDOUT:   %.loc7_22.1: i32 = int_value 12
+// CHECK:STDOUT:   %.loc7_22.1: i32 = int_literal 12
 // CHECK:STDOUT:   %.loc7_22.2: i32 = stub_reference %.loc7_22.1
-// CHECK:STDOUT:   %.loc7_26.1: i32 = int_value 6
+// CHECK:STDOUT:   %.loc7_26.1: i32 = int_literal 6
 // CHECK:STDOUT:   %.loc7_26.2: i32 = stub_reference %.loc7_26.1
 // CHECK:STDOUT:   %.loc7_27: (i32, i32) = tuple_value (%.loc7_22.2, %.loc7_26.2)
 // CHECK:STDOUT:   assign %a, %.loc7_27
 // CHECK:STDOUT:   %b: i32 = var
-// CHECK:STDOUT:   %.loc11: i32 = int_value 2
+// CHECK:STDOUT:   %.loc11: i32 = int_literal 2
 // CHECK:STDOUT:   assign %b, <error>
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/index/return_value_access.carbon b/toolchain/semantics/testdata/index/return_value_access.carbon
index 9e0c54b50683..3972bc0e00d4 100644
--- a/toolchain/semantics/testdata/index/return_value_access.carbon
+++ b/toolchain/semantics/testdata/index/return_value_access.carbon
@@ -51,7 +51,7 @@ fn Run() -> i32 {
 // CHECK:STDOUT:   {kind: FunctionDeclaration, arg0: function1},
 // CHECK:STDOUT:   {kind: Call, arg0: block0, arg1: function0, type: type2},
 // CHECK:STDOUT:   {kind: IntegerLiteral, arg0: int1, type: type1},
-// CHECK:STDOUT:   {kind: Index, arg0: node+10, arg1: node+11, type: type1},
+// CHECK:STDOUT:   {kind: TupleIndex, arg0: node+10, arg1: node+11, type: type1},
 // CHECK:STDOUT:   {kind: ReturnExpression, arg0: node+12},
 // CHECK:STDOUT: ]
 // CHECK:STDOUT: node_blocks: [
@@ -96,7 +96,7 @@ fn Run() -> i32 {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @F() -> (i32,) {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc7_28.1: i32 = int_value 0
+// CHECK:STDOUT:   %.loc7_28.1: i32 = int_literal 0
 // CHECK:STDOUT:   %.loc7_28.2: i32 = stub_reference %.loc7_28.1
 // CHECK:STDOUT:   %.loc7_30: (i32,) = tuple_value (%.loc7_28.2)
 // CHECK:STDOUT:   return %.loc7_30
@@ -105,7 +105,7 @@ fn Run() -> i32 {
 // CHECK:STDOUT: fn @Run() -> i32 {
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   %.loc10_11: (i32,) = call @F()
-// CHECK:STDOUT:   %.loc10_14: i32 = int_value 0
+// CHECK:STDOUT:   %.loc10_14: i32 = int_literal 0
 // CHECK:STDOUT:   %.loc10_15: i32 = tuple_index %.loc10_11, %.loc10_14
 // CHECK:STDOUT:   return %.loc10_15
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/ir/duplicate_name_same_line.carbon b/toolchain/semantics/testdata/ir/duplicate_name_same_line.carbon
index 110bee298d2c..31fdbcd93013 100644
--- a/toolchain/semantics/testdata/ir/duplicate_name_same_line.carbon
+++ b/toolchain/semantics/testdata/ir/duplicate_name_same_line.carbon
@@ -76,14 +76,14 @@ fn A() { var n: i32 = 1; if (true) { var n: i32 = 2; } }
 // CHECK:STDOUT: fn @A() {
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   %n.loc7_14: i32 = var
-// CHECK:STDOUT:   %.loc7_23: i32 = int_value 1
+// CHECK:STDOUT:   %.loc7_23: i32 = int_literal 1
 // CHECK:STDOUT:   assign %n.loc7_14, %.loc7_23
-// CHECK:STDOUT:   %.loc7_30: bool = bool_value true
+// CHECK:STDOUT:   %.loc7_30: bool = bool_literal true
 // CHECK:STDOUT:   if %.loc7_30 br !.loc7_42 else br !.loc7_56
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc7_42:
 // CHECK:STDOUT:   %n.loc7_42: i32 = var
-// CHECK:STDOUT:   %.loc7_51: i32 = int_value 2
+// CHECK:STDOUT:   %.loc7_51: i32 = int_literal 2
 // CHECK:STDOUT:   assign %n.loc7_42, %.loc7_51
 // CHECK:STDOUT:   br !.loc7_56
 // CHECK:STDOUT:
diff --git a/toolchain/semantics/testdata/operators/and.carbon b/toolchain/semantics/testdata/operators/and.carbon
index 19c4686d4968..67b83e890251 100644
--- a/toolchain/semantics/testdata/operators/and.carbon
+++ b/toolchain/semantics/testdata/operators/and.carbon
@@ -88,20 +88,20 @@ fn And() -> bool {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @F() -> bool {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc7: bool = bool_value true
+// CHECK:STDOUT:   %.loc7: bool = bool_literal true
 // CHECK:STDOUT:   return %.loc7
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @G() -> bool {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc8: bool = bool_value true
+// CHECK:STDOUT:   %.loc8: bool = bool_literal true
 // CHECK:STDOUT:   return %.loc8
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @And() -> bool {
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   %.loc11_11: bool = call @F()
-// CHECK:STDOUT:   %.loc11_14.1: bool = bool_value false
+// CHECK:STDOUT:   %.loc11_14.1: bool = bool_literal false
 // CHECK:STDOUT:   if %.loc11_11 br !.loc11_19 else br !.loc11_14(%.loc11_14.1)
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc11_19:
diff --git a/toolchain/semantics/testdata/operators/assignment.carbon b/toolchain/semantics/testdata/operators/assignment.carbon
index 473f961ebcd2..4a0062775d4a 100644
--- a/toolchain/semantics/testdata/operators/assignment.carbon
+++ b/toolchain/semantics/testdata/operators/assignment.carbon
@@ -91,11 +91,11 @@ fn Main() {
 // CHECK:STDOUT:   {kind: TupleValue, arg0: block4, type: type2},
 // CHECK:STDOUT:   {kind: Assign, arg0: node+12, arg1: node+18},
 // CHECK:STDOUT:   {kind: IntegerLiteral, arg0: int4, type: type0},
-// CHECK:STDOUT:   {kind: Index, arg0: node+12, arg1: node+20, type: type0},
+// CHECK:STDOUT:   {kind: TupleIndex, arg0: node+12, arg1: node+20, type: type0},
 // CHECK:STDOUT:   {kind: IntegerLiteral, arg0: int5, type: type0},
 // CHECK:STDOUT:   {kind: Assign, arg0: node+21, arg1: node+22},
 // CHECK:STDOUT:   {kind: IntegerLiteral, arg0: int6, type: type0},
-// CHECK:STDOUT:   {kind: Index, arg0: node+12, arg1: node+24, type: type0},
+// CHECK:STDOUT:   {kind: TupleIndex, arg0: node+12, arg1: node+24, type: type0},
 // CHECK:STDOUT:   {kind: IntegerLiteral, arg0: int7, type: type0},
 // CHECK:STDOUT:   {kind: Assign, arg0: node+25, arg1: node+26},
 // CHECK:STDOUT:   {kind: StructTypeField, arg0: str1, arg1: type0},
@@ -111,10 +111,10 @@ fn Main() {
 // CHECK:STDOUT:   {kind: StubReference, arg0: node+36, type: type0},
 // CHECK:STDOUT:   {kind: StructValue, arg0: block7, type: type3},
 // CHECK:STDOUT:   {kind: Assign, arg0: node+31, arg1: node+39},
-// CHECK:STDOUT:   {kind: StructMemberAccess, arg0: node+31, arg1: member0, type: type0},
+// CHECK:STDOUT:   {kind: StructAccess, arg0: node+31, arg1: member0, type: type0},
 // CHECK:STDOUT:   {kind: IntegerLiteral, arg0: int10, type: type0},
 // CHECK:STDOUT:   {kind: Assign, arg0: node+41, arg1: node+42},
-// CHECK:STDOUT:   {kind: StructMemberAccess, arg0: node+31, arg1: member1, type: type0},
+// CHECK:STDOUT:   {kind: StructAccess, arg0: node+31, arg1: member1, type: type0},
 // CHECK:STDOUT:   {kind: IntegerLiteral, arg0: int11, type: type0},
 // CHECK:STDOUT:   {kind: Assign, arg0: node+44, arg1: node+45},
 // CHECK:STDOUT:   {kind: PointerType, arg0: type0, type: typeTypeType},
@@ -243,9 +243,9 @@ fn Main() {
 // CHECK:STDOUT: fn @Main() {
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   %a: i32 = var
-// CHECK:STDOUT:   %.loc8: i32 = int_value 12
+// CHECK:STDOUT:   %.loc8: i32 = int_literal 12
 // CHECK:STDOUT:   assign %a, %.loc8
-// CHECK:STDOUT:   %.loc9: i32 = int_value -7
+// CHECK:STDOUT:   %.loc9: i32 = int_literal -7
 // CHECK:STDOUT:   assign %a, %.loc9
 // CHECK:STDOUT:   %.loc11_11: type = stub_reference i32
 // CHECK:STDOUT:   %.loc11_16: type = stub_reference i32
@@ -253,42 +253,42 @@ fn Main() {
 // CHECK:STDOUT:   %.loc11_19.2: (type, type) = tuple_value (%.loc11_11, %.loc11_16)
 // CHECK:STDOUT:   %.loc11_19.3: type = tuple_type (i32, i32)
 // CHECK:STDOUT:   %b: (i32, i32) = var
-// CHECK:STDOUT:   %.loc11_24.1: i32 = int_value 1
+// CHECK:STDOUT:   %.loc11_24.1: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc11_24.2: i32 = stub_reference %.loc11_24.1
-// CHECK:STDOUT:   %.loc11_27.1: i32 = int_value 2
+// CHECK:STDOUT:   %.loc11_27.1: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc11_27.2: i32 = stub_reference %.loc11_27.1
 // CHECK:STDOUT:   %.loc11_28: (i32, i32) = tuple_value (%.loc11_24.2, %.loc11_27.2)
 // CHECK:STDOUT:   assign %b, %.loc11_28
-// CHECK:STDOUT:   %.loc12_5: i32 = int_value 0
+// CHECK:STDOUT:   %.loc12_5: i32 = int_literal 0
 // CHECK:STDOUT:   %.loc12_6: i32 = tuple_index %b, %.loc12_5
-// CHECK:STDOUT:   %.loc12_10: i32 = int_value 3
+// CHECK:STDOUT:   %.loc12_10: i32 = int_literal 3
 // CHECK:STDOUT:   assign %.loc12_6, %.loc12_10
-// CHECK:STDOUT:   %.loc13_5: i32 = int_value 1
+// CHECK:STDOUT:   %.loc13_5: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc13_6: i32 = tuple_index %b, %.loc13_5
-// CHECK:STDOUT:   %.loc13_10: i32 = int_value 4
+// CHECK:STDOUT:   %.loc13_10: i32 = int_literal 4
 // CHECK:STDOUT:   assign %.loc13_6, %.loc13_10
 // CHECK:STDOUT:   %.loc15_27: type = struct_type {.a: i32, .b: i32}
 // CHECK:STDOUT:   %c: {.a: i32, .b: i32} = var
-// CHECK:STDOUT:   %.loc15_37: i32 = int_value 1
+// CHECK:STDOUT:   %.loc15_37: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc15_35: i32 = stub_reference %.loc15_37
-// CHECK:STDOUT:   %.loc15_45: i32 = int_value 2
+// CHECK:STDOUT:   %.loc15_45: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc15_43: i32 = stub_reference %.loc15_45
 // CHECK:STDOUT:   %.loc15_46: {.a: i32, .b: i32} = struct_value (%.loc15_35, %.loc15_43)
 // CHECK:STDOUT:   assign %c, %.loc15_46
 // CHECK:STDOUT:   %.loc16_4: i32 = struct_access %c, member0
-// CHECK:STDOUT:   %.loc16_9: i32 = int_value 3
+// CHECK:STDOUT:   %.loc16_9: i32 = int_literal 3
 // CHECK:STDOUT:   assign %.loc16_4, %.loc16_9
 // CHECK:STDOUT:   %.loc17_4: i32 = struct_access %c, member1
-// CHECK:STDOUT:   %.loc17_9: i32 = int_value 4
+// CHECK:STDOUT:   %.loc17_9: i32 = int_literal 4
 // CHECK:STDOUT:   assign %.loc17_4, %.loc17_9
 // CHECK:STDOUT:   %.loc19_13: type = ptr_type i32
 // CHECK:STDOUT:   %p: i32* = var
 // CHECK:STDOUT:   %.loc19_17: i32* = address_of %a
 // CHECK:STDOUT:   assign %p, %.loc19_17
 // CHECK:STDOUT:   %.loc20_3: i32 = dereference %p
-// CHECK:STDOUT:   %.loc20_8: i32 = int_value 5
+// CHECK:STDOUT:   %.loc20_8: i32 = int_literal 5
 // CHECK:STDOUT:   assign %.loc20_3, %.loc20_8
-// CHECK:STDOUT:   %.loc22_8: bool = bool_value true
+// CHECK:STDOUT:   %.loc22_8: bool = bool_literal true
 // CHECK:STDOUT:   if %.loc22_8 br !.loc22_5.1 else br !.loc22_25
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc22_5.1:
@@ -301,7 +301,7 @@ fn Main() {
 // CHECK:STDOUT: !.loc22_5.2:
 // CHECK:STDOUT:   %.loc22_5: i32* = block_arg !.loc22_5.2
 // CHECK:STDOUT:   %.loc22_3: i32 = dereference %.loc22_5
-// CHECK:STDOUT:   %.loc22_31: i32 = int_value 10
+// CHECK:STDOUT:   %.loc22_31: i32 = int_literal 10
 // CHECK:STDOUT:   assign %.loc22_3, %.loc22_31
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/operators/binary_op.carbon b/toolchain/semantics/testdata/operators/binary_op.carbon
index 9b3caa65a228..c668ee876684 100644
--- a/toolchain/semantics/testdata/operators/binary_op.carbon
+++ b/toolchain/semantics/testdata/operators/binary_op.carbon
@@ -53,8 +53,8 @@ fn Main() -> i32 {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Main() -> i32 {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc8_10: i32 = int_value 12
-// CHECK:STDOUT:   %.loc8_15: i32 = int_value 34
+// CHECK:STDOUT:   %.loc8_10: i32 = int_literal 12
+// CHECK:STDOUT:   %.loc8_15: i32 = int_literal 34
 // CHECK:STDOUT:   %.loc8_13: i32 = add %.loc8_10, %.loc8_15
 // CHECK:STDOUT:   return %.loc8_13
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/operators/fail_assigment_to_non_assignable.carbon b/toolchain/semantics/testdata/operators/fail_assigment_to_non_assignable.carbon
index dff50409dcee..aac237d8fdd3 100644
--- a/toolchain/semantics/testdata/operators/fail_assigment_to_non_assignable.carbon
+++ b/toolchain/semantics/testdata/operators/fail_assigment_to_non_assignable.carbon
@@ -296,67 +296,67 @@ fn Main() {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Main() {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc13_3: i32 = int_value 1
-// CHECK:STDOUT:   %.loc13_7: i32 = int_value 2
+// CHECK:STDOUT:   %.loc13_3: i32 = int_literal 1
+// CHECK:STDOUT:   %.loc13_7: i32 = int_literal 2
 // CHECK:STDOUT:   assign %.loc13_3, %.loc13_7
 // CHECK:STDOUT:   %.loc17_4: i32 = call @F()
-// CHECK:STDOUT:   %.loc17_9: i32 = int_value 1
+// CHECK:STDOUT:   %.loc17_9: i32 = int_literal 1
 // CHECK:STDOUT:   assign %.loc17_4, %.loc17_9
-// CHECK:STDOUT:   %.loc21_4.1: i32 = int_value 1
+// CHECK:STDOUT:   %.loc21_4.1: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc21_4.2: i32 = stub_reference %.loc21_4.1
-// CHECK:STDOUT:   %.loc21_7.1: i32 = int_value 2
+// CHECK:STDOUT:   %.loc21_7.1: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc21_7.2: i32 = stub_reference %.loc21_7.1
 // CHECK:STDOUT:   %.loc21_8.1: type = tuple_type (i32, i32)
 // CHECK:STDOUT:   %.loc21_8.2: (i32, i32) = tuple_value (%.loc21_4.2, %.loc21_7.2)
-// CHECK:STDOUT:   %.loc21_13.1: i32 = int_value 3
+// CHECK:STDOUT:   %.loc21_13.1: i32 = int_literal 3
 // CHECK:STDOUT:   %.loc21_13.2: i32 = stub_reference %.loc21_13.1
-// CHECK:STDOUT:   %.loc21_16.1: i32 = int_value 4
+// CHECK:STDOUT:   %.loc21_16.1: i32 = int_literal 4
 // CHECK:STDOUT:   %.loc21_16.2: i32 = stub_reference %.loc21_16.1
 // CHECK:STDOUT:   %.loc21_17: (i32, i32) = tuple_value (%.loc21_13.2, %.loc21_16.2)
 // CHECK:STDOUT:   assign %.loc21_8.2, %.loc21_17
 // CHECK:STDOUT:   %n: i32 = var
-// CHECK:STDOUT:   %.loc22: i32 = int_value 0
+// CHECK:STDOUT:   %.loc22: i32 = int_literal 0
 // CHECK:STDOUT:   assign %n, %.loc22
 // CHECK:STDOUT:   %.loc26_4: i32 = stub_reference %n
 // CHECK:STDOUT:   %.loc26_7: i32 = stub_reference %n
 // CHECK:STDOUT:   %.loc26_8: (i32, i32) = tuple_value (%.loc26_4, %.loc26_7)
-// CHECK:STDOUT:   %.loc26_13.1: i32 = int_value 1
+// CHECK:STDOUT:   %.loc26_13.1: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc26_13.2: i32 = stub_reference %.loc26_13.1
-// CHECK:STDOUT:   %.loc26_16.1: i32 = int_value 2
+// CHECK:STDOUT:   %.loc26_16.1: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc26_16.2: i32 = stub_reference %.loc26_16.1
 // CHECK:STDOUT:   %.loc26_17: (i32, i32) = tuple_value (%.loc26_13.2, %.loc26_16.2)
 // CHECK:STDOUT:   assign %.loc26_8, %.loc26_17
 // CHECK:STDOUT:   %.loc30: type = ptr_type i32
 // CHECK:STDOUT:   assign i32, %.loc30
-// CHECK:STDOUT:   %.loc34_9: i32 = int_value 1
+// CHECK:STDOUT:   %.loc34_9: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc34_7: i32 = stub_reference %.loc34_9
-// CHECK:STDOUT:   %.loc34_17: i32 = int_value 2
+// CHECK:STDOUT:   %.loc34_17: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc34_15: i32 = stub_reference %.loc34_17
 // CHECK:STDOUT:   %.loc34_18.1: type = struct_type {.x: i32, .y: i32}
 // CHECK:STDOUT:   %.loc34_18.2: {.x: i32, .y: i32} = struct_value (%.loc34_7, %.loc34_15)
-// CHECK:STDOUT:   %.loc34_28: i32 = int_value 3
+// CHECK:STDOUT:   %.loc34_28: i32 = int_literal 3
 // CHECK:STDOUT:   %.loc34_26: i32 = stub_reference %.loc34_28
-// CHECK:STDOUT:   %.loc34_36: i32 = int_value 4
+// CHECK:STDOUT:   %.loc34_36: i32 = int_literal 4
 // CHECK:STDOUT:   %.loc34_34: i32 = stub_reference %.loc34_36
 // CHECK:STDOUT:   %.loc34_37: {.x: i32, .y: i32} = struct_value (%.loc34_26, %.loc34_34)
 // CHECK:STDOUT:   assign %.loc34_18.2, %.loc34_37
-// CHECK:STDOUT:   %.loc38_7: bool = bool_value true
+// CHECK:STDOUT:   %.loc38_7: bool = bool_literal true
 // CHECK:STDOUT:   if %.loc38_7 br !.loc38_17 else br !.loc38_24
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc38_17:
-// CHECK:STDOUT:   %.loc38_17: i32 = int_value 1
+// CHECK:STDOUT:   %.loc38_17: i32 = int_literal 1
 // CHECK:STDOUT:   br !.loc38_4(%.loc38_17)
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc38_24:
-// CHECK:STDOUT:   %.loc38_24: i32 = int_value 2
+// CHECK:STDOUT:   %.loc38_24: i32 = int_literal 2
 // CHECK:STDOUT:   br !.loc38_4(%.loc38_24)
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc38_4:
 // CHECK:STDOUT:   %.loc38_4: i32 = block_arg !.loc38_4
-// CHECK:STDOUT:   %.loc38_29: i32 = int_value 3
+// CHECK:STDOUT:   %.loc38_29: i32 = int_literal 3
 // CHECK:STDOUT:   assign %.loc38_4, %.loc38_29
 // CHECK:STDOUT:   %a: i32 = var
-// CHECK:STDOUT:   %.loc45_7: bool = bool_value true
+// CHECK:STDOUT:   %.loc45_7: bool = bool_literal true
 // CHECK:STDOUT:   if %.loc45_7 br !.loc45_4.1 else br !.loc45_4.2
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc45_4.1:
@@ -367,7 +367,7 @@ fn Main() {
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc45_4.3:
 // CHECK:STDOUT:   %.loc45_4: i32 = block_arg !.loc45_4.3
-// CHECK:STDOUT:   %.loc45_29: i32 = int_value 10
+// CHECK:STDOUT:   %.loc45_29: i32 = int_literal 10
 // CHECK:STDOUT:   assign %.loc45_4, %.loc45_29
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/operators/fail_type_mismatch.carbon b/toolchain/semantics/testdata/operators/fail_type_mismatch.carbon
index 7549495fa0db..eb26acddc3f0 100644
--- a/toolchain/semantics/testdata/operators/fail_type_mismatch.carbon
+++ b/toolchain/semantics/testdata/operators/fail_type_mismatch.carbon
@@ -57,8 +57,8 @@ fn Main() -> i32 {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Main() -> i32 {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc11_10: i32 = int_value 12
-// CHECK:STDOUT:   %.loc11_15: f64 = real_value 34e-1
+// CHECK:STDOUT:   %.loc11_10: i32 = int_literal 12
+// CHECK:STDOUT:   %.loc11_15: f64 = real_literal 34e-1
 // CHECK:STDOUT:   %.loc11_13: <error> = add <error>, %.loc11_15
 // CHECK:STDOUT:   return <error>
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/operators/fail_type_mismatch_assignment.carbon b/toolchain/semantics/testdata/operators/fail_type_mismatch_assignment.carbon
index 1d9942f4d730..49099af61deb 100644
--- a/toolchain/semantics/testdata/operators/fail_type_mismatch_assignment.carbon
+++ b/toolchain/semantics/testdata/operators/fail_type_mismatch_assignment.carbon
@@ -66,9 +66,9 @@ fn Main() {
 // CHECK:STDOUT: fn @Main() {
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   %a: i32 = var
-// CHECK:STDOUT:   %.loc8: i32 = int_value 3
+// CHECK:STDOUT:   %.loc8: i32 = int_literal 3
 // CHECK:STDOUT:   assign %a, %.loc8
-// CHECK:STDOUT:   %.loc12: f64 = real_value 56e-1
+// CHECK:STDOUT:   %.loc12: f64 = real_literal 56e-1
 // CHECK:STDOUT:   assign %a, %.loc12
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/operators/fail_type_mismatch_once.carbon b/toolchain/semantics/testdata/operators/fail_type_mismatch_once.carbon
index 5de659b8f323..ceebea3e32ad 100644
--- a/toolchain/semantics/testdata/operators/fail_type_mismatch_once.carbon
+++ b/toolchain/semantics/testdata/operators/fail_type_mismatch_once.carbon
@@ -64,10 +64,10 @@ fn Main() -> i32 {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Main() -> i32 {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc13_10: i32 = int_value 12
-// CHECK:STDOUT:   %.loc13_15: f64 = real_value 34e-1
+// CHECK:STDOUT:   %.loc13_10: i32 = int_literal 12
+// CHECK:STDOUT:   %.loc13_15: f64 = real_literal 34e-1
 // CHECK:STDOUT:   %.loc13_13: <error> = add <error>, %.loc13_15
-// CHECK:STDOUT:   %.loc13_21: i32 = int_value 12
+// CHECK:STDOUT:   %.loc13_21: i32 = int_literal 12
 // CHECK:STDOUT:   %.loc13_19: <error> = add <error>, %.loc13_21
 // CHECK:STDOUT:   return <error>
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/operators/or.carbon b/toolchain/semantics/testdata/operators/or.carbon
index 44a92ec5b730..b89b17126bff 100644
--- a/toolchain/semantics/testdata/operators/or.carbon
+++ b/toolchain/semantics/testdata/operators/or.carbon
@@ -90,13 +90,13 @@ fn Or() -> bool {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @F() -> bool {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc7: bool = bool_value true
+// CHECK:STDOUT:   %.loc7: bool = bool_literal true
 // CHECK:STDOUT:   return %.loc7
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @G() -> bool {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc8: bool = bool_value true
+// CHECK:STDOUT:   %.loc8: bool = bool_literal true
 // CHECK:STDOUT:   return %.loc8
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -104,7 +104,7 @@ fn Or() -> bool {
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   %.loc11_11: bool = call @F()
 // CHECK:STDOUT:   %.loc11_14.1: bool = not %.loc11_11
-// CHECK:STDOUT:   %.loc11_14.2: bool = bool_value true
+// CHECK:STDOUT:   %.loc11_14.2: bool = bool_literal true
 // CHECK:STDOUT:   if %.loc11_14.1 br !.loc11_18 else br !.loc11_14(%.loc11_14.2)
 // CHECK:STDOUT:
 // CHECK:STDOUT: !.loc11_18:
diff --git a/toolchain/semantics/testdata/pointer/address_of_deref.carbon b/toolchain/semantics/testdata/pointer/address_of_deref.carbon
index 0a9799d23b7f..84e6ab35adf2 100644
--- a/toolchain/semantics/testdata/pointer/address_of_deref.carbon
+++ b/toolchain/semantics/testdata/pointer/address_of_deref.carbon
@@ -68,7 +68,7 @@ fn F() -> i32 {
 // CHECK:STDOUT: fn @F() -> i32 {
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   %n: i32 = var
-// CHECK:STDOUT:   %.loc8: i32 = int_value 0
+// CHECK:STDOUT:   %.loc8: i32 = int_literal 0
 // CHECK:STDOUT:   assign %n, %.loc8
 // CHECK:STDOUT:   %.loc9_13.1: type = ptr_type i32
 // CHECK:STDOUT:   %.loc9_13.2: i32* = address_of %n
diff --git a/toolchain/semantics/testdata/pointer/address_of_lvalue.carbon b/toolchain/semantics/testdata/pointer/address_of_lvalue.carbon
index 7bde977e46c6..2b19bf04dfba 100644
--- a/toolchain/semantics/testdata/pointer/address_of_lvalue.carbon
+++ b/toolchain/semantics/testdata/pointer/address_of_lvalue.carbon
@@ -94,13 +94,13 @@ fn F(param: i32) {
 // CHECK:STDOUT:   {kind: PointerType, arg0: type0, type: typeTypeType},
 // CHECK:STDOUT:   {kind: VarStorage, type: type3},
 // CHECK:STDOUT:   {kind: BindName, arg0: str6, arg1: node+25, type: type3},
-// CHECK:STDOUT:   {kind: StructMemberAccess, arg0: node+6, arg1: member0, type: type0},
+// CHECK:STDOUT:   {kind: StructAccess, arg0: node+6, arg1: member0, type: type0},
 // CHECK:STDOUT:   {kind: AddressOf, arg0: node+27, type: type3},
 // CHECK:STDOUT:   {kind: Assign, arg0: node+25, arg1: node+28},
 // CHECK:STDOUT:   {kind: PointerType, arg0: type0, type: typeTypeType},
 // CHECK:STDOUT:   {kind: VarStorage, type: type3},
 // CHECK:STDOUT:   {kind: BindName, arg0: str7, arg1: node+31, type: type3},
-// CHECK:STDOUT:   {kind: StructMemberAccess, arg0: node+6, arg1: member1, type: type0},
+// CHECK:STDOUT:   {kind: StructAccess, arg0: node+6, arg1: member1, type: type0},
 // CHECK:STDOUT:   {kind: AddressOf, arg0: node+33, type: type3},
 // CHECK:STDOUT:   {kind: Assign, arg0: node+31, arg1: node+34},
 // CHECK:STDOUT:   {kind: StubReference, arg0: nodeIntegerType, type: typeTypeType},
@@ -120,14 +120,14 @@ fn F(param: i32) {
 // CHECK:STDOUT:   {kind: VarStorage, type: type3},
 // CHECK:STDOUT:   {kind: BindName, arg0: str9, arg1: node+50, type: type3},
 // CHECK:STDOUT:   {kind: IntegerLiteral, arg0: int4, type: type0},
-// CHECK:STDOUT:   {kind: Index, arg0: node+41, arg1: node+52, type: type0},
+// CHECK:STDOUT:   {kind: TupleIndex, arg0: node+41, arg1: node+52, type: type0},
 // CHECK:STDOUT:   {kind: AddressOf, arg0: node+53, type: type3},
 // CHECK:STDOUT:   {kind: Assign, arg0: node+50, arg1: node+54},
 // CHECK:STDOUT:   {kind: PointerType, arg0: type0, type: typeTypeType},
 // CHECK:STDOUT:   {kind: VarStorage, type: type3},
 // CHECK:STDOUT:   {kind: BindName, arg0: str10, arg1: node+57, type: type3},
 // CHECK:STDOUT:   {kind: IntegerLiteral, arg0: int5, type: type0},
-// CHECK:STDOUT:   {kind: Index, arg0: node+41, arg1: node+59, type: type0},
+// CHECK:STDOUT:   {kind: TupleIndex, arg0: node+41, arg1: node+59, type: type0},
 // CHECK:STDOUT:   {kind: AddressOf, arg0: node+60, type: type3},
 // CHECK:STDOUT:   {kind: Assign, arg0: node+57, arg1: node+61},
 // CHECK:STDOUT:   {kind: PointerType, arg0: type0, type: typeTypeType},
@@ -250,9 +250,9 @@ fn F(param: i32) {
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   %.loc8_27: type = struct_type {.a: i32, .b: i32}
 // CHECK:STDOUT:   %s: {.a: i32, .b: i32} = var
-// CHECK:STDOUT:   %.loc8_37: i32 = int_value 1
+// CHECK:STDOUT:   %.loc8_37: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc8_35: i32 = stub_reference %.loc8_37
-// CHECK:STDOUT:   %.loc8_45: i32 = int_value 2
+// CHECK:STDOUT:   %.loc8_45: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc8_43: i32 = stub_reference %.loc8_45
 // CHECK:STDOUT:   %.loc8_46: {.a: i32, .b: i32} = struct_value (%.loc8_35, %.loc8_43)
 // CHECK:STDOUT:   assign %s, %.loc8_46
@@ -277,21 +277,21 @@ fn F(param: i32) {
 // CHECK:STDOUT:   %.loc14_19.2: (type, type) = tuple_value (%.loc14_11, %.loc14_16)
 // CHECK:STDOUT:   %.loc14_19.3: type = tuple_type (i32, i32)
 // CHECK:STDOUT:   %t: (i32, i32) = var
-// CHECK:STDOUT:   %.loc14_24.1: i32 = int_value 1
+// CHECK:STDOUT:   %.loc14_24.1: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc14_24.2: i32 = stub_reference %.loc14_24.1
-// CHECK:STDOUT:   %.loc14_27.1: i32 = int_value 2
+// CHECK:STDOUT:   %.loc14_27.1: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc14_27.2: i32 = stub_reference %.loc14_27.1
 // CHECK:STDOUT:   %.loc14_28: (i32, i32) = tuple_value (%.loc14_24.2, %.loc14_27.2)
 // CHECK:STDOUT:   assign %t, %.loc14_28
 // CHECK:STDOUT:   %.loc15_14: type = ptr_type i32
 // CHECK:STDOUT:   %t0: i32* = var
-// CHECK:STDOUT:   %.loc15_21: i32 = int_value 0
+// CHECK:STDOUT:   %.loc15_21: i32 = int_literal 0
 // CHECK:STDOUT:   %.loc15_22: i32 = tuple_index %t, %.loc15_21
 // CHECK:STDOUT:   %.loc15_18: i32* = address_of %.loc15_22
 // CHECK:STDOUT:   assign %t0, %.loc15_18
 // CHECK:STDOUT:   %.loc16_14: type = ptr_type i32
 // CHECK:STDOUT:   %t1: i32* = var
-// CHECK:STDOUT:   %.loc16_21: i32 = int_value 1
+// CHECK:STDOUT:   %.loc16_21: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc16_22: i32 = tuple_index %t, %.loc16_21
 // CHECK:STDOUT:   %.loc16_18: i32* = address_of %.loc16_22
 // CHECK:STDOUT:   assign %t1, %.loc16_18
diff --git a/toolchain/semantics/testdata/pointer/basic.carbon b/toolchain/semantics/testdata/pointer/basic.carbon
index 8ca0c16fb449..b7d8c80413e8 100644
--- a/toolchain/semantics/testdata/pointer/basic.carbon
+++ b/toolchain/semantics/testdata/pointer/basic.carbon
@@ -73,7 +73,7 @@ fn F() -> i32 {
 // CHECK:STDOUT: fn @F() -> i32 {
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   %n: i32 = var
-// CHECK:STDOUT:   %.loc8: i32 = int_value 0
+// CHECK:STDOUT:   %.loc8: i32 = int_literal 0
 // CHECK:STDOUT:   assign %n, %.loc8
 // CHECK:STDOUT:   %.loc9_13: type = ptr_type i32
 // CHECK:STDOUT:   %p: i32* = var
diff --git a/toolchain/semantics/testdata/pointer/fail_address_of_value.carbon b/toolchain/semantics/testdata/pointer/fail_address_of_value.carbon
index 22243e8267c0..498ebfef1f2f 100644
--- a/toolchain/semantics/testdata/pointer/fail_address_of_value.carbon
+++ b/toolchain/semantics/testdata/pointer/fail_address_of_value.carbon
@@ -171,7 +171,7 @@ fn AddressOfTupleElementValue() {
 // CHECK:STDOUT:   {kind: BinaryOperatorAdd, arg0: node+33, arg1: node+34, type: type0},
 // CHECK:STDOUT:   {kind: AddressOf, arg0: node+35, type: type2},
 // CHECK:STDOUT:   {kind: Call, arg0: block0, arg1: function1, type: type1},
-// CHECK:STDOUT:   {kind: StructMemberAccess, arg0: node+37, arg1: member0, type: type0},
+// CHECK:STDOUT:   {kind: StructAccess, arg0: node+37, arg1: member0, type: type0},
 // CHECK:STDOUT:   {kind: AddressOf, arg0: node+38, type: type2},
 // CHECK:STDOUT:   {kind: BoolLiteral, arg0: true, type: type3},
 // CHECK:STDOUT:   {kind: UnaryOperatorNot, arg0: node+40, type: type3},
@@ -195,7 +195,7 @@ fn AddressOfTupleElementValue() {
 // CHECK:STDOUT:   {kind: StubReference, arg0: node+58, type: type0},
 // CHECK:STDOUT:   {kind: TupleValue, arg0: block11, type: type9},
 // CHECK:STDOUT:   {kind: IntegerLiteral, arg0: int8, type: type0},
-// CHECK:STDOUT:   {kind: Index, arg0: node+60, arg1: node+61, type: type0},
+// CHECK:STDOUT:   {kind: TupleIndex, arg0: node+60, arg1: node+61, type: type0},
 // CHECK:STDOUT:   {kind: AddressOf, arg0: node+62, type: type2},
 // CHECK:STDOUT:   {kind: Return},
 // CHECK:STDOUT: ]
@@ -314,27 +314,27 @@ fn AddressOfTupleElementValue() {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @AddressOfLiteral() {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc15_4: i32 = int_value 0
+// CHECK:STDOUT:   %.loc15_4: i32 = int_literal 0
 // CHECK:STDOUT:   %.loc15_3.1: type = ptr_type i32
 // CHECK:STDOUT:   %.loc15_3.2: i32* = address_of %.loc15_4
-// CHECK:STDOUT:   %.loc19_4: bool = bool_value true
+// CHECK:STDOUT:   %.loc19_4: bool = bool_literal true
 // CHECK:STDOUT:   %.loc19_3.1: type = ptr_type bool
 // CHECK:STDOUT:   %.loc19_3.2: bool* = address_of %.loc19_4
-// CHECK:STDOUT:   %.loc23_4: f64 = real_value 10e-1
+// CHECK:STDOUT:   %.loc23_4: f64 = real_literal 10e-1
 // CHECK:STDOUT:   %.loc23_3.1: type = ptr_type f64
 // CHECK:STDOUT:   %.loc23_3.2: f64* = address_of %.loc23_4
-// CHECK:STDOUT:   %.loc27_4: String = string_value "Hello"
+// CHECK:STDOUT:   %.loc27_4: String = string_literal "Hello"
 // CHECK:STDOUT:   %.loc27_3.1: type = ptr_type String
 // CHECK:STDOUT:   %.loc27_3.2: String* = address_of %.loc27_4
-// CHECK:STDOUT:   %.loc31_5.1: i32 = int_value 1
+// CHECK:STDOUT:   %.loc31_5.1: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc31_5.2: i32 = stub_reference %.loc31_5.1
-// CHECK:STDOUT:   %.loc31_8.1: i32 = int_value 2
+// CHECK:STDOUT:   %.loc31_8.1: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc31_8.2: i32 = stub_reference %.loc31_8.1
 // CHECK:STDOUT:   %.loc31_9.1: type = tuple_type (i32, i32)
 // CHECK:STDOUT:   %.loc31_9.2: (i32, i32) = tuple_value (%.loc31_5.2, %.loc31_8.2)
 // CHECK:STDOUT:   %.loc31_3.1: type = ptr_type (i32, i32)
 // CHECK:STDOUT:   %.loc31_3.2: (i32, i32)* = address_of %.loc31_9.2
-// CHECK:STDOUT:   %.loc35_10: i32 = int_value 5
+// CHECK:STDOUT:   %.loc35_10: i32 = int_literal 5
 // CHECK:STDOUT:   %.loc35_8: i32 = stub_reference %.loc35_10
 // CHECK:STDOUT:   %.loc35_11: {.a: i32} = struct_value (%.loc35_8)
 // CHECK:STDOUT:   %.loc35_3.1: type = ptr_type {.a: i32}
@@ -344,14 +344,14 @@ fn AddressOfTupleElementValue() {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @AddressOfOperator() {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc42_5: i32 = int_value 1
-// CHECK:STDOUT:   %.loc42_9: i32 = int_value 1
+// CHECK:STDOUT:   %.loc42_5: i32 = int_literal 1
+// CHECK:STDOUT:   %.loc42_9: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc42_7: i32 = add %.loc42_5, %.loc42_9
 // CHECK:STDOUT:   %.loc42_3: i32* = address_of %.loc42_7
 // CHECK:STDOUT:   %.loc46_5: {.a: i32} = call @H()
 // CHECK:STDOUT:   %.loc46_7: i32 = struct_access %.loc46_5, member0
 // CHECK:STDOUT:   %.loc46_3: i32* = address_of %.loc46_7
-// CHECK:STDOUT:   %.loc50_9: bool = bool_value true
+// CHECK:STDOUT:   %.loc50_9: bool = bool_literal true
 // CHECK:STDOUT:   %.loc50_5: bool = not %.loc50_9
 // CHECK:STDOUT:   %.loc50_3: bool* = address_of %.loc50_5
 // CHECK:STDOUT:   return
@@ -376,12 +376,12 @@ fn AddressOfTupleElementValue() {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @AddressOfTupleElementValue() {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc75_6.1: i32 = int_value 1
+// CHECK:STDOUT:   %.loc75_6.1: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc75_6.2: i32 = stub_reference %.loc75_6.1
-// CHECK:STDOUT:   %.loc75_9.1: i32 = int_value 2
+// CHECK:STDOUT:   %.loc75_9.1: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc75_9.2: i32 = stub_reference %.loc75_9.1
 // CHECK:STDOUT:   %.loc75_10: (i32, i32) = tuple_value (%.loc75_6.2, %.loc75_9.2)
-// CHECK:STDOUT:   %.loc75_12: i32 = int_value 0
+// CHECK:STDOUT:   %.loc75_12: i32 = int_literal 0
 // CHECK:STDOUT:   %.loc75_13: i32 = tuple_index %.loc75_10, %.loc75_12
 // CHECK:STDOUT:   %.loc75_3: i32* = address_of %.loc75_13
 // CHECK:STDOUT:   return
diff --git a/toolchain/semantics/testdata/return/code_after_return_value.carbon b/toolchain/semantics/testdata/return/code_after_return_value.carbon
index c761ed713fb1..c09b25b14953 100644
--- a/toolchain/semantics/testdata/return/code_after_return_value.carbon
+++ b/toolchain/semantics/testdata/return/code_after_return_value.carbon
@@ -84,6 +84,6 @@ fn F(b: bool) -> i32 {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @F(%b: bool) -> i32 {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc8: i32 = int_value 0
+// CHECK:STDOUT:   %.loc8: i32 = int_literal 0
 // CHECK:STDOUT:   return %.loc8
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/return/fail_type_mismatch.carbon b/toolchain/semantics/testdata/return/fail_type_mismatch.carbon
index 63c546a009fe..8824332ec253 100644
--- a/toolchain/semantics/testdata/return/fail_type_mismatch.carbon
+++ b/toolchain/semantics/testdata/return/fail_type_mismatch.carbon
@@ -52,6 +52,6 @@ fn Main() -> i32 {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Main() -> i32 {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc11: f64 = real_value 10e-1
+// CHECK:STDOUT:   %.loc11: f64 = real_literal 10e-1
 // CHECK:STDOUT:   return <error>
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/return/fail_value_disallowed.carbon b/toolchain/semantics/testdata/return/fail_value_disallowed.carbon
index 45d7ca47ea2d..e5a14ab40bb6 100644
--- a/toolchain/semantics/testdata/return/fail_value_disallowed.carbon
+++ b/toolchain/semantics/testdata/return/fail_value_disallowed.carbon
@@ -54,6 +54,6 @@ fn Main() {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Main() {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc14: i32 = int_value 0
+// CHECK:STDOUT:   %.loc14: i32 = int_literal 0
 // CHECK:STDOUT:   return %.loc14
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/return/struct.carbon b/toolchain/semantics/testdata/return/struct.carbon
index 948535f90aed..5477e6215872 100644
--- a/toolchain/semantics/testdata/return/struct.carbon
+++ b/toolchain/semantics/testdata/return/struct.carbon
@@ -69,7 +69,7 @@ fn Main() -> {.a: i32} {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Main() -> {.a: i32} {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc8_16: i32 = int_value 3
+// CHECK:STDOUT:   %.loc8_16: i32 = int_literal 3
 // CHECK:STDOUT:   %.loc8_14: i32 = stub_reference %.loc8_16
 // CHECK:STDOUT:   %.loc8_17: {.a: i32} = struct_value (%.loc8_14)
 // CHECK:STDOUT:   return %.loc8_17
diff --git a/toolchain/semantics/testdata/return/tuple.carbon b/toolchain/semantics/testdata/return/tuple.carbon
index cb52ebbc25e8..ef222790c459 100644
--- a/toolchain/semantics/testdata/return/tuple.carbon
+++ b/toolchain/semantics/testdata/return/tuple.carbon
@@ -91,9 +91,9 @@ fn Main() -> (i32, i32) {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Main() -> (i32, i32) {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc9_11.1: i32 = int_value 15
+// CHECK:STDOUT:   %.loc9_11.1: i32 = int_literal 15
 // CHECK:STDOUT:   %.loc9_11.2: i32 = stub_reference %.loc9_11.1
-// CHECK:STDOUT:   %.loc9_15.1: i32 = int_value 35
+// CHECK:STDOUT:   %.loc9_15.1: i32 = int_literal 35
 // CHECK:STDOUT:   %.loc9_15.2: i32 = stub_reference %.loc9_15.1
 // CHECK:STDOUT:   %.loc9_17: (i32, i32) = tuple_value (%.loc9_11.2, %.loc9_15.2)
 // CHECK:STDOUT:   return %.loc9_17
diff --git a/toolchain/semantics/testdata/return/value.carbon b/toolchain/semantics/testdata/return/value.carbon
index 1a6b4933ca3a..45a55ff9b591 100644
--- a/toolchain/semantics/testdata/return/value.carbon
+++ b/toolchain/semantics/testdata/return/value.carbon
@@ -48,6 +48,6 @@ fn Main() -> i32 {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Main() -> i32 {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc8: i32 = int_value 0
+// CHECK:STDOUT:   %.loc8: i32 = int_literal 0
 // CHECK:STDOUT:   return %.loc8
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/struct/fail_assign_to_empty.carbon b/toolchain/semantics/testdata/struct/fail_assign_to_empty.carbon
index 8916d3f829f5..8b2dee0b3499 100644
--- a/toolchain/semantics/testdata/struct/fail_assign_to_empty.carbon
+++ b/toolchain/semantics/testdata/struct/fail_assign_to_empty.carbon
@@ -66,7 +66,7 @@ var x: {} = {.a = 1};
 // CHECK:STDOUT:   %.loc10_9.1: type = struct_type {}
 // CHECK:STDOUT:   %.loc10_9.2: {} = struct_value ()
 // CHECK:STDOUT:   %x: {} = var
-// CHECK:STDOUT:   %.loc10_19: i32 = int_value 1
+// CHECK:STDOUT:   %.loc10_19: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc10_17: i32 = stub_reference %.loc10_19
 // CHECK:STDOUT:   %.loc10_20.1: type = struct_type {.a: i32}
 // CHECK:STDOUT:   %.loc10_20.2: {.a: i32} = struct_value (%.loc10_17)
diff --git a/toolchain/semantics/testdata/struct/fail_field_name_mismatch.carbon b/toolchain/semantics/testdata/struct/fail_field_name_mismatch.carbon
index 3892f3b78236..4dda1d4ef089 100644
--- a/toolchain/semantics/testdata/struct/fail_field_name_mismatch.carbon
+++ b/toolchain/semantics/testdata/struct/fail_field_name_mismatch.carbon
@@ -69,7 +69,7 @@ var x: {.a: i32} = {.b = 1};
 // CHECK:STDOUT: package {
 // CHECK:STDOUT:   %.loc10_16: type = struct_type {.a: i32}
 // CHECK:STDOUT:   %x: {.a: i32} = var
-// CHECK:STDOUT:   %.loc10_26: i32 = int_value 1
+// CHECK:STDOUT:   %.loc10_26: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc10_24: i32 = stub_reference %.loc10_26
 // CHECK:STDOUT:   %.loc10_27.1: type = struct_type {.b: i32}
 // CHECK:STDOUT:   %.loc10_27.2: {.b: i32} = struct_value (%.loc10_24)
diff --git a/toolchain/semantics/testdata/struct/fail_field_type_mismatch.carbon b/toolchain/semantics/testdata/struct/fail_field_type_mismatch.carbon
index 4ccebdd40917..6fd1d840b016 100644
--- a/toolchain/semantics/testdata/struct/fail_field_type_mismatch.carbon
+++ b/toolchain/semantics/testdata/struct/fail_field_type_mismatch.carbon
@@ -70,7 +70,7 @@ var x: {.a: i32} = {.b = 1.0};
 // CHECK:STDOUT: package {
 // CHECK:STDOUT:   %.loc10_16: type = struct_type {.a: i32}
 // CHECK:STDOUT:   %x: {.a: i32} = var
-// CHECK:STDOUT:   %.loc10_26: f64 = real_value 10e-1
+// CHECK:STDOUT:   %.loc10_26: f64 = real_literal 10e-1
 // CHECK:STDOUT:   %.loc10_24: f64 = stub_reference %.loc10_26
 // CHECK:STDOUT:   %.loc10_29.1: type = struct_type {.b: f64}
 // CHECK:STDOUT:   %.loc10_29.2: {.b: f64} = struct_value (%.loc10_24)
diff --git a/toolchain/semantics/testdata/struct/fail_member_access_type.carbon b/toolchain/semantics/testdata/struct/fail_member_access_type.carbon
index 6cdbbe70ec39..1ab4b768d5c0 100644
--- a/toolchain/semantics/testdata/struct/fail_member_access_type.carbon
+++ b/toolchain/semantics/testdata/struct/fail_member_access_type.carbon
@@ -75,7 +75,7 @@ var y: i32 = x.b;
 // CHECK:STDOUT: package {
 // CHECK:STDOUT:   %.loc7_16: type = struct_type {.a: f64}
 // CHECK:STDOUT:   %x: {.a: f64} = var
-// CHECK:STDOUT:   %.loc7_26: f64 = real_value 40e-1
+// CHECK:STDOUT:   %.loc7_26: f64 = real_literal 40e-1
 // CHECK:STDOUT:   %.loc7_24: f64 = stub_reference %.loc7_26
 // CHECK:STDOUT:   %.loc7_29: {.a: f64} = struct_value (%.loc7_24)
 // CHECK:STDOUT:   assign %x, %.loc7_29
diff --git a/toolchain/semantics/testdata/struct/fail_non_member_access.carbon b/toolchain/semantics/testdata/struct/fail_non_member_access.carbon
index 4e7bc1d86d46..2eb3db738db0 100644
--- a/toolchain/semantics/testdata/struct/fail_non_member_access.carbon
+++ b/toolchain/semantics/testdata/struct/fail_non_member_access.carbon
@@ -74,7 +74,7 @@ var y: i32 = x.b;
 // CHECK:STDOUT: package {
 // CHECK:STDOUT:   %.loc7_16: type = struct_type {.a: i32}
 // CHECK:STDOUT:   %x: {.a: i32} = var
-// CHECK:STDOUT:   %.loc7_26: i32 = int_value 4
+// CHECK:STDOUT:   %.loc7_26: i32 = int_literal 4
 // CHECK:STDOUT:   %.loc7_24: i32 = stub_reference %.loc7_26
 // CHECK:STDOUT:   %.loc7_27: {.a: i32} = struct_value (%.loc7_24)
 // CHECK:STDOUT:   assign %x, %.loc7_27
diff --git a/toolchain/semantics/testdata/struct/fail_too_few_values.carbon b/toolchain/semantics/testdata/struct/fail_too_few_values.carbon
index 8ba1773fce4f..2df9cd76595d 100644
--- a/toolchain/semantics/testdata/struct/fail_too_few_values.carbon
+++ b/toolchain/semantics/testdata/struct/fail_too_few_values.carbon
@@ -72,7 +72,7 @@ var x: {.a: i32, .b: i32} = {.a = 1};
 // CHECK:STDOUT: package {
 // CHECK:STDOUT:   %.loc10_25: type = struct_type {.a: i32, .b: i32}
 // CHECK:STDOUT:   %x: {.a: i32, .b: i32} = var
-// CHECK:STDOUT:   %.loc10_35: i32 = int_value 1
+// CHECK:STDOUT:   %.loc10_35: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc10_33: i32 = stub_reference %.loc10_35
 // CHECK:STDOUT:   %.loc10_36.1: type = struct_type {.a: i32}
 // CHECK:STDOUT:   %.loc10_36.2: {.a: i32} = struct_value (%.loc10_33)
diff --git a/toolchain/semantics/testdata/struct/fail_value_as_type.carbon b/toolchain/semantics/testdata/struct/fail_value_as_type.carbon
index 98afdf0be4f2..0d546c8dc0d5 100644
--- a/toolchain/semantics/testdata/struct/fail_value_as_type.carbon
+++ b/toolchain/semantics/testdata/struct/fail_value_as_type.carbon
@@ -56,7 +56,7 @@ var x: {.a = 1};
 // CHECK:STDOUT: ]
 // CHECK:STDOUT:
 // CHECK:STDOUT: package {
-// CHECK:STDOUT:   %.loc10_14: i32 = int_value 1
+// CHECK:STDOUT:   %.loc10_14: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc10_12: i32 = stub_reference %.loc10_14
 // CHECK:STDOUT:   %.loc10_15.1: type = struct_type {.a: i32}
 // CHECK:STDOUT:   %.loc10_15.2: {.a: i32} = struct_value (%.loc10_12)
diff --git a/toolchain/semantics/testdata/struct/member_access.carbon b/toolchain/semantics/testdata/struct/member_access.carbon
index 26ac8253cf26..0a875ce395e0 100644
--- a/toolchain/semantics/testdata/struct/member_access.carbon
+++ b/toolchain/semantics/testdata/struct/member_access.carbon
@@ -47,7 +47,7 @@ var z: i32 = y;
 // CHECK:STDOUT:   {kind: Assign, arg0: node+3, arg1: node+11},
 // CHECK:STDOUT:   {kind: VarStorage, type: type1},
 // CHECK:STDOUT:   {kind: BindName, arg0: str3, arg1: node+13, type: type1},
-// CHECK:STDOUT:   {kind: StructMemberAccess, arg0: node+3, arg1: member1, type: type1},
+// CHECK:STDOUT:   {kind: StructAccess, arg0: node+3, arg1: member1, type: type1},
 // CHECK:STDOUT:   {kind: Assign, arg0: node+13, arg1: node+15},
 // CHECK:STDOUT:   {kind: VarStorage, type: type1},
 // CHECK:STDOUT:   {kind: BindName, arg0: str4, arg1: node+17, type: type1},
@@ -93,9 +93,9 @@ var z: i32 = y;
 // CHECK:STDOUT: package {
 // CHECK:STDOUT:   %.loc7_25: type = struct_type {.a: f64, .b: i32}
 // CHECK:STDOUT:   %x: {.a: f64, .b: i32} = var
-// CHECK:STDOUT:   %.loc7_35: f64 = real_value 0e-1
+// CHECK:STDOUT:   %.loc7_35: f64 = real_literal 0e-1
 // CHECK:STDOUT:   %.loc7_33: f64 = stub_reference %.loc7_35
-// CHECK:STDOUT:   %.loc7_45: i32 = int_value 1
+// CHECK:STDOUT:   %.loc7_45: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc7_43: i32 = stub_reference %.loc7_45
 // CHECK:STDOUT:   %.loc7_46: {.a: f64, .b: i32} = struct_value (%.loc7_33, %.loc7_43)
 // CHECK:STDOUT:   assign %x, %.loc7_46
diff --git a/toolchain/semantics/testdata/struct/one_entry.carbon b/toolchain/semantics/testdata/struct/one_entry.carbon
index d48dea4022dc..0b9530f902de 100644
--- a/toolchain/semantics/testdata/struct/one_entry.carbon
+++ b/toolchain/semantics/testdata/struct/one_entry.carbon
@@ -77,7 +77,7 @@ var y: {.a: i32} = x;
 // CHECK:STDOUT: package {
 // CHECK:STDOUT:   %.loc7_16: type = struct_type {.a: i32}
 // CHECK:STDOUT:   %x: {.a: i32} = var
-// CHECK:STDOUT:   %.loc7_26: i32 = int_value 4
+// CHECK:STDOUT:   %.loc7_26: i32 = int_literal 4
 // CHECK:STDOUT:   %.loc7_24: i32 = stub_reference %.loc7_26
 // CHECK:STDOUT:   %.loc7_27: {.a: i32} = struct_value (%.loc7_24)
 // CHECK:STDOUT:   assign %x, %.loc7_27
diff --git a/toolchain/semantics/testdata/struct/tuple_as_element.carbon b/toolchain/semantics/testdata/struct/tuple_as_element.carbon
index ffb45bf36545..4795d3e77867 100644
--- a/toolchain/semantics/testdata/struct/tuple_as_element.carbon
+++ b/toolchain/semantics/testdata/struct/tuple_as_element.carbon
@@ -129,9 +129,9 @@ var y: {.a: i32, .b: (i32,)} = x;
 // CHECK:STDOUT:   %.loc7_27.3: type = tuple_type (i32)
 // CHECK:STDOUT:   %.loc7_28: type = struct_type {.a: i32, .b: (i32,)}
 // CHECK:STDOUT:   %x: {.a: i32, .b: (i32,)} = var
-// CHECK:STDOUT:   %.loc7_38: i32 = int_value 1
+// CHECK:STDOUT:   %.loc7_38: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc7_36: i32 = stub_reference %.loc7_38
-// CHECK:STDOUT:   %.loc7_47.1: i32 = int_value 2
+// CHECK:STDOUT:   %.loc7_47.1: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc7_47.2: i32 = stub_reference %.loc7_47.1
 // CHECK:STDOUT:   %.loc7_49: (i32,) = tuple_value (%.loc7_47.2)
 // CHECK:STDOUT:   %.loc7_44: (i32,) = stub_reference %.loc7_49
diff --git a/toolchain/semantics/testdata/struct/two_entries.carbon b/toolchain/semantics/testdata/struct/two_entries.carbon
index e164afbff634..21e481d002a6 100644
--- a/toolchain/semantics/testdata/struct/two_entries.carbon
+++ b/toolchain/semantics/testdata/struct/two_entries.carbon
@@ -92,9 +92,9 @@ var y: {.a: i32, .b: i32} = x;
 // CHECK:STDOUT: package {
 // CHECK:STDOUT:   %.loc7_25: type = struct_type {.a: i32, .b: i32}
 // CHECK:STDOUT:   %x: {.a: i32, .b: i32} = var
-// CHECK:STDOUT:   %.loc7_35: i32 = int_value 1
+// CHECK:STDOUT:   %.loc7_35: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc7_33: i32 = stub_reference %.loc7_35
-// CHECK:STDOUT:   %.loc7_43: i32 = int_value 2
+// CHECK:STDOUT:   %.loc7_43: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc7_41: i32 = stub_reference %.loc7_43
 // CHECK:STDOUT:   %.loc7_44: {.a: i32, .b: i32} = struct_value (%.loc7_33, %.loc7_41)
 // CHECK:STDOUT:   assign %x, %.loc7_44
diff --git a/toolchain/semantics/testdata/tuples/fail_assign_nested.carbon b/toolchain/semantics/testdata/tuples/fail_assign_nested.carbon
index 5ef58a413bf1..1ee8f776a4a9 100644
--- a/toolchain/semantics/testdata/tuples/fail_assign_nested.carbon
+++ b/toolchain/semantics/testdata/tuples/fail_assign_nested.carbon
@@ -181,20 +181,20 @@ var x: ((i32, i32), (i32, i32)) = ((1, 2, 3), (4, 5, 6));
 // CHECK:STDOUT:   %.loc10_18.4: type = tuple_type (i32, i32)
 // CHECK:STDOUT:   %.loc10_31.3: type = tuple_type ((i32, i32), (i32, i32))
 // CHECK:STDOUT:   %x: ((i32, i32), (i32, i32)) = var
-// CHECK:STDOUT:   %.loc10_37.1: i32 = int_value 1
+// CHECK:STDOUT:   %.loc10_37.1: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc10_37.2: i32 = stub_reference %.loc10_37.1
-// CHECK:STDOUT:   %.loc10_40.1: i32 = int_value 2
+// CHECK:STDOUT:   %.loc10_40.1: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc10_40.2: i32 = stub_reference %.loc10_40.1
-// CHECK:STDOUT:   %.loc10_43.1: i32 = int_value 3
+// CHECK:STDOUT:   %.loc10_43.1: i32 = int_literal 3
 // CHECK:STDOUT:   %.loc10_43.2: i32 = stub_reference %.loc10_43.1
 // CHECK:STDOUT:   %.loc10_44.1: type = tuple_type (i32, i32, i32)
 // CHECK:STDOUT:   %.loc10_44.2: (i32, i32, i32) = tuple_value (%.loc10_37.2, %.loc10_40.2, %.loc10_43.2)
 // CHECK:STDOUT:   %.loc10_44.3: (i32, i32, i32) = stub_reference %.loc10_44.2
-// CHECK:STDOUT:   %.loc10_48.1: i32 = int_value 4
+// CHECK:STDOUT:   %.loc10_48.1: i32 = int_literal 4
 // CHECK:STDOUT:   %.loc10_48.2: i32 = stub_reference %.loc10_48.1
-// CHECK:STDOUT:   %.loc10_51.1: i32 = int_value 5
+// CHECK:STDOUT:   %.loc10_51.1: i32 = int_literal 5
 // CHECK:STDOUT:   %.loc10_51.2: i32 = stub_reference %.loc10_51.1
-// CHECK:STDOUT:   %.loc10_54.1: i32 = int_value 6
+// CHECK:STDOUT:   %.loc10_54.1: i32 = int_literal 6
 // CHECK:STDOUT:   %.loc10_54.2: i32 = stub_reference %.loc10_54.1
 // CHECK:STDOUT:   %.loc10_55.1: (i32, i32, i32) = tuple_value (%.loc10_48.2, %.loc10_51.2, %.loc10_54.2)
 // CHECK:STDOUT:   %.loc10_55.2: (i32, i32, i32) = stub_reference %.loc10_55.1
diff --git a/toolchain/semantics/testdata/tuples/fail_assign_to_empty.carbon b/toolchain/semantics/testdata/tuples/fail_assign_to_empty.carbon
index 82c81fdf4cde..3fe51b0fbaae 100644
--- a/toolchain/semantics/testdata/tuples/fail_assign_to_empty.carbon
+++ b/toolchain/semantics/testdata/tuples/fail_assign_to_empty.carbon
@@ -53,6 +53,6 @@ var x: () = (66);
 // CHECK:STDOUT:   %.loc10_9.1: type = tuple_type ()
 // CHECK:STDOUT:   %.loc10_9.2: () = tuple_value ()
 // CHECK:STDOUT:   %x: () = var
-// CHECK:STDOUT:   %.loc10_14: i32 = int_value 66
+// CHECK:STDOUT:   %.loc10_14: i32 = int_literal 66
 // CHECK:STDOUT:   assign %x, <error>
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/tuples/fail_element_type_mismatch.carbon b/toolchain/semantics/testdata/tuples/fail_element_type_mismatch.carbon
index 9743a2dd1c08..327a3da6ab6b 100644
--- a/toolchain/semantics/testdata/tuples/fail_element_type_mismatch.carbon
+++ b/toolchain/semantics/testdata/tuples/fail_element_type_mismatch.carbon
@@ -94,9 +94,9 @@ var x: (i32, i32) = (2, 65.89);
 // CHECK:STDOUT:   %.loc10_17.2: (type, type) = tuple_value (%.loc10_9, %.loc10_14)
 // CHECK:STDOUT:   %.loc10_17.3: type = tuple_type (i32, i32)
 // CHECK:STDOUT:   %x: (i32, i32) = var
-// CHECK:STDOUT:   %.loc10_22.1: i32 = int_value 2
+// CHECK:STDOUT:   %.loc10_22.1: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc10_22.2: i32 = stub_reference %.loc10_22.1
-// CHECK:STDOUT:   %.loc10_25.1: f64 = real_value 6589e-2
+// CHECK:STDOUT:   %.loc10_25.1: f64 = real_literal 6589e-2
 // CHECK:STDOUT:   %.loc10_25.2: f64 = stub_reference %.loc10_25.1
 // CHECK:STDOUT:   %.loc10_30.1: type = tuple_type (i32, f64)
 // CHECK:STDOUT:   %.loc10_30.2: (i32, f64) = tuple_value (%.loc10_22.2, %.loc10_25.2)
diff --git a/toolchain/semantics/testdata/tuples/fail_too_few_element.carbon b/toolchain/semantics/testdata/tuples/fail_too_few_element.carbon
index adc63ffd1dc5..cb776bcc66b4 100644
--- a/toolchain/semantics/testdata/tuples/fail_too_few_element.carbon
+++ b/toolchain/semantics/testdata/tuples/fail_too_few_element.carbon
@@ -86,7 +86,7 @@ var x: (i32, i32) = (2, );
 // CHECK:STDOUT:   %.loc10_17.2: (type, type) = tuple_value (%.loc10_9, %.loc10_14)
 // CHECK:STDOUT:   %.loc10_17.3: type = tuple_type (i32, i32)
 // CHECK:STDOUT:   %x: (i32, i32) = var
-// CHECK:STDOUT:   %.loc10_22.1: i32 = int_value 2
+// CHECK:STDOUT:   %.loc10_22.1: i32 = int_literal 2
 // CHECK:STDOUT:   %.loc10_22.2: i32 = stub_reference %.loc10_22.1
 // CHECK:STDOUT:   %.loc10_25.1: type = tuple_type (i32)
 // CHECK:STDOUT:   %.loc10_25.2: (i32,) = tuple_value (%.loc10_22.2)
diff --git a/toolchain/semantics/testdata/tuples/fail_value_as_type.carbon b/toolchain/semantics/testdata/tuples/fail_value_as_type.carbon
index 835a4867d917..38d8569afc19 100644
--- a/toolchain/semantics/testdata/tuples/fail_value_as_type.carbon
+++ b/toolchain/semantics/testdata/tuples/fail_value_as_type.carbon
@@ -60,7 +60,7 @@ var x: (1, );
 // CHECK:STDOUT: ]
 // CHECK:STDOUT:
 // CHECK:STDOUT: package {
-// CHECK:STDOUT:   %.loc10_9.1: i32 = int_value 1
+// CHECK:STDOUT:   %.loc10_9.1: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc10_9.2: i32 = stub_reference %.loc10_9.1
 // CHECK:STDOUT:   %.loc10_12.1: type = tuple_type (i32)
 // CHECK:STDOUT:   %.loc10_12.2: (i32,) = tuple_value (%.loc10_9.2)
diff --git a/toolchain/semantics/testdata/tuples/nested_tuple.carbon b/toolchain/semantics/testdata/tuples/nested_tuple.carbon
index 7d3a016c9854..d6d4f89ca1b1 100644
--- a/toolchain/semantics/testdata/tuples/nested_tuple.carbon
+++ b/toolchain/semantics/testdata/tuples/nested_tuple.carbon
@@ -125,13 +125,13 @@ var x: ((i32, i32), i32) = ((12, 76), 6);
 // CHECK:STDOUT:   %.loc7_18.4: type = tuple_type (i32, i32)
 // CHECK:STDOUT:   %.loc7_24.3: type = tuple_type ((i32, i32), i32)
 // CHECK:STDOUT:   %x: ((i32, i32), i32) = var
-// CHECK:STDOUT:   %.loc7_30.1: i32 = int_value 12
+// CHECK:STDOUT:   %.loc7_30.1: i32 = int_literal 12
 // CHECK:STDOUT:   %.loc7_30.2: i32 = stub_reference %.loc7_30.1
-// CHECK:STDOUT:   %.loc7_34.1: i32 = int_value 76
+// CHECK:STDOUT:   %.loc7_34.1: i32 = int_literal 76
 // CHECK:STDOUT:   %.loc7_34.2: i32 = stub_reference %.loc7_34.1
 // CHECK:STDOUT:   %.loc7_36.1: (i32, i32) = tuple_value (%.loc7_30.2, %.loc7_34.2)
 // CHECK:STDOUT:   %.loc7_36.2: (i32, i32) = stub_reference %.loc7_36.1
-// CHECK:STDOUT:   %.loc7_39.1: i32 = int_value 6
+// CHECK:STDOUT:   %.loc7_39.1: i32 = int_literal 6
 // CHECK:STDOUT:   %.loc7_39.2: i32 = stub_reference %.loc7_39.1
 // CHECK:STDOUT:   %.loc7_40: ((i32, i32), i32) = tuple_value (%.loc7_36.2, %.loc7_39.2)
 // CHECK:STDOUT:   assign %x, %.loc7_40
diff --git a/toolchain/semantics/testdata/tuples/one_element.carbon b/toolchain/semantics/testdata/tuples/one_element.carbon
index 6c9deac243fd..6f342af95ef5 100644
--- a/toolchain/semantics/testdata/tuples/one_element.carbon
+++ b/toolchain/semantics/testdata/tuples/one_element.carbon
@@ -86,7 +86,7 @@ var y: (i32,) = x;
 // CHECK:STDOUT:   %.loc7_13.2: (type,) = tuple_value (%.loc7_9)
 // CHECK:STDOUT:   %.loc7_13.3: type = tuple_type (i32)
 // CHECK:STDOUT:   %x: (i32,) = var
-// CHECK:STDOUT:   %.loc7_18.1: i32 = int_value 4
+// CHECK:STDOUT:   %.loc7_18.1: i32 = int_literal 4
 // CHECK:STDOUT:   %.loc7_18.2: i32 = stub_reference %.loc7_18.1
 // CHECK:STDOUT:   %.loc7_20: (i32,) = tuple_value (%.loc7_18.2)
 // CHECK:STDOUT:   assign %x, %.loc7_20
diff --git a/toolchain/semantics/testdata/tuples/two_elements.carbon b/toolchain/semantics/testdata/tuples/two_elements.carbon
index 34210600e934..c21376e0c79f 100644
--- a/toolchain/semantics/testdata/tuples/two_elements.carbon
+++ b/toolchain/semantics/testdata/tuples/two_elements.carbon
@@ -101,9 +101,9 @@ var y: (i32, i32) = x;
 // CHECK:STDOUT:   %.loc7_17.2: (type, type) = tuple_value (%.loc7_9, %.loc7_14)
 // CHECK:STDOUT:   %.loc7_17.3: type = tuple_type (i32, i32)
 // CHECK:STDOUT:   %x: (i32, i32) = var
-// CHECK:STDOUT:   %.loc7_22.1: i32 = int_value 4
+// CHECK:STDOUT:   %.loc7_22.1: i32 = int_literal 4
 // CHECK:STDOUT:   %.loc7_22.2: i32 = stub_reference %.loc7_22.1
-// CHECK:STDOUT:   %.loc7_25.1: i32 = int_value 102
+// CHECK:STDOUT:   %.loc7_25.1: i32 = int_literal 102
 // CHECK:STDOUT:   %.loc7_25.2: i32 = stub_reference %.loc7_25.1
 // CHECK:STDOUT:   %.loc7_28: (i32, i32) = tuple_value (%.loc7_22.2, %.loc7_25.2)
 // CHECK:STDOUT:   assign %x, %.loc7_28
diff --git a/toolchain/semantics/testdata/var/decl_with_init.carbon b/toolchain/semantics/testdata/var/decl_with_init.carbon
index a98f55e643c6..f17fb393b3b2 100644
--- a/toolchain/semantics/testdata/var/decl_with_init.carbon
+++ b/toolchain/semantics/testdata/var/decl_with_init.carbon
@@ -56,7 +56,7 @@ fn Main() {
 // CHECK:STDOUT: fn @Main() {
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   %x: i32 = var
-// CHECK:STDOUT:   %.loc8: i32 = int_value 0
+// CHECK:STDOUT:   %.loc8: i32 = int_literal 0
 // CHECK:STDOUT:   assign %x, %.loc8
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/var/fail_duplicate_decl.carbon b/toolchain/semantics/testdata/var/fail_duplicate_decl.carbon
index 4c74c09f8ae4..109cdfb680d5 100644
--- a/toolchain/semantics/testdata/var/fail_duplicate_decl.carbon
+++ b/toolchain/semantics/testdata/var/fail_duplicate_decl.carbon
@@ -73,10 +73,10 @@ fn Main() {
 // CHECK:STDOUT: fn @Main() {
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   %x.loc9: i32 = var
-// CHECK:STDOUT:   %.loc9: i32 = int_value 0
+// CHECK:STDOUT:   %.loc9: i32 = int_literal 0
 // CHECK:STDOUT:   assign %x.loc9, %.loc9
 // CHECK:STDOUT:   %x.loc16: i32 = var
-// CHECK:STDOUT:   %.loc16: i32 = int_value 0
+// CHECK:STDOUT:   %.loc16: i32 = int_literal 0
 // CHECK:STDOUT:   assign %x.loc16, %.loc16
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/var/fail_init_type_mismatch.carbon b/toolchain/semantics/testdata/var/fail_init_type_mismatch.carbon
index e13537c534cc..ad18a8d01ef3 100644
--- a/toolchain/semantics/testdata/var/fail_init_type_mismatch.carbon
+++ b/toolchain/semantics/testdata/var/fail_init_type_mismatch.carbon
@@ -60,7 +60,7 @@ fn Main() {
 // CHECK:STDOUT: fn @Main() {
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   %x: i32 = var
-// CHECK:STDOUT:   %.loc11: f64 = real_value 10e-1
+// CHECK:STDOUT:   %.loc11: f64 = real_literal 10e-1
 // CHECK:STDOUT:   assign %x, <error>
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/var/fail_storage_is_literal.carbon b/toolchain/semantics/testdata/var/fail_storage_is_literal.carbon
index c2e264d973fb..c39bd8140ca6 100644
--- a/toolchain/semantics/testdata/var/fail_storage_is_literal.carbon
+++ b/toolchain/semantics/testdata/var/fail_storage_is_literal.carbon
@@ -61,9 +61,9 @@ fn Main() {
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Main() {
 // CHECK:STDOUT: !entry:
-// CHECK:STDOUT:   %.loc11_10: i32 = int_value 1
+// CHECK:STDOUT:   %.loc11_10: i32 = int_literal 1
 // CHECK:STDOUT:   %x: <error> = var
-// CHECK:STDOUT:   %.loc11_14: i32 = int_value 1
+// CHECK:STDOUT:   %.loc11_14: i32 = int_literal 1
 // CHECK:STDOUT:   assign %x, <error>
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/var/global_decl_with_init.carbon b/toolchain/semantics/testdata/var/global_decl_with_init.carbon
index e7d33c34a697..99932570d46c 100644
--- a/toolchain/semantics/testdata/var/global_decl_with_init.carbon
+++ b/toolchain/semantics/testdata/var/global_decl_with_init.carbon
@@ -41,6 +41,6 @@ var x: i32 = 0;
 // CHECK:STDOUT:
 // CHECK:STDOUT: package {
 // CHECK:STDOUT:   %x: i32 = var
-// CHECK:STDOUT:   %.loc7: i32 = int_value 0
+// CHECK:STDOUT:   %.loc7: i32 = int_literal 0
 // CHECK:STDOUT:   assign %x, %.loc7
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/var/global_lookup.carbon b/toolchain/semantics/testdata/var/global_lookup.carbon
index f4fb61a57239..786171ca5c8e 100644
--- a/toolchain/semantics/testdata/var/global_lookup.carbon
+++ b/toolchain/semantics/testdata/var/global_lookup.carbon
@@ -49,7 +49,7 @@ var y: i32 = x;
 // CHECK:STDOUT:
 // CHECK:STDOUT: package {
 // CHECK:STDOUT:   %x: i32 = var
-// CHECK:STDOUT:   %.loc7: i32 = int_value 0
+// CHECK:STDOUT:   %.loc7: i32 = int_literal 0
 // CHECK:STDOUT:   assign %x, %.loc7
 // CHECK:STDOUT:   %y: i32 = var
 // CHECK:STDOUT:   assign %y, %x
diff --git a/toolchain/semantics/testdata/var/global_lookup_in_scope.carbon b/toolchain/semantics/testdata/var/global_lookup_in_scope.carbon
index d6f7b82770e5..038c287d678a 100644
--- a/toolchain/semantics/testdata/var/global_lookup_in_scope.carbon
+++ b/toolchain/semantics/testdata/var/global_lookup_in_scope.carbon
@@ -60,7 +60,7 @@ fn Main() {
 // CHECK:STDOUT:
 // CHECK:STDOUT: package {
 // CHECK:STDOUT:   %x: i32 = var
-// CHECK:STDOUT:   %.loc7: i32 = int_value 0
+// CHECK:STDOUT:   %.loc7: i32 = int_literal 0
 // CHECK:STDOUT:   assign %x, %.loc7
 // CHECK:STDOUT:   %.loc9 = fn_decl @Main
 // CHECK:STDOUT: }
diff --git a/toolchain/semantics/testdata/var/lookup.carbon b/toolchain/semantics/testdata/var/lookup.carbon
index 179a45cef43e..986c27f12e05 100644
--- a/toolchain/semantics/testdata/var/lookup.carbon
+++ b/toolchain/semantics/testdata/var/lookup.carbon
@@ -57,7 +57,7 @@ fn Main() {
 // CHECK:STDOUT: fn @Main() {
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   %x: i32 = var
-// CHECK:STDOUT:   %.loc8: i32 = int_value 0
+// CHECK:STDOUT:   %.loc8: i32 = int_literal 0
 // CHECK:STDOUT:   assign %x, %.loc8
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }