diff --git a/gcc/rust/Make-lang.in b/gcc/rust/Make-lang.in
index ad41a56523f..25ead232c83 100644
--- a/gcc/rust/Make-lang.in
+++ b/gcc/rust/Make-lang.in
@@ -195,14 +195,14 @@ RUST_ALL_OBJS = $(GRS_OBJS) $(RUST_TARGET_OBJS)
 
 rust_OBJS = $(RUST_ALL_OBJS) rust/rustspec.o
 
-RUST_LDFLAGS = $(LDFLAGS) -L./../libgrust/libproc_macro
-RUST_LIBDEPS = $(LIBDEPS) ../libgrust/libproc_macro/libproc_macro.a
+RUST_LDFLAGS = $(LDFLAGS) -L./../libgrust/libproc_macro_internal
+RUST_LIBDEPS = $(LIBDEPS) ../libgrust/libproc_macro_internal/libproc_macro_internal.a
 
 # The compiler itself is called crab1
 crab1$(exeext): $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(RUST_LIBDEPS) $(rust.prev)
 	@$(call LINK_PROGRESS,$(INDEX.rust),start)
 	+$(LLINKER) $(ALL_LINKERFLAGS) $(RUST_LDFLAGS) -o $@ \
-	      $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(LIBS) ../libgrust/libproc_macro/libproc_macro.a $(BACKENDLIBS)
+	      $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(LIBS) ../libgrust/libproc_macro_internal/libproc_macro_internal.a $(BACKENDLIBS)
 	@$(call LINK_PROGRESS,$(INDEX.rust),end)
 
 # Build hooks.
diff --git a/gcc/rust/expand/rust-macro-expand.h b/gcc/rust/expand/rust-macro-expand.h
index 34fc01f0d0b..04660469a7d 100644
--- a/gcc/rust/expand/rust-macro-expand.h
+++ b/gcc/rust/expand/rust-macro-expand.h
@@ -33,7 +33,7 @@
 #include "rust-token-converter.h"
 #include "rust-ast-collector.h"
 #include "rust-system.h"
-#include "libproc_macro/proc_macro.h"
+#include "libproc_macro_internal/proc_macro.h"
 
 // Provides objects and method prototypes for macro expansion
 
diff --git a/gcc/rust/expand/rust-proc-macro.h b/gcc/rust/expand/rust-proc-macro.h
index 7e9d7ecb609..08d80ee35d9 100644
--- a/gcc/rust/expand/rust-proc-macro.h
+++ b/gcc/rust/expand/rust-proc-macro.h
@@ -17,7 +17,7 @@
 #ifndef RUST_PROC_MACRO_H
 #define RUST_PROC_MACRO_H
 
