diff --git a/toolchain/base/BUILD b/toolchain/base/BUILD
index 672fb02bba075..0a523566991a9 100644
--- a/toolchain/base/BUILD
+++ b/toolchain/base/BUILD
@@ -91,9 +91,9 @@ cc_test(
 )
 
 cc_library(
-    name = "int_store",
-    srcs = ["int_store.cpp"],
-    hdrs = ["int_store.h"],
+    name = "int",
+    srcs = ["int.cpp"],
+    hdrs = ["int.h"],
     deps = [
         ":index_base",
         ":mem_usage",
@@ -108,11 +108,11 @@ cc_library(
 )
 
 cc_test(
-    name = "int_store_test",
+    name = "int_test",
     size = "small",
-    srcs = ["int_store_test.cpp"],
+    srcs = ["int_test.cpp"],
     deps = [
-        ":int_store",
+        ":int",
         "//testing/base:gtest_main",
         "//testing/base:test_raw_ostream",
         "//toolchain/testing:yaml_test_helpers",
@@ -124,7 +124,7 @@ cc_library(
     name = "shared_value_stores",
     hdrs = ["shared_value_stores.h"],
     deps = [
-        ":int_store",
+        ":int",
         ":mem_usage",
         ":value_ids",
         ":value_store",
diff --git a/toolchain/base/int_store.cpp b/toolchain/base/int.cpp
similarity index 98%
rename from toolchain/base/int_store.cpp
rename to toolchain/base/int.cpp
index bd502d3b8a6df..68cfeaa5cd598 100644
--- a/toolchain/base/int_store.cpp
+++ b/toolchain/base/int.cpp
@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "toolchain/base/int_store.h"
+#include "toolchain/base/int.h"
 
 namespace Carbon {
 
diff --git a/toolchain/base/int_store.h b/toolchain/base/int.h
similarity index 99%
rename from toolchain/base/int_store.h
rename to toolchain/base/int.h
index 28e6d5e51758a..a6223a92ecb19 100644
--- a/toolchain/base/int_store.h
+++ b/toolchain/base/int.h
@@ -2,8 +2,8 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef CARBON_TOOLCHAIN_BASE_INT_STORE_H_
-#define CARBON_TOOLCHAIN_BASE_INT_STORE_H_
+#ifndef CARBON_TOOLCHAIN_BASE_INT_H_
+#define CARBON_TOOLCHAIN_BASE_INT_H_
 
 #include "common/check.h"
 #include "llvm/ADT/APFloat.h"
@@ -425,4 +425,4 @@ constexpr IntStore::APIntId IntStore::APIntId::Invalid(
 
 }  // namespace Carbon
 
-#endif  // CARBON_TOOLCHAIN_BASE_INT_STORE_H_
+#endif  // CARBON_TOOLCHAIN_BASE_INT_H_
diff --git a/toolchain/base/int_store_test.cpp b/toolchain/base/int_test.cpp
similarity index 99%
rename from toolchain/base/int_store_test.cpp
rename to toolchain/base/int_test.cpp
index 80c90acc6f765..764b4b3c57b21 100644
--- a/toolchain/base/int_store_test.cpp
+++ b/toolchain/base/int_test.cpp
@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "toolchain/base/int_store.h"
+#include "toolchain/base/int.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
diff --git a/toolchain/base/shared_value_stores.h b/toolchain/base/shared_value_stores.h
index 2d47b7ba5ff15..aacd51f3897de 100644
--- a/toolchain/base/shared_value_stores.h
+++ b/toolchain/base/shared_value_stores.h
@@ -5,7 +5,7 @@
 #ifndef CARBON_TOOLCHAIN_BASE_SHARED_VALUE_STORES_H_
 #define CARBON_TOOLCHAIN_BASE_SHARED_VALUE_STORES_H_
 
-#include "toolchain/base/int_store.h"
+#include "toolchain/base/int.h"
 #include "toolchain/base/mem_usage.h"
 #include "toolchain/base/value_ids.h"
 #include "toolchain/base/value_store.h"
diff --git a/toolchain/sem_ir/BUILD b/toolchain/sem_ir/BUILD
index 8d1ab6e342d6f..f4d97ed69ce21 100644
--- a/toolchain/sem_ir/BUILD
+++ b/toolchain/sem_ir/BUILD
@@ -36,7 +36,7 @@ cc_library(
         "//common:check",
         "//common:ostream",
         "//toolchain/base:index_base",
-        "//toolchain/base:int_store",
+        "//toolchain/base:int",
         "//toolchain/base:shared_value_stores",
         "//toolchain/base:value_ids",
         "//toolchain/diagnostics:diagnostic_emitter",
@@ -56,7 +56,7 @@ cc_library(
     deps = [
         "//common:check",
         "//common:enum_base",
-        "//toolchain/base:int_store",
+        "//toolchain/base:int",
         "//toolchain/parse:node_kind",
         "//toolchain/sem_ir:builtin_inst_kind",
         "//toolchain/sem_ir:ids",
@@ -78,7 +78,7 @@ cc_library(
         "//common:ostream",
         "//common:struct_reflection",
         "//toolchain/base:index_base",
-        "//toolchain/base:int_store",
+        "//toolchain/base:int",
         "//toolchain/base:value_store",
         "@llvm-project//llvm:Support",
     ],
@@ -133,7 +133,7 @@ cc_library(
         "//common:map",
         "//common:ostream",
         "//common:set",
-        "//toolchain/base:int_store",
+        "//toolchain/base:int",
         "//toolchain/base:kind_switch",
         "//toolchain/base:shared_value_stores",
         "//toolchain/base:value_ids",
diff --git a/toolchain/sem_ir/file.h b/toolchain/sem_ir/file.h
index f5b655d9caefa..d33878981847f 100644
--- a/toolchain/sem_ir/file.h
+++ b/toolchain/sem_ir/file.h
@@ -10,7 +10,7 @@
 #include "llvm/ADT/iterator_range.h"
 #include "llvm/Support/Allocator.h"
 #include "llvm/Support/FormatVariadic.h"
-#include "toolchain/base/int_store.h"
+#include "toolchain/base/int.h"
 #include "toolchain/base/shared_value_stores.h"
 #include "toolchain/base/value_store.h"
 #include "toolchain/base/yaml.h"
diff --git a/toolchain/sem_ir/id_kind.h b/toolchain/sem_ir/id_kind.h
index 9c1a78324d381..7ee0fce1fe60c 100644
--- a/toolchain/sem_ir/id_kind.h
+++ b/toolchain/sem_ir/id_kind.h
@@ -7,7 +7,7 @@
 
 #include <algorithm>
 
-#include "toolchain/base/int_store.h"
+#include "toolchain/base/int.h"
 #include "toolchain/sem_ir/ids.h"
 
 namespace Carbon::SemIR {
diff --git a/toolchain/sem_ir/inst.h b/toolchain/sem_ir/inst.h
index a79d59d18cf0e..f1c4c84689c52 100644
--- a/toolchain/sem_ir/inst.h
+++ b/toolchain/sem_ir/inst.h
@@ -13,7 +13,7 @@
 #include "common/ostream.h"
 #include "common/struct_reflection.h"
 #include "toolchain/base/index_base.h"
-#include "toolchain/base/int_store.h"
+#include "toolchain/base/int.h"
 #include "toolchain/base/value_store.h"
 #include "toolchain/sem_ir/block_value_store.h"
 #include "toolchain/sem_ir/builtin_inst_kind.h"
diff --git a/toolchain/sem_ir/typed_insts.h b/toolchain/sem_ir/typed_insts.h
index 875f53f0f2048..6ee46ffda6900 100644
--- a/toolchain/sem_ir/typed_insts.h
+++ b/toolchain/sem_ir/typed_insts.h
@@ -5,7 +5,7 @@
 #ifndef CARBON_TOOLCHAIN_SEM_IR_TYPED_INSTS_H_
 #define CARBON_TOOLCHAIN_SEM_IR_TYPED_INSTS_H_
 
-#include "toolchain/base/int_store.h"
+#include "toolchain/base/int.h"
 #include "toolchain/parse/node_ids.h"
 #include "toolchain/sem_ir/builtin_inst_kind.h"
 #include "toolchain/sem_ir/ids.h"