diff --git a/BUILD b/BUILD
index cfd6f11b19..29ab7cf5c2 100644
--- a/BUILD
+++ b/BUILD
@@ -81,14 +81,14 @@ cc_library(
     name = "upb",
     srcs = [
         "upb/decode.c",
-        "upb/decode.int.h",
+        "upb/decode_internal.h",
         "upb/encode.c",
         "upb/msg.c",
-        "upb/msg.int.h",
+        "upb/msg_internal.h",
         "upb/table.c",
-        "upb/table.int.h",
+        "upb/table_internal.h",
         "upb/upb.c",
-        "upb/upb.int.h",
+        "upb/upb_internal.h",
     ],
     hdrs = [
         "upb/decode.h",
@@ -109,12 +109,12 @@ cc_library(
 cc_library(
     name = "fastdecode",
     srcs = [
-        "upb/decode.int.h",
+        "upb/decode_internal.h",
         "upb/decode_fast.c",
         "upb/decode_fast.h",
         "upb/msg.h",
-        "upb/msg.int.h",
-        "upb/upb.int.h",
+        "upb/msg_internal.h",
+        "upb/upb_internal.h",
     ],
     copts = UPB_DEFAULT_COPTS,
     deps = [
@@ -221,7 +221,7 @@ cc_library(
 cc_library(
     name = "table",
     hdrs = [
-        "upb/table.int.h",
+        "upb/table_internal.h",
         "upb/upb.h",
     ],
     visibility = ["//tests:__pkg__"],
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 807eaba397..66118ec088 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -64,14 +64,14 @@ enable_testing()
 add_library(port INTERFACE)
 add_library(upb
   ../upb/decode.c
-  ../upb/decode.int.h
+  ../upb/decode_internal.h
   ../upb/encode.c
   ../upb/msg.c
-  ../upb/msg.int.h
+  ../upb/msg_internal.h
   ../upb/table.c
-  ../upb/table.int.h
+  ../upb/table_internal.h
   ../upb/upb.c
-  ../upb/upb.int.h
+  ../upb/upb_internal.h
   ../upb/decode.h
   ../upb/encode.h
   ../upb/msg.h
@@ -82,12 +82,12 @@ target_link_libraries(upb
   port
   /third_party/wyhash)
 add_library(fastdecode
-  ../upb/decode.int.h
+  ../upb/decode_internal.h
   ../upb/decode_fast.c
   ../upb/decode_fast.h
   ../upb/msg.h
-  ../upb/msg.int.h
-  ../upb/upb.int.h)
+  ../upb/msg_internal.h
+  ../upb/upb_internal.h)
 target_link_libraries(fastdecode
   port
   table)
diff --git a/cmake/google/protobuf/descriptor.upb.c b/cmake/google/protobuf/descriptor.upb.c
index 838aa1b487..98d5444bd2 100644
--- a/cmake/google/protobuf/descriptor.upb.c
+++ b/cmake/google/protobuf/descriptor.upb.c
@@ -7,7 +7,7 @@
  * regenerated. */
 
 #include <stddef.h>
-#include "upb/msg.int.h"
+#include "upb/msg_internal.h"
 #include "google/protobuf/descriptor.upb.h"
 
 #include "upb/port_def.inc"
diff --git a/cmake/google/protobuf/descriptor.upb.h b/cmake/google/protobuf/descriptor.upb.h
index de86e42b2e..4e2401b71c 100644
--- a/cmake/google/protobuf/descriptor.upb.h
+++ b/cmake/google/protobuf/descriptor.upb.h
@@ -9,7 +9,7 @@
 #ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
 #define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
 
-#include "upb/msg.int.h"
+#include "upb/msg_internal.h"
 #include "upb/decode.h"
 #include "upb/decode_fast.h"
 #include "upb/encode.h"
diff --git a/tests/test_table.cc b/tests/test_table.cc
index 04853ef6bb..84ede2be2d 100644
--- a/tests/test_table.cc
+++ b/tests/test_table.cc
@@ -39,7 +39,7 @@
 
 #include "tests/upb_test.h"
 #include "upb/upb.hpp"
-#include "upb/table.int.h"
+#include "upb/table_internal.h"
 
 #include "upb/port_def.inc"
 
diff --git a/upb/decode.c b/upb/decode.c
index c985640b28..ecbfc9b1c2 100644
--- a/upb/decode.c
+++ b/upb/decode.c
@@ -30,9 +30,9 @@
 #include <setjmp.h>
 #include <string.h>
 
-#include "upb/decode.int.h"
+#include "upb/decode_internal.h"
 #include "upb/upb.h"
-#include "upb/upb.int.h"
+#include "upb/upb_internal.h"
 
 /* Must be last. */
 #include "upb/port_def.inc"
diff --git a/upb/decode_fast.c b/upb/decode_fast.c
index 80084e6a23..256c9f93d2 100644
--- a/upb/decode_fast.c
+++ b/upb/decode_fast.c
@@ -37,7 +37,7 @@
 
 #include "upb/decode_fast.h"
 
-#include "upb/decode.int.h"
+#include "upb/decode_internal.h"
 
 /* Must be last. */
 #include "upb/port_def.inc"
diff --git a/upb/decode.int.h b/upb/decode_internal.h
similarity index 99%
rename from upb/decode.int.h
rename to upb/decode_internal.h
index 2372e0f2e4..d993078487 100644
--- a/upb/decode.int.h
+++ b/upb/decode_internal.h
@@ -35,8 +35,8 @@
 
 #include <setjmp.h>
 
-#include "upb/msg.int.h"
-#include "upb/upb.int.h"
+#include "upb/msg_internal.h"
+#include "upb/upb_internal.h"
 
 /* Must be last. */
 #include "upb/port_def.inc"
diff --git a/upb/def.h b/upb/def.h
index 5354adcf06..24dc8b3776 100644
--- a/upb/def.h
+++ b/upb/def.h
@@ -42,7 +42,7 @@
 #define UPB_DEF_H_
 
 #include "upb/upb.h"
-#include "upb/table.int.h"
+#include "upb/table_internal.h"
 #include "google/protobuf/descriptor.upb.h"
 
 /* Must be last. */
diff --git a/upb/encode.c b/upb/encode.c
index bff1603b7b..f3149f2b31 100644
--- a/upb/encode.c
+++ b/upb/encode.c
@@ -32,7 +32,7 @@
 #include <setjmp.h>
 #include <string.h>
 
-#include "upb/msg.int.h"
+#include "upb/msg_internal.h"
 #include "upb/upb.h"
 
 /* Must be last. */
diff --git a/upb/msg.c b/upb/msg.c
index ba828e8d9b..d2ac2bbe79 100644
--- a/upb/msg.c
+++ b/upb/msg.c
@@ -27,9 +27,9 @@
 
 #include "upb/msg.h"
 
-#include "upb/msg.int.h"
+#include "upb/msg_internal.h"
 #include "upb/port_def.inc"
-#include "upb/table.int.h"
+#include "upb/table_internal.h"
 
 /** upb_msg *******************************************************************/
 
diff --git a/upb/msg.int.h b/upb/msg_internal.h
similarity index 99%
rename from upb/msg.int.h
rename to upb/msg_internal.h
index 6674032988..a279f50b9a 100644
--- a/upb/msg.int.h
+++ b/upb/msg_internal.h
@@ -13,7 +13,7 @@
 #include <string.h>
 
 #include "upb/msg.h"
-#include "upb/table.int.h"
+#include "upb/table_internal.h"
 #include "upb/upb.h"
 
 /* Must be last. */
diff --git a/upb/reflection.c b/upb/reflection.c
index 43af1cef86..b562190e30 100644
--- a/upb/reflection.c
+++ b/upb/reflection.c
@@ -28,7 +28,7 @@
 #include "upb/reflection.h"
 
 #include <string.h>
-#include "upb/table.int.h"
+#include "upb/table_internal.h"
 #include "upb/msg.h"
 
 #include "upb/port_def.inc"
diff --git a/upb/table.c b/upb/table.c
index 35f23bef2c..9ef05ec939 100644
--- a/upb/table.c
+++ b/upb/table.c
@@ -34,7 +34,7 @@
 #include <string.h>
 
 #include "third_party/wyhash/wyhash.h"
-#include "upb/table.int.h"
+#include "upb/table_internal.h"
 
 /* Must be last. */
 #include "upb/port_def.inc"
diff --git a/upb/table.int.h b/upb/table_internal.h
similarity index 100%
rename from upb/table.int.h
rename to upb/table_internal.h
diff --git a/upb/upb.c b/upb/upb.c
index 2c0c4c15f8..fd0290b3b1 100644
--- a/upb/upb.c
+++ b/upb/upb.c
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "upb/upb.int.h"
+#include "upb/upb_internal.h"
 
 #include <errno.h>
 #include <stdarg.h>
diff --git a/upb/upb.int.h b/upb/upb_internal.h
similarity index 100%
rename from upb/upb.int.h
rename to upb/upb_internal.h
diff --git a/upbc/protoc-gen-upb.cc b/upbc/protoc-gen-upb.cc
index eebfda3a99..0d4fede363 100644
--- a/upbc/protoc-gen-upb.cc
+++ b/upbc/protoc-gen-upb.cc
@@ -511,7 +511,7 @@ void WriteHeader(const protobuf::FileDescriptor* file, Output& output) {
   output(
       "#ifndef $0_UPB_H_\n"
       "#define $0_UPB_H_\n\n"
-      "#include \"upb/msg.int.h\"\n"
+      "#include \"upb/msg_internal.h\"\n"
       "#include \"upb/decode.h\"\n"
       "#include \"upb/decode_fast.h\"\n"
       "#include \"upb/encode.h\"\n\n",
@@ -849,7 +849,7 @@ void WriteSource(const protobuf::FileDescriptor* file, Output& output,
 
   output(
       "#include <stddef.h>\n"
-      "#include \"upb/msg.int.h\"\n"
+      "#include \"upb/msg_internal.h\"\n"
       "#include \"$0\"\n",
       HeaderFilename(file->name()));