From b40ea4a06950c94a46f410d734cb6fd3b9938c4d Mon Sep 17 00:00:00 2001
From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com>
Date: Fri, 30 Jun 2023 16:17:33 +1000
Subject: [PATCH] Patterns: Rename Library to Patterns (#52102)

---
 .../src/site-editor-navigation-commands.js    |  2 +-
 .../components/create-pattern-modal/index.js  |  2 +-
 .../src/components/page-main/index.js         |  6 +-
 .../grid-item.js                              | 14 +--
 .../{page-library => page-patterns}/grid.js   |  2 +-
 .../{page-library => page-patterns}/index.js  | 10 +-
 .../no-patterns.js                            |  2 +-
 .../patterns-list.js                          | 12 +--
 .../search-items.js                           |  0
 .../style.scss                                | 22 ++---
 .../use-pattern-settings.js}                  |  2 +-
 .../use-patterns.js                           |  0
 .../{page-library => page-patterns}/utils.js  |  0
 .../style.scss                                |  3 -
 .../sidebar-navigation-screen-main/index.js   |  4 +-
 .../index.js                                  |  2 +-
 .../category-item.js                          |  6 +-
 .../index.js                                  | 16 +--
 .../style.scss                                |  3 +
 .../use-default-pattern-categories.js         |  0
 .../use-my-patterns.js                        |  0
 .../use-pattern-categories.js                 |  0
 .../use-template-part-areas.js                |  0
 .../use-theme-patterns.js                     |  2 +-
 .../index.js                                  |  2 +-
 .../index.js                                  | 97 +++----------------
 .../edit-site/src/components/sidebar/index.js |  6 +-
 .../use-sync-path-with-url.js                 |  2 +-
 packages/edit-site/src/style.scss             |  4 +-
 .../edit-site/src/utils/get-is-list-page.js   |  6 +-
 .../site-editor-url-navigation.spec.js        |  2 +-
 31 files changed, 81 insertions(+), 148 deletions(-)
 rename packages/edit-site/src/components/{page-library => page-patterns}/grid-item.js (92%)
 rename packages/edit-site/src/components/{page-library => page-patterns}/grid.js (94%)
 rename packages/edit-site/src/components/{page-library => page-patterns}/index.js (83%)
 rename packages/edit-site/src/components/{page-library => page-patterns}/no-patterns.js (77%)
 rename packages/edit-site/src/components/{page-library => page-patterns}/patterns-list.js (89%)
 rename packages/edit-site/src/components/{page-library => page-patterns}/search-items.js (100%)
 rename packages/edit-site/src/components/{page-library => page-patterns}/style.scss (82%)
 rename packages/edit-site/src/components/{page-library/use-library-settings.js => page-patterns/use-pattern-settings.js} (96%)
 rename packages/edit-site/src/components/{page-library => page-patterns}/use-patterns.js (100%)
 rename packages/edit-site/src/components/{page-library => page-patterns}/utils.js (100%)
 delete mode 100644 packages/edit-site/src/components/sidebar-navigation-screen-library/style.scss
 rename packages/edit-site/src/components/{sidebar-navigation-screen-library => sidebar-navigation-screen-patterns}/category-item.js (86%)
 rename packages/edit-site/src/components/{sidebar-navigation-screen-library => sidebar-navigation-screen-patterns}/index.js (94%)
 create mode 100644 packages/edit-site/src/components/sidebar-navigation-screen-patterns/style.scss
 rename packages/edit-site/src/components/{sidebar-navigation-screen-library => sidebar-navigation-screen-patterns}/use-default-pattern-categories.js (100%)
 rename packages/edit-site/src/components/{sidebar-navigation-screen-library => sidebar-navigation-screen-patterns}/use-my-patterns.js (100%)
 rename packages/edit-site/src/components/{sidebar-navigation-screen-library => sidebar-navigation-screen-patterns}/use-pattern-categories.js (100%)
 rename packages/edit-site/src/components/{sidebar-navigation-screen-library => sidebar-navigation-screen-patterns}/use-template-part-areas.js (100%)
 rename packages/edit-site/src/components/{sidebar-navigation-screen-library => sidebar-navigation-screen-patterns}/use-theme-patterns.js (96%)