-#include "libproc_macro/proc_macro.h"
+#include "libproc_macro_internal/proc_macro.h"
 
 namespace Rust {
 /**
diff --git a/gcc/rust/util/rust-hir-map.h b/gcc/rust/util/rust-hir-map.h
index f62885faee9..31f8a1bea59 100644
--- a/gcc/rust/util/rust-hir-map.h
+++ b/gcc/rust/util/rust-hir-map.h
@@ -28,7 +28,7 @@
 #include "rust-hir-full-decls.h"
 #include "rust-lang-item.h"
 #include "rust-privacy-common.h"
-#include "libproc_macro/proc_macro.h"
+#include "libproc_macro_internal/proc_macro.h"
 
 namespace Rust {
 namespace Analysis {
diff --git a/gcc/rust/util/rust-token-converter.cc b/gcc/rust/util/rust-token-converter.cc
index 67d073d5e15..537bca3a3f7 100644
--- a/gcc/rust/util/rust-token-converter.cc
+++ b/gcc/rust/util/rust-token-converter.cc
@@ -16,7 +16,6 @@
 
 #include "rust-lex.h"
 #include "rust-token-converter.h"
-#include "libproc_macro/proc_macro.h"
 #include "bi-map.h"
 #include "line-map.h"
 
diff --git a/gcc/rust/util/rust-token-converter.h b/gcc/rust/util/rust-token-converter.h
index 3e9feebd058..0498041b46c 100644
--- a/gcc/rust/util/rust-token-converter.h
+++ b/gcc/rust/util/rust-token-converter.h
@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "rust-token.h"
-#include "libproc_macro/proc_macro.h"
+#include "libproc_macro_internal/proc_macro.h"
 
 namespace Rust {
 
diff --git a/libgrust/Makefile.am b/libgrust/Makefile.am
index 38ee48a8003..5b38c8842cb 100644
--- a/libgrust/Makefile.am
+++ b/libgrust/Makefile.am
@@ -11,7 +11,7 @@ TOP_GCCDIR := $(shell cd $(top_srcdir) && cd .. && pwd)
 GCC_DIR = $(TOP_GCCDIR)/gcc
 RUST_SRC = $(GCC_DIR)/rust
 
-SUBDIRS = libproc_macro
+SUBDIRS = libproc_macro_internal
 
 RUST_BUILDDIR := $(shell pwd)
 
diff --git a/libgrust/Makefile.in b/libgrust/Makefile.in
index e9a410b9009..d065584d196 100644
--- a/libgrust/Makefile.in
+++ b/libgrust/Makefile.in
@@ -308,7 +308,7 @@ AM_CFLAGS = -I $(srcdir)/../libgcc -I $(MULTIBUILDTOP)../../gcc/include
 TOP_GCCDIR := $(shell cd $(top_srcdir) && cd .. && pwd)
 GCC_DIR = $(TOP_GCCDIR)/gcc
 RUST_SRC = $(GCC_DIR)/rust
-SUBDIRS = libproc_macro
+SUBDIRS = libproc_macro_internal
 RUST_BUILDDIR := $(shell pwd)
 
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
diff --git a/libgrust/configure b/libgrust/configure
index e778a253915..dcdc3142fa2 100755
--- a/libgrust/configure
+++ b/libgrust/configure
@@ -16193,7 +16193,7 @@ esac
 
 
 
-ac_config_files="$ac_config_files libproc_macro/Makefile"
+ac_config_files="$ac_config_files libproc_macro_internal/Makefile"
 
 
 
@@ -17348,7 +17348,7 @@ do
     "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "libproc_macro/Makefile") CONFIG_FILES="$CONFIG_FILES libproc_macro/Makefile" ;;
+    "libproc_macro_internal/Makefile") CONFIG_FILES="$CONFIG_FILES libproc_macro_internal/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -18689,7 +18689,7 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
 _LT_EOF
 
  ;;
-    "libproc_macro/Makefile":F)  cat > vpsed$$ << \_EOF
+    "libproc_macro_internal/Makefile":F)  cat > vpsed$$ << \_EOF
 s!`test -f '$<' || echo '$(srcdir)/'`!!
 _EOF
    sed -f vpsed$$ $ac_file > tmp$$
diff --git a/libgrust/configure.ac b/libgrust/configure.ac
index adfb3500fb3..d55e698fdd8 100644
--- a/libgrust/configure.ac
+++ b/libgrust/configure.ac
@@ -104,7 +104,7 @@ AC_SUBST(toolexecdir)
 AC_SUBST(toolexeclibdir)
 
 
-AC_CONFIG_FILES(AC_FOREACH([DIR], [libproc_macro], [DIR/Makefile ]),
+AC_CONFIG_FILES(AC_FOREACH([DIR], [libproc_macro_internal], [DIR/Makefile ]),
  [ cat > vpsed$$ << \_EOF
 s!`test -f '$<' || echo '$(srcdir)/'`!!
 _EOF
diff --git a/libgrust/libproc_macro/Makefile.am b/libgrust/libproc_macro_internal/Makefile.am
similarity index 97%
rename from libgrust/libproc_macro/Makefile.am
rename to libgrust/libproc_macro_internal/Makefile.am
index 24945a40fa8..da996103b22 100644
--- a/libgrust/libproc_macro/Makefile.am
+++ b/libgrust/libproc_macro_internal/Makefile.am
@@ -47,7 +47,8 @@ AM_MAKEFLAGS = \
 	"WERROR=$(WERROR)" \
         "TARGET_LIB_PATH=$(TARGET_LIB_PATH)"
 
-TARGETLIB = ./libproc_macro.a
+
+TARGETLIB = ./libproc_macro_internal.a
 LIBOBJS = @LIBOBJS@
 objext = @OBJEXT@
 
diff --git a/libgrust/libproc_macro/Makefile.in b/libgrust/libproc_macro_internal/Makefile.in
similarity index 98%
rename from libgrust/libproc_macro/Makefile.in
rename to libgrust/libproc_macro_internal/Makefile.in
index db5f2d4f62f..68aa4610689 100644
--- a/libgrust/libproc_macro/Makefile.in
+++ b/libgrust/libproc_macro_internal/Makefile.in
@@ -88,7 +88,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-subdir = libproc_macro
+subdir = libproc_macro_internal
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
 	$(top_srcdir)/../config/cet.m4 \
@@ -308,7 +308,7 @@ AM_MAKEFLAGS = \
 	"WERROR=$(WERROR)" \
         "TARGET_LIB_PATH=$(TARGET_LIB_PATH)"
 
-TARGETLIB = ./libproc_macro.a
+TARGETLIB = ./libproc_macro_internal.a
 objext = @OBJEXT@
 REQUIRED_OFILES = \
 	./proc_macro.$(objext) \
@@ -334,9 +334,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libproc_macro/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libproc_macro_internal/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign libproc_macro/Makefile
+	  $(AUTOMAKE) --foreign libproc_macro_internal/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/libgrust/libproc_macro/bridge.h b/libgrust/libproc_macro_internal/bridge.h
similarity index 100%
rename from libgrust/libproc_macro/bridge.h
rename to libgrust/libproc_macro_internal/bridge.h
diff --git a/libgrust/libproc_macro/ffistring.cc b/libgrust/libproc_macro_internal/ffistring.cc
similarity index 100%
rename from libgrust/libproc_macro/ffistring.cc
rename to libgrust/libproc_macro_internal/ffistring.cc
diff --git a/libgrust/libproc_macro/ffistring.h b/libgrust/libproc_macro_internal/ffistring.h
similarity index 100%
rename from libgrust/libproc_macro/ffistring.h
rename to libgrust/libproc_macro_internal/ffistring.h
diff --git a/libgrust/libproc_macro/group.cc b/libgrust/libproc_macro_internal/group.cc
similarity index 100%
rename from libgrust/libproc_macro/group.cc
rename to libgrust/libproc_macro_internal/group.cc
diff --git a/libgrust/libproc_macro/group.h b/libgrust/libproc_macro_internal/group.h
similarity index 100%
rename from libgrust/libproc_macro/group.h
rename to libgrust/libproc_macro_internal/group.h
diff --git a/libgrust/libproc_macro/ident.cc b/libgrust/libproc_macro_internal/ident.cc
similarity index 100%
rename from libgrust/libproc_macro/ident.cc
rename to libgrust/libproc_macro_internal/ident.cc
diff --git a/libgrust/libproc_macro/ident.h b/libgrust/libproc_macro_internal/ident.h
similarity index 100%
rename from libgrust/libproc_macro/ident.h
rename to libgrust/libproc_macro_internal/ident.h
diff --git a/libgrust/libproc_macro/literal.cc b/libgrust/libproc_macro_internal/literal.cc
similarity index 100%
rename from libgrust/libproc_macro/literal.cc
rename to libgrust/libproc_macro_internal/literal.cc
diff --git a/libgrust/libproc_macro/literal.h b/libgrust/libproc_macro_internal/literal.h
similarity index 100%
rename from libgrust/libproc_macro/literal.h
rename to libgrust/libproc_macro_internal/literal.h
diff --git a/libgrust/libproc_macro/proc_macro.cc b/libgrust/libproc_macro_internal/proc_macro.cc
similarity index 100%
rename from libgrust/libproc_macro/proc_macro.cc
rename to libgrust/libproc_macro_internal/proc_macro.cc
diff --git a/libgrust/libproc_macro/proc_macro.h b/libgrust/libproc_macro_internal/proc_macro.h
similarity index 100%
rename from libgrust/libproc_macro/proc_macro.h
rename to libgrust/libproc_macro_internal/proc_macro.h
diff --git a/libgrust/libproc_macro/punct.cc b/libgrust/libproc_macro_internal/punct.cc
similarity index 100%
rename from libgrust/libproc_macro/punct.cc
rename to libgrust/libproc_macro_internal/punct.cc
diff --git a/libgrust/libproc_macro/punct.h b/libgrust/libproc_macro_internal/punct.h
similarity index 100%
rename from libgrust/libproc_macro/punct.h
rename to libgrust/libproc_macro_internal/punct.h
diff --git a/libgrust/libproc_macro/registration.h b/libgrust/libproc_macro_internal/registration.h
similarity index 100%
rename from libgrust/libproc_macro/registration.h
rename to libgrust/libproc_macro_internal/registration.h
diff --git a/libgrust/libproc_macro/rust/bridge.rs b/libgrust/libproc_macro_internal/rust/bridge.rs
similarity index 100%
rename from libgrust/libproc_macro/rust/bridge.rs
rename to libgrust/libproc_macro_internal/rust/bridge.rs
diff --git a/libgrust/libproc_macro/rust/bridge/ffistring.rs b/libgrust/libproc_macro_internal/rust/bridge/ffistring.rs
similarity index 100%
rename from libgrust/libproc_macro/rust/bridge/ffistring.rs
rename to libgrust/libproc_macro_internal/rust/bridge/ffistring.rs
diff --git a/libgrust/libproc_macro/rust/bridge/group.rs b/libgrust/libproc_macro_internal/rust/bridge/group.rs
similarity index 100%
rename from libgrust/libproc_macro/rust/bridge/group.rs
rename to libgrust/libproc_macro_internal/rust/bridge/group.rs
diff --git a/libgrust/libproc_macro/rust/bridge/ident.rs b/libgrust/libproc_macro_internal/rust/bridge/ident.rs
similarity index 100%
rename from libgrust/libproc_macro/rust/bridge/ident.rs
rename to libgrust/libproc_macro_internal/rust/bridge/ident.rs
diff --git a/libgrust/libproc_macro/rust/bridge/literal.rs b/libgrust/libproc_macro_internal/rust/bridge/literal.rs
similarity index 100%
rename from libgrust/libproc_macro/rust/bridge/literal.rs
rename to libgrust/libproc_macro_internal/rust/bridge/literal.rs
diff --git a/libgrust/libproc_macro/rust/bridge/punct.rs b/libgrust/libproc_macro_internal/rust/bridge/punct.rs
similarity index 100%
rename from libgrust/libproc_macro/rust/bridge/punct.rs
rename to libgrust/libproc_macro_internal/rust/bridge/punct.rs
diff --git a/libgrust/libproc_macro/rust/bridge/span.rs b/libgrust/libproc_macro_internal/rust/bridge/span.rs
similarity index 100%
rename from libgrust/libproc_macro/rust/bridge/span.rs
rename to libgrust/libproc_macro_internal/rust/bridge/span.rs
diff --git a/libgrust/libproc_macro/rust/bridge/token_stream.rs b/libgrust/libproc_macro_internal/rust/bridge/token_stream.rs
similarity index 100%
rename from libgrust/libproc_macro/rust/bridge/token_stream.rs
rename to libgrust/libproc_macro_internal/rust/bridge/token_stream.rs
diff --git a/libgrust/libproc_macro/rust/group.rs b/libgrust/libproc_macro_internal/rust/group.rs
similarity index 100%
rename from libgrust/libproc_macro/rust/group.rs
rename to libgrust/libproc_macro_internal/rust/group.rs
diff --git a/libgrust/libproc_macro/rust/ident.rs b/libgrust/libproc_macro_internal/rust/ident.rs
similarity index 100%
rename from libgrust/libproc_macro/rust/ident.rs
rename to libgrust/libproc_macro_internal/rust/ident.rs
diff --git a/libgrust/libproc_macro/rust/lib.rs b/libgrust/libproc_macro_internal/rust/lib.rs
similarity index 100%
rename from libgrust/libproc_macro/rust/lib.rs
rename to libgrust/libproc_macro_internal/rust/lib.rs
diff --git a/libgrust/libproc_macro/rust/literal.rs b/libgrust/libproc_macro_internal/rust/literal.rs
similarity index 100%
rename from libgrust/libproc_macro/rust/literal.rs
rename to libgrust/libproc_macro_internal/rust/literal.rs
diff --git a/libgrust/libproc_macro/rust/punct.rs b/libgrust/libproc_macro_internal/rust/punct.rs
similarity index 100%
rename from libgrust/libproc_macro/rust/punct.rs
rename to libgrust/libproc_macro_internal/rust/punct.rs
diff --git a/libgrust/libproc_macro/rust/span.rs b/libgrust/libproc_macro_internal/rust/span.rs
similarity index 100%
rename from libgrust/libproc_macro/rust/span.rs
rename to libgrust/libproc_macro_internal/rust/span.rs
diff --git a/libgrust/libproc_macro/rust/token_stream.rs b/libgrust/libproc_macro_internal/rust/token_stream.rs
similarity index 100%
rename from libgrust/libproc_macro/rust/token_stream.rs
rename to libgrust/libproc_macro_internal/rust/token_stream.rs
diff --git a/libgrust/libproc_macro/span.cc b/libgrust/libproc_macro_internal/span.cc
similarity index 100%
rename from libgrust/libproc_macro/span.cc
rename to libgrust/libproc_macro_internal/span.cc
diff --git a/libgrust/libproc_macro/span.h b/libgrust/libproc_macro_internal/span.h
similarity index 100%
rename from libgrust/libproc_macro/span.h
rename to libgrust/libproc_macro_internal/span.h
diff --git a/libgrust/libproc_macro/tokenstream.cc b/libgrust/libproc_macro_internal/tokenstream.cc
similarity index 100%
rename from libgrust/libproc_macro/tokenstream.cc
rename to libgrust/libproc_macro_internal/tokenstream.cc
diff --git a/libgrust/libproc_macro/tokenstream.h b/libgrust/libproc_macro_internal/tokenstream.h
similarity index 100%
rename from libgrust/libproc_macro/tokenstream.h
rename to libgrust/libproc_macro_internal/tokenstream.h
diff --git a/libgrust/libproc_macro/tokentree.cc b/libgrust/libproc_macro_internal/tokentree.cc
similarity index 100%
rename from libgrust/libproc_macro/tokentree.cc
rename to libgrust/libproc_macro_internal/tokentree.cc
diff --git a/libgrust/libproc_macro/tokentree.h b/libgrust/libproc_macro_internal/tokentree.h
similarity index 100%
rename from libgrust/libproc_macro/tokentree.h
rename to libgrust/libproc_macro_internal/tokentree.h