diff --git a/packages/core-commands/src/site-editor-navigation-commands.js b/packages/core-commands/src/site-editor-navigation-commands.js
index 6331afd058de34..8f2003d0e08a27 100644
--- a/packages/core-commands/src/site-editor-navigation-commands.js
+++ b/packages/core-commands/src/site-editor-navigation-commands.js
@@ -203,7 +203,7 @@ function useSiteEditorBasicNavigationCommands() {
 			icon: symbolFilled,
 			callback: ( { close } ) => {
 				const args = {
-					path: '/library',
+					path: '/patterns',
 				};
 				const targetUrl = addQueryArgs( 'site-editor.php', args );
 				if ( isSiteEditor ) {
diff --git a/packages/edit-site/src/components/create-pattern-modal/index.js b/packages/edit-site/src/components/create-pattern-modal/index.js
index 5180ad5d870684..bd83b369c3abb3 100644
--- a/packages/edit-site/src/components/create-pattern-modal/index.js
+++ b/packages/edit-site/src/components/create-pattern-modal/index.js
@@ -18,7 +18,7 @@ import { useDispatch } from '@wordpress/data';
 /**
  * Internal dependencies
  */
-import { SYNC_TYPES, USER_PATTERN_CATEGORY } from '../page-library/utils';
+import { SYNC_TYPES, USER_PATTERN_CATEGORY } from '../page-patterns/utils';
 
 export default function CreatePatternModal( {
 	closeModal,
diff --git a/packages/edit-site/src/components/page-main/index.js b/packages/edit-site/src/components/page-main/index.js
index a6c05886888c45..af017a8db9700a 100644
--- a/packages/edit-site/src/components/page-main/index.js
+++ b/packages/edit-site/src/components/page-main/index.js
@@ -6,7 +6,7 @@ import { privateApis as routerPrivateApis } from '@wordpress/router';
 /**
  * Internal dependencies
  */
-import PageLibrary from '../page-library';
+import PagePatterns from '../page-patterns';
 import PageTemplateParts from '../page-template-parts';
 import PageTemplates from '../page-templates';
 import { unlock } from '../../lock-unlock';
@@ -22,8 +22,8 @@ export default function PageMain() {
 		return <PageTemplates />;
 	} else if ( path === '/wp_template_part/all' ) {
 		return <PageTemplateParts />;
-	} else if ( path === '/library' ) {
-		return <PageLibrary />;
+	} else if ( path === '/patterns' ) {
+		return <PagePatterns />;
 	}
 
 	return null;
diff --git a/packages/edit-site/src/components/page-library/grid-item.js b/packages/edit-site/src/components/page-patterns/grid-item.js
similarity index 92%
rename from packages/edit-site/src/components/page-library/grid-item.js
rename to packages/edit-site/src/components/page-patterns/grid-item.js
index 726f7a9896adc2..cc9d99fd900136 100644
--- a/packages/edit-site/src/components/page-library/grid-item.js
+++ b/packages/edit-site/src/components/page-patterns/grid-item.js
@@ -39,7 +39,7 @@ import { useLink } from '../routes/link';
 
 export default function GridItem( { categoryId, composite, icon, item } ) {
 	const instanceId = useInstanceId( GridItem );
-	const descriptionId = `edit-site-library__pattern-description-${ instanceId }`;
+	const descriptionId = `edit-site-patterns__pattern-description-${ instanceId }`;
 	const [ isDeleteDialogOpen, setIsDeleteDialogOpen ] = useState( false );
 
 	const { __experimentalDeleteReusableBlock } =
@@ -61,10 +61,10 @@ export default function GridItem( { categoryId, composite, icon, item } ) {
 	};
 
 	const isEmpty = ! item.blocks?.length;
-	const patternClassNames = classnames( 'edit-site-library__pattern', {
+	const patternClassNames = classnames( 'edit-site-patterns__pattern', {
 		'is-placeholder': isEmpty,
 	} );
-	const previewClassNames = classnames( 'edit-site-library__preview', {
+	const previewClassNames = classnames( 'edit-site-patterns__preview', {
 		'is-inactive': item.type === PATTERNS,
 	} );
 
@@ -132,14 +132,14 @@ export default function GridItem( { categoryId, composite, icon, item } ) {
 				) }
 				<HStack
 					aria-hidden="true"
-					className="edit-site-library__footer"
+					className="edit-site-patterns__footer"
 					justify="space-between"
 				>
 					<HStack
 						alignment="center"
 						justify="left"
 						spacing={ 3 }
-						className="edit-site-library__pattern-title"
+						className="edit-site-patterns__pattern-title"
 					>
 						{ icon && <Icon icon={ itemIcon } /> }
 						<Heading level={ 5 }>{ item.title }</Heading>
@@ -148,10 +148,10 @@ export default function GridItem( { categoryId, composite, icon, item } ) {
 						<DropdownMenu
 							icon={ moreHorizontal }
 							label={ __( 'Actions' ) }
-							className="edit-site-library__dropdown"
+							className="edit-site-patterns__dropdown"
 							popoverProps={ { placement: 'bottom-end' } }
 							toggleProps={ {
-								className: 'edit-site-library__button',
+								className: 'edit-site-patterns__button',
 								isSmall: true,
 								describedBy: sprintf(
 									/* translators: %s: pattern name */
diff --git a/packages/edit-site/src/components/page-library/grid.js b/packages/edit-site/src/components/page-patterns/grid.js
similarity index 94%
rename from packages/edit-site/src/components/page-library/grid.js
rename to packages/edit-site/src/components/page-patterns/grid.js
index cbd1f7ee724d2b..3f6e5fd01f72fe 100644
--- a/packages/edit-site/src/components/page-library/grid.js
+++ b/packages/edit-site/src/components/page-patterns/grid.js
@@ -22,7 +22,7 @@ export default function Grid( { categoryId, label, icon, items } ) {
 		<Composite
 			{ ...composite }
 			role="listbox"
-			className="edit-site-library__grid"
+			className="edit-site-patterns__grid"
 			aria-label={ label }
 		>
 			{ items.map( ( item ) => (
diff --git a/packages/edit-site/src/components/page-library/index.js b/packages/edit-site/src/components/page-patterns/index.js
similarity index 83%
rename from packages/edit-site/src/components/page-library/index.js
rename to packages/edit-site/src/components/page-patterns/index.js
index 76050c59717820..961ed51f39e5d6 100644
--- a/packages/edit-site/src/components/page-library/index.js
+++ b/packages/edit-site/src/components/page-patterns/index.js
@@ -11,16 +11,16 @@ import { getQueryArgs } from '@wordpress/url';
 import { DEFAULT_CATEGORY, DEFAULT_TYPE } from './utils';
 import Page from '../page';
 import PatternsList from './patterns-list';
-import useLibrarySettings from './use-library-settings';
+import usePatternSettings from './use-pattern-settings';
 import { unlock } from '../../lock-unlock';
 
 const { ExperimentalBlockEditorProvider } = unlock( blockEditorPrivateApis );
 
-export default function PageLibrary() {
+export default function PagePatterns() {
 	const { categoryType, categoryId } = getQueryArgs( window.location.href );
 	const type = categoryType || DEFAULT_TYPE;
 	const category = categoryId || DEFAULT_CATEGORY;
-	const settings = useLibrarySettings();
+	const settings = usePatternSettings();
 
 	// Wrap everything in a block editor provider.
 	// This ensures 'styles' that are needed for the previews are synced
@@ -28,8 +28,8 @@ export default function PageLibrary() {
 	return (
 		<ExperimentalBlockEditorProvider settings={ settings }>
 			<Page
-				className="edit-site-library"
-				title={ __( 'Library content' ) }
+				className="edit-site-patterns"
+				title={ __( 'Patterns content' ) }
 				hideTitleFromUI
 			>
 				<PatternsList type={ type } categoryId={ category } />
diff --git a/packages/edit-site/src/components/page-library/no-patterns.js b/packages/edit-site/src/components/page-patterns/no-patterns.js
similarity index 77%
rename from packages/edit-site/src/components/page-library/no-patterns.js
rename to packages/edit-site/src/components/page-patterns/no-patterns.js
index 27d9380aab661c..b4805f57018c7c 100644
--- a/packages/edit-site/src/components/page-library/no-patterns.js
+++ b/packages/edit-site/src/components/page-patterns/no-patterns.js
@@ -5,7 +5,7 @@ import { __ } from '@wordpress/i18n';
 
 export default function NoPatterns() {
 	return (
-		<div className="edit-site-library__no-results">
+		<div className="edit-site-patterns__no-results">
 			{ __( 'No patterns found.' ) }
 		</div>
 	);
diff --git a/packages/edit-site/src/components/page-library/patterns-list.js b/packages/edit-site/src/components/page-patterns/patterns-list.js
similarity index 89%
rename from packages/edit-site/src/components/page-library/patterns-list.js
rename to packages/edit-site/src/components/page-patterns/patterns-list.js
index 32ab28944ecb13..2dfe197c379638 100644
--- a/packages/edit-site/src/components/page-library/patterns-list.js
+++ b/packages/edit-site/src/components/page-patterns/patterns-list.js
@@ -51,19 +51,19 @@ export default function PatternsList( { categoryId, type } ) {
 						icon={ isRTL() ? chevronRight : chevronLeft }
 						label={ __( 'Back' ) }
 						onClick={ () => {
-							// Go back in history if we came from the library page.
+							// Go back in history if we came from the Patterns page.
 							// Otherwise push a stack onto the history.
-							if ( location.state?.backPath === '/library' ) {
+							if ( location.state?.backPath === '/patterns' ) {
 								history.back();
 							} else {
-								history.push( { path: '/library' } );
+								history.push( { path: '/patterns' } );
 							}
 						} }
 					/>
 				) }
 				<FlexBlock>
 					<SearchControl
-						className="edit-site-library__search"
+						className="edit-site-patterns__search"
 						onChange={ ( value ) => setFilterValue( value ) }
 						placeholder={ __( 'Search patterns' ) }
 						label={ __( 'Search patterns' ) }
@@ -75,7 +75,7 @@ export default function PatternsList( { categoryId, type } ) {
 			{ isResolving && __( 'Loading' ) }
 			{ ! isResolving && !! syncedPatterns.length && (
 				<>
-					<VStack className="edit-site-library__section-header">
+					<VStack className="edit-site-patterns__section-header">
 						<Heading level={ 4 }>{ __( 'Synced' ) }</Heading>
 						<Text variant="muted" as="p">
 							{ __(
@@ -93,7 +93,7 @@ export default function PatternsList( { categoryId, type } ) {
 			) }
 			{ ! isResolving && !! unsyncedPatterns.length && (
 				<>
-					<VStack className="edit-site-library__section-header">
+					<VStack className="edit-site-patterns__section-header">
 						<Heading level={ 4 }>{ __( 'Standard' ) }</Heading>
 						<Text variant="muted" as="p">
 							{ __(
diff --git a/packages/edit-site/src/components/page-library/search-items.js b/packages/edit-site/src/components/page-patterns/search-items.js
similarity index 100%
rename from packages/edit-site/src/components/page-library/search-items.js
rename to packages/edit-site/src/components/page-patterns/search-items.js
diff --git a/packages/edit-site/src/components/page-library/style.scss b/packages/edit-site/src/components/page-patterns/style.scss
similarity index 82%
rename from packages/edit-site/src/components/page-library/style.scss
rename to packages/edit-site/src/components/page-patterns/style.scss
index f0bb6b30b9db62..a7402841136e44 100644
--- a/packages/edit-site/src/components/page-library/style.scss
+++ b/packages/edit-site/src/components/page-patterns/style.scss
@@ -1,4 +1,4 @@
-.edit-site-library {
+.edit-site-patterns {
 	background: rgba(0, 0, 0, 0.05);
 	margin: $header-height 0 0;
 	.components-text {
@@ -14,7 +14,7 @@
 	}
 }
 
-.edit-site-library__grid {
+.edit-site-patterns__grid {
 	column-gap: $grid-unit-30;
 	@include break-large() {
 		column-count: 2;
@@ -25,13 +25,13 @@
 	padding-top: $border-width-focus-fallback;
 	margin-bottom: $grid-unit-40;
 
-	.edit-site-library__pattern {
+	.edit-site-patterns__pattern {
 		break-inside: avoid-column;
 		display: flex;
 		flex-direction: column;
 		margin-bottom: $grid-unit-60;
 
-		.edit-site-library__preview {
+		.edit-site-patterns__preview {
 			border-radius: $radius-block-ui;
 			cursor: pointer;
 			overflow: hidden;
@@ -48,12 +48,12 @@
 			}
 		}
 
-		.edit-site-library__footer,
-		.edit-site-library__button {
+		.edit-site-patterns__footer,
+		.edit-site-patterns__button {
 			color: $gray-600;
 		}
 
-		&.is-placeholder .edit-site-library__preview {
+		&.is-placeholder .edit-site-patterns__preview {
 			min-height: $grid-unit-80;
 			color: $gray-600;
 			border: 1px dashed $gray-800;
@@ -67,7 +67,7 @@
 		}
 	}
 
-	.edit-site-library__preview {
+	.edit-site-patterns__preview {
 		flex: 1;
 		margin-bottom: $grid-unit-20;
 	}
@@ -75,7 +75,7 @@
 
 // The increased specificity here is to overcome component styles
 // without relying on internal component class names.
-.edit-site-library__search {
+.edit-site-patterns__search {
 	&#{&} input[type="search"] {
 		background: $gray-800;
 		color: $gray-200;
@@ -90,7 +90,7 @@
 	}
 }
 
-.edit-site-library__pattern-title {
+.edit-site-patterns__pattern-title {
 	color: $gray-600;
 
 	svg {
@@ -100,6 +100,6 @@
 	}
 }
 
-.edit-site-library__no-results {
+.edit-site-patterns__no-results {
 	color: $gray-600;
 }
diff --git a/packages/edit-site/src/components/page-library/use-library-settings.js b/packages/edit-site/src/components/page-patterns/use-pattern-settings.js
similarity index 96%
rename from packages/edit-site/src/components/page-library/use-library-settings.js
rename to packages/edit-site/src/components/page-patterns/use-pattern-settings.js
index a0f1bfcdae3930..28a16b1d7ed7db 100644
--- a/packages/edit-site/src/components/page-library/use-library-settings.js
+++ b/packages/edit-site/src/components/page-patterns/use-pattern-settings.js
@@ -12,7 +12,7 @@ import { unlock } from '../../lock-unlock';
 import { store as editSiteStore } from '../../store';
 import { filterOutDuplicatesByName } from './utils';
 
-export default function useLibrarySettings() {
+export default function usePatternSettings() {
 	const storedSettings = useSelect( ( select ) => {
 		const { getSettings } = unlock( select( editSiteStore ) );
 		return getSettings();
diff --git a/packages/edit-site/src/components/page-library/use-patterns.js b/packages/edit-site/src/components/page-patterns/use-patterns.js
similarity index 100%
rename from packages/edit-site/src/components/page-library/use-patterns.js
rename to packages/edit-site/src/components/page-patterns/use-patterns.js
diff --git a/packages/edit-site/src/components/page-library/utils.js b/packages/edit-site/src/components/page-patterns/utils.js
similarity index 100%
rename from packages/edit-site/src/components/page-library/utils.js
rename to packages/edit-site/src/components/page-patterns/utils.js
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-library/style.scss b/packages/edit-site/src/components/sidebar-navigation-screen-library/style.scss
deleted file mode 100644
index efb8b7537588db..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-library/style.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.edit-site-sidebar-navigation-screen-library__group {
-	margin-bottom: $grid-unit-30;
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-main/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-main/index.js
index 6e7810abe81c05..58b93d61c45a65 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-main/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-main/index.js
@@ -75,11 +75,11 @@ export default function SidebarNavigationScreenMain() {
 					</NavigatorButton>
 					<NavigatorButton
 						as={ SidebarNavigationItem }
-						path="/library"
+						path="/patterns"
 						withChevron
 						icon={ symbol }
 					>
-						{ __( 'Library' ) }
+						{ __( 'Patterns' ) }
 					</NavigatorButton>
 				</ItemGroup>
 			}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/index.js
index 349cc5d43b431d..39f28dba6d5204 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/index.js
@@ -33,7 +33,7 @@ export default function SidebarNavigationScreenPattern() {
 	const backPath =
 		! categoryType && postType === 'wp_template_part'
 			? '/wp_template_part/all'
-			: '/library';
+			: '/patterns';
 
 	return (
 		<SidebarNavigationScreen
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-library/category-item.js b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/category-item.js
similarity index 86%
rename from packages/edit-site/src/components/sidebar-navigation-screen-library/category-item.js
rename to packages/edit-site/src/components/sidebar-navigation-screen-patterns/category-item.js
index 2ea9205b6fca71..6e5096bee3fbe8 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-library/category-item.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/category-item.js
@@ -14,15 +14,15 @@ export default function CategoryItem( {
 } ) {
 	const linkInfo = useLink(
 		{
-			path: '/library',
+			path: '/patterns',
 			categoryType: type,
 			categoryId: id,
 		},
 		{
 			// Keep a record of where we came from in state so we can
-			// use the browser's back button to go back to the library.
+			// use the browser's back button to go back to Patterns.
 			// See the implementation of the back button in patterns-list.
-			backPath: '/library',
+			backPath: '/patterns',
 		}
 	);
 
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-library/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/index.js
similarity index 94%
rename from packages/edit-site/src/components/sidebar-navigation-screen-library/index.js
rename to packages/edit-site/src/components/sidebar-navigation-screen-patterns/index.js
index 5aa32e7587ebd2..27df18ec5b8eed 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-library/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/index.js
@@ -19,7 +19,7 @@ import AddNewPattern from '../add-new-pattern';
 import SidebarNavigationItem from '../sidebar-navigation-item';
 import SidebarNavigationScreen from '../sidebar-navigation-screen';
 import CategoryItem from './category-item';
-import { DEFAULT_CATEGORY, DEFAULT_TYPE } from '../page-library/utils';
+import { DEFAULT_CATEGORY, DEFAULT_TYPE } from '../page-patterns/utils';
 import { store as editSiteStore } from '../../store';
 import { useLink } from '../routes/link';
 import usePatternCategories from './use-pattern-categories';
@@ -33,7 +33,7 @@ const templatePartAreaLabels = {
 	uncategorized: __( 'Uncategorized' ),
 };
 
-export default function SidebarNavigationScreenLibrary() {
+export default function SidebarNavigationScreenPatterns() {
 	const isMobileViewport = useViewportMatch( 'medium', '<' );
 	const { categoryType, categoryId } = getQueryArgs( window.location.href );
 	const currentCategory = categoryId || DEFAULT_CATEGORY;
@@ -68,7 +68,7 @@ export default function SidebarNavigationScreenLibrary() {
 	return (
 		<SidebarNavigationScreen
 			isRoot={ isTemplatePartsMode }
-			title={ __( 'Library' ) }
+			title={ __( 'Patterns' ) }
 			description={ __(
 				'Manage what patterns are available when editing your site.'
 			) }
@@ -76,11 +76,11 @@ export default function SidebarNavigationScreenLibrary() {
 			footer={ footer }
 			content={
 				<>
-					{ isLoading && __( 'Loading library' ) }
+					{ isLoading && __( 'Loading patterns' ) }
 					{ ! isLoading && (
 						<>
 							{ ! hasTemplateParts && ! hasPatterns && (
-								<ItemGroup className="edit-site-sidebar-navigation-screen-library__group">
+								<ItemGroup className="edit-site-sidebar-navigation-screen-patterns__group">
 									<Item>
 										{ __(
 											'No template parts or patterns found'
@@ -89,7 +89,7 @@ export default function SidebarNavigationScreenLibrary() {
 								</ItemGroup>
 							) }
 							{ hasMyPatterns && (
-								<ItemGroup className="edit-site-sidebar-navigation-screen-library__group">
+								<ItemGroup className="edit-site-sidebar-navigation-screen-patterns__group">
 									<CategoryItem
 										key={ myPatterns.name }
 										count={ myPatterns.count }
@@ -106,7 +106,7 @@ export default function SidebarNavigationScreenLibrary() {
 								</ItemGroup>
 							) }
 							{ hasTemplateParts && (
-								<ItemGroup className="edit-site-sidebar-navigation-screen-library__group">
+								<ItemGroup className="edit-site-sidebar-navigation-screen-patterns__group">
 									{ Object.entries( templatePartAreas ).map(
 										( [ area, parts ] ) => (
 											<CategoryItem
@@ -133,7 +133,7 @@ export default function SidebarNavigationScreenLibrary() {
 								</ItemGroup>
 							) }
 							{ hasPatterns && (
-								<ItemGroup className="edit-site-sidebar-navigation-screen-library__group">
+								<ItemGroup className="edit-site-sidebar-navigation-screen-patterns__group">
 									{ patternCategories.map( ( category ) => (
 										<CategoryItem
 											key={ category.name }
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-patterns/style.scss b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/style.scss
new file mode 100644
index 00000000000000..f0edb96164abca
--- /dev/null
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/style.scss
@@ -0,0 +1,3 @@
+.edit-site-sidebar-navigation-screen-patterns__group {
+	margin-bottom: $grid-unit-30;
+}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-library/use-default-pattern-categories.js b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-default-pattern-categories.js
similarity index 100%
rename from packages/edit-site/src/components/sidebar-navigation-screen-library/use-default-pattern-categories.js
rename to packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-default-pattern-categories.js
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-library/use-my-patterns.js b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-my-patterns.js
similarity index 100%
rename from packages/edit-site/src/components/sidebar-navigation-screen-library/use-my-patterns.js
rename to packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-my-patterns.js
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-library/use-pattern-categories.js b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-pattern-categories.js
similarity index 100%
rename from packages/edit-site/src/components/sidebar-navigation-screen-library/use-pattern-categories.js
rename to packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-pattern-categories.js
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-library/use-template-part-areas.js b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-template-part-areas.js
similarity index 100%
rename from packages/edit-site/src/components/sidebar-navigation-screen-library/use-template-part-areas.js
rename to packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-template-part-areas.js
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-library/use-theme-patterns.js b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-theme-patterns.js
similarity index 96%
rename from packages/edit-site/src/components/sidebar-navigation-screen-library/use-theme-patterns.js
rename to packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-theme-patterns.js
index d0534eca2846e1..b4a0b570c3c8dd 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-library/use-theme-patterns.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-theme-patterns.js
@@ -11,7 +11,7 @@ import { useMemo } from '@wordpress/element';
 import {
 	CORE_PATTERN_SOURCES,
 	filterOutDuplicatesByName,
-} from '../page-library/utils';
+} from '../page-patterns/utils';
 import { unlock } from '../../lock-unlock';
 import { store as editSiteStore } from '../../store';
 
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-templates-browse/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-templates-browse/index.js
index b5a0e4d195885d..b9d2fb7e2c27e4 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-templates-browse/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-templates-browse/index.js
@@ -21,7 +21,7 @@ const config = {
 		description: __(
 			'Create new template parts, or reset any customizations made to the template parts supplied by your theme.'
 		),
-		backPath: '/library',
+		backPath: '/patterns',
 	},
 };
 
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-templates/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-templates/index.js
index 54c2dab7fa59ca..b5e5aec5e3bb0e 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-templates/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-templates/index.js
@@ -4,14 +4,12 @@
 import {
 	__experimentalItemGroup as ItemGroup,
 	__experimentalItem as Item,
-	__experimentalUseNavigator as useNavigator,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useEntityRecords } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
 import { decodeEntities } from '@wordpress/html-entities';
 import { useViewportMatch } from '@wordpress/compose';
-import { getTemplatePartIcon } from '@wordpress/editor';
 
 /**
  * Internal dependencies
@@ -23,48 +21,6 @@ import AddNewTemplate from '../add-new-template';
 import { store as editSiteStore } from '../../store';
 import SidebarButton from '../sidebar-button';
 
-const config = {
-	wp_template: {
-		labels: {
-			title: __( 'Templates' ),
-			loading: __( 'Loading templates' ),
-			notFound: __( 'No templates found' ),
-			manage: __( 'Manage all templates' ),
-			description: __(
-				'Express the layout of your site with templates.'
-			),
-		},
-	},
-	wp_template_part: {
-		labels: {
-			title: __( 'Library' ),
-			loading: __( 'Loading library' ),
-			notFound: __( 'No patterns found' ),
-			manage: __( 'Manage all template parts' ),
-			reusableBlocks: __( 'Manage patterns' ),
-			description: __(
-				'Template Parts are small pieces of a layout that can be reused across multiple templates and always appear the same way. Common template parts include the site header, footer, or sidebar.'
-			),
-		},
-		sortCallback: ( items ) => {
-			const groupedByArea = items.reduce(
-				( accumulator, item ) => {
-					const key = accumulator[ item.area ] ? item.area : 'rest';
-					accumulator[ key ].push( item );
-					return accumulator;
-				},
-				{ header: [], footer: [], sidebar: [], rest: [] }
-			);
-			return [
-				...groupedByArea.header,
-				...groupedByArea.footer,
-				...groupedByArea.sidebar,
-				...groupedByArea.rest,
-			];
-		},
-	},
-};
-
 const TemplateItem = ( { postType, postId, ...props } ) => {
 	const linkInfo = useLink( {
 		postType,
@@ -74,9 +30,6 @@ const TemplateItem = ( { postType, postId, ...props } ) => {
 };
 
 export default function SidebarNavigationScreenTemplates() {
-	const {
-		params: { postType },
-	} = useNavigator();
 	const isMobileViewport = useViewportMatch( 'medium', '<' );
 	const isTemplatePartsMode = useSelect( ( select ) => {
 		const settings = select( editSiteStore ).getSettings();
@@ -86,34 +39,30 @@ export default function SidebarNavigationScreenTemplates() {
 
 	const { records: templates, isResolving: isLoading } = useEntityRecords(
 		'postType',
-		postType,
+		'wp_template',
 		{
 			per_page: -1,
 		}
 	);
-	let sortedTemplates = templates ? [ ...templates ] : [];
+
+	const sortedTemplates = templates ? [ ...templates ] : [];
 	sortedTemplates.sort( ( a, b ) =>
 		a.title.rendered.localeCompare( b.title.rendered )
 	);
-	if ( config[ postType ].sortCallback ) {
-		sortedTemplates = config[ postType ].sortCallback( sortedTemplates );
-	}
-
-	const browseAllLink = useLink( {
-		path: '/' + postType + '/all',
-	} );
 
+	const browseAllLink = useLink( { path: '/wp_template/all' } );
 	const canCreate = ! isMobileViewport && ! isTemplatePartsMode;
-	const isTemplateList = postType === 'wp_template';
 	return (
 		<SidebarNavigationScreen
 			isRoot={ isTemplatePartsMode }
-			title={ config[ postType ].labels.title }
-			description={ config[ postType ].labels.description }
+			title={ __( 'Templates' ) }
+			description={ __(
+				'Express the layout of your site with templates'
+			) }
 			actions={
 				canCreate && (
 					<AddNewTemplate
-						templateType={ postType }
+						templateType={ 'wp_template' }
 						toggleProps={ {
 							as: SidebarButton,
 						} }
@@ -122,24 +71,18 @@ export default function SidebarNavigationScreenTemplates() {
 			}
 			content={
 				<>
-					{ isLoading && config[ postType ].labels.loading }
+					{ isLoading && __( 'Loading templates' ) }
 					{ ! isLoading && (
 						<ItemGroup>
 							{ ! templates?.length && (
-								<Item>
-									{ config[ postType ].labels.notFound }
-								</Item>
+								<Item>{ __( 'No templates found' ) }</Item>
 							) }
 							{ sortedTemplates.map( ( template ) => (
 								<TemplateItem
-									postType={ postType }
+									postType={ 'wp_template' }
 									postId={ template.id }
 									key={ template.id }
 									withChevron
-									icon={
-										! isTemplateList &&
-										getTemplatePartIcon( template.area )
-									}
 								>
 									{ decodeEntities(
 										template.title?.rendered ||
@@ -153,19 +96,9 @@ export default function SidebarNavigationScreenTemplates() {
 			}
 			footer={
 				! isMobileViewport && (
-					<>
-						<SidebarNavigationItem withChevron { ...browseAllLink }>
-							{ config[ postType ].labels.manage }
-						</SidebarNavigationItem>
-						{ !! config[ postType ].labels.reusableBlocks && (
-							<SidebarNavigationItem
-								as="a"
-								href="edit.php?post_type=wp_block"
-							>
-								{ config[ postType ].labels.reusableBlocks }
-							</SidebarNavigationItem>
-						) }
-					</>
+					<SidebarNavigationItem withChevron { ...browseAllLink }>
+						{ __( 'Manage all templates' ) }
+					</SidebarNavigationItem>
 				)
 			}
 		/>
diff --git a/packages/edit-site/src/components/sidebar/index.js b/packages/edit-site/src/components/sidebar/index.js
index df6a5665031406..9e035759ea9ad6 100644
--- a/packages/edit-site/src/components/sidebar/index.js
+++ b/packages/edit-site/src/components/sidebar/index.js
@@ -12,9 +12,9 @@ import { privateApis as routerPrivateApis } from '@wordpress/router';
  * Internal dependencies
  */
 import SidebarNavigationScreenMain from '../sidebar-navigation-screen-main';
-import SidebarNavigationScreenLibrary from '../sidebar-navigation-screen-library';
 import SidebarNavigationScreenTemplates from '../sidebar-navigation-screen-templates';
 import SidebarNavigationScreenTemplate from '../sidebar-navigation-screen-template';
+import SidebarNavigationScreenPatterns from '../sidebar-navigation-screen-patterns';
 import SidebarNavigationScreenPattern from '../sidebar-navigation-screen-pattern';
 import useSyncPathWithURL, {
 	getPathFromURL,
@@ -56,8 +56,8 @@ function SidebarScreens() {
 			<NavigatorScreen path="/:postType(wp_template)">
 				<SidebarNavigationScreenTemplates />
 			</NavigatorScreen>
-			<NavigatorScreen path="/library">
-				<SidebarNavigationScreenLibrary />
+			<NavigatorScreen path="/patterns">
+				<SidebarNavigationScreenPatterns />
 			</NavigatorScreen>
 			<NavigatorScreen path="/:postType(wp_template|wp_template_part)/all">
 				<SidebarNavigationScreenTemplatesBrowse />
diff --git a/packages/edit-site/src/components/sync-state-with-url/use-sync-path-with-url.js b/packages/edit-site/src/components/sync-state-with-url/use-sync-path-with-url.js
index ee9fa0fffb801e..45f7eb1b044c1f 100644
--- a/packages/edit-site/src/components/sync-state-with-url/use-sync-path-with-url.js
+++ b/packages/edit-site/src/components/sync-state-with-url/use-sync-path-with-url.js
@@ -87,7 +87,7 @@ export default function useSyncPathWithURL() {
 				postId: navigatorParams?.postId,
 				path: undefined,
 			} );
-		} else if ( navigatorLocation.path === '/library' ) {
+		} else if ( navigatorLocation.path === '/patterns' ) {
 			updateUrlParams( {
 				postType: undefined,
 				postId: undefined,
diff --git a/packages/edit-site/src/style.scss b/packages/edit-site/src/style.scss
index 324f1ab4bc0eca..5a7f96433518ab 100644
--- a/packages/edit-site/src/style.scss
+++ b/packages/edit-site/src/style.scss
@@ -10,7 +10,7 @@
 @import "./components/header-edit-mode/document-actions/style.scss";
 @import "./components/list/style.scss";
 @import "./components/page/style.scss";
-@import "./components/page-library/style.scss";
+@import "./components/page-patterns/style.scss";
 @import "./components/table/style.scss";
 @import "./components/sidebar-edit-mode/style.scss";
 @import "./components/sidebar-edit-mode/page-panels/style.scss";
@@ -33,11 +33,11 @@
 @import "./components/sidebar-navigation-screen/style.scss";
 @import "./components/sidebar-navigation-screen-details-footer/style.scss";
 @import "./components/sidebar-navigation-screen-global-styles/style.scss";
-@import "./components/sidebar-navigation-screen-library/style.scss";
 @import "./components/sidebar-navigation-screen-navigation-menu/style.scss";
 @import "./components/sidebar-navigation-screen-page/style.scss";
 @import "components/sidebar-navigation-screen-details-panel/style.scss";
 @import "./components/sidebar-navigation-screen-pattern/style.scss";
+@import "./components/sidebar-navigation-screen-patterns/style.scss";
 @import "./components/sidebar-navigation-screen-template/style.scss";
 @import "./components/site-hub/style.scss";
 @import "./components/sidebar-navigation-screen-navigation-menus/style.scss";
diff --git a/packages/edit-site/src/utils/get-is-list-page.js b/packages/edit-site/src/utils/get-is-list-page.js
index 11827432071bd3..600e686618bf94 100644
--- a/packages/edit-site/src/utils/get-is-list-page.js
+++ b/packages/edit-site/src/utils/get-is-list-page.js
@@ -16,9 +16,9 @@ export default function getIsListPage(
 	return (
 		path === '/wp_template/all' ||
 		path === '/wp_template_part/all' ||
-		( path === '/library' &&
-			// Don't treat "/library" without categoryType and categoryId as a list page
-			// in mobile because the sidebar covers the whole page.
+		( path === '/patterns' &&
+			// Don't treat "/patterns" without categoryType and categoryId as a
+			// list page in mobile because the sidebar covers the whole page.
 			( ! isMobileViewport || ( !! categoryType && !! categoryId ) ) )
 	);
 }
diff --git a/test/e2e/specs/site-editor/site-editor-url-navigation.spec.js b/test/e2e/specs/site-editor/site-editor-url-navigation.spec.js
index 90daa3ae50c242..c16411d45ce799 100644
--- a/test/e2e/specs/site-editor/site-editor-url-navigation.spec.js
+++ b/test/e2e/specs/site-editor/site-editor-url-navigation.spec.js
@@ -62,7 +62,7 @@ test.describe( 'Site editor url navigation', () => {
 			page,
 		} ) => {
 			await admin.visitSiteEditor();
-			await page.click( 'role=button[name="Library"i]' );
+			await page.click( 'role=button[name="Patterns"i]' );
 			await page.click( 'role=button[name="Create pattern"i]' );
 			await page
 				.getByRole( 'menu', { name: 'Create pattern' } )