diff --git a/components/doc/accordion/templatedoc.js b/components/doc/accordion/templatedoc.js
index e280d97b75..ae3c47fff4 100644
--- a/components/doc/accordion/templatedoc.js
+++ b/components/doc/accordion/templatedoc.js
@@ -11,7 +11,7 @@ export function TemplateDoc(props) {
     <AccordionTab
         header={
             <span className="flex align-items-center gap-2 w-full">
-                <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+                <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
                 <span className="font-bold white-space-nowrap">Amy Elsner</span>
                 <Badge value="3" className="ml-auto" />
             </span>
@@ -27,7 +27,7 @@ export function TemplateDoc(props) {
     <AccordionTab
         header={
             <span className="flex align-items-center gap-2 w-full">
-                <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/onyamalimba.png" shape="circle" />
+                <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/onyamalimba.png" shape="circle" />
                 <span className="font-bold white-space-nowrap">Onyama Limba</span>
                 <Badge value="4" className="ml-auto" />
             </span>
@@ -43,7 +43,7 @@ export function TemplateDoc(props) {
     <AccordionTab
         header={
             <span className="flex align-items-center gap-2 w-full">
-                <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/ionibowcher.png" shape="circle" />
+                <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/ionibowcher.png" shape="circle" />
                 <span className="font-bold white-space-nowrap">Ioni Bowcher</span>
                 <Badge value="2" className="ml-auto" />
             </span>
@@ -71,7 +71,7 @@ export default function TemplateDemo() {
                 <AccordionTab
                     header={
                         <span className="flex align-items-center gap-2 w-full">
-                            <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+                            <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
                             <span className="font-bold white-space-nowrap">Amy Elsner</span>
                             <Badge value="3" className="ml-auto" />
                         </span>
@@ -87,7 +87,7 @@ export default function TemplateDemo() {
                 <AccordionTab
                     header={
                         <span className="flex align-items-center gap-2 w-full">
-                            <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/onyamalimba.png" shape="circle" />
+                            <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/onyamalimba.png" shape="circle" />
                             <span className="font-bold white-space-nowrap">Onyama Limba</span>
                             <Badge value="4" className="ml-auto" />
                         </span>
@@ -103,7 +103,7 @@ export default function TemplateDemo() {
                 <AccordionTab
                     header={
                         <span className="flex align-items-center gap-2 w-full">
-                            <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/ionibowcher.png" shape="circle" />
+                            <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/ionibowcher.png" shape="circle" />
                             <span className="font-bold white-space-nowrap">Ioni Bowcher</span>
                             <Badge value="2" className="ml-auto" />
                         </span>
@@ -134,7 +134,7 @@ export default function TemplateDemo() {
                 <AccordionTab
                     header={
                         <span className="flex align-items-center gap-2 w-full">
-                            <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+                            <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
                             <span className="font-bold white-space-nowrap">Amy Elsner</span>
                             <Badge value="3" className="ml-auto" />
                         </span>
@@ -150,7 +150,7 @@ export default function TemplateDemo() {
                 <AccordionTab
                     header={
                         <span className="flex align-items-center gap-2 w-full">
-                            <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/onyamalimba.png" shape="circle" />
+                            <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/onyamalimba.png" shape="circle" />
                             <span className="font-bold white-space-nowrap">Onyama Limba</span>
                             <Badge value="4" className="ml-auto" />
                         </span>
@@ -166,7 +166,7 @@ export default function TemplateDemo() {
                 <AccordionTab
                     header={
                         <span className="flex align-items-center gap-2 w-full">
-                            <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/ionibowcher.png" shape="circle" />
+                            <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/ionibowcher.png" shape="circle" />
                             <span className="font-bold white-space-nowrap">Ioni Bowcher</span>
                             <Badge value="2" className="ml-auto" />
                         </span>
@@ -198,7 +198,7 @@ export default function TemplateDemo() {
                     <AccordionTab
                         header={
                             <span className="flex align-items-center gap-2 w-full">
-                                <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+                                <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
                                 <span className="font-bold white-space-nowrap">Amy Elsner</span>
                                 <Badge value="3" className="ml-auto" />
                             </span>
@@ -213,7 +213,7 @@ export default function TemplateDemo() {
                     <AccordionTab
                         header={
                             <span className="flex align-items-center gap-2 w-full">
-                                <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/onyamalimba.png" shape="circle" />
+                                <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/onyamalimba.png" shape="circle" />
                                 <span className="font-bold white-space-nowrap">Onyama Limba</span>
                                 <Badge value="4" className="ml-auto" />
                             </span>
@@ -227,7 +227,7 @@ export default function TemplateDemo() {
                     <AccordionTab
                         header={
                             <span className="flex align-items-center gap-2 w-full">
-                                <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/ionibowcher.png" shape="circle" />
+                                <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/ionibowcher.png" shape="circle" />
                                 <span className="font-bold white-space-nowrap">Ioni Bowcher</span>
                                 <Badge value="2" className="ml-auto" />
                             </span>
diff --git a/components/doc/contextmenu/commanddoc.js b/components/doc/contextmenu/commanddoc.js
index d22e937bc9..5ff31d9045 100644
--- a/components/doc/contextmenu/commanddoc.js
+++ b/components/doc/contextmenu/commanddoc.js
@@ -86,7 +86,7 @@ export function CommandDoc(props) {
             onContextMenu={(event) => onRightClick(event, user)}
         >
             <div className="flex align-items-center gap-2">
-                <img alt="user.name" src={\`https://primefaces.org/cdn/primevue/images/avatar/\${user.image}\`} style={{ width: '32px' }} />
+                <img alt="user.name" src={\`https://primefaces.org/cdn/primereact/images/avatar/\${user.image}\`} style={{ width: '32px' }} />
                 <span className="font-bold">{user.name}</span>
             </div>
             <Tag value={user.role} severity={getBadge(user)} />
@@ -179,7 +179,7 @@ export default function CommandDemo() {
                         onContextMenu={(event) => onRightClick(event, user)}
                     >
                         <div className="flex align-items-center gap-2">
-                            <img alt="user.name" src={\`https://primefaces.org/cdn/primevue/images/avatar/\${user.image}\`} style={{ width: '32px' }} />
+                            <img alt="user.name" src={\`https://primefaces.org/cdn/primereact/images/avatar/\${user.image}\`} style={{ width: '32px' }} />
                             <span className="font-bold">{user.name}</span>
                         </div>
                         <Tag value={user.role} severity={getBadge(user)} />
@@ -281,7 +281,7 @@ export default function CommandDemo() {
                         onContextMenu={(event) => onRightClick(event, user)}
                     >
                         <div className="flex align-items-center gap-2">
-                            <img alt={user.name} src={\`https://primefaces.org/cdn/primevue/images/avatar/\${user.image}\`} style={{ width: '32px' }} />
+                            <img alt={user.name} src={\`https://primefaces.org/cdn/primereact/images/avatar/\${user.image}\`} style={{ width: '32px' }} />
                             <span className="font-bold">{user.name}</span>
                         </div>
                         <Tag value={user.role} severity={getBadge(user)} />
@@ -312,7 +312,7 @@ export default function CommandDemo() {
                             onContextMenu={(event) => onRightClick(event, user)}
                         >
                             <div className="flex align-items-center gap-2">
-                                <img alt="user.name" src={`https://primefaces.org/cdn/primevue/images/avatar/${user.image}`} style={{ width: '32px' }} />
+                                <img alt="user.name" src={`https://primefaces.org/cdn/primereact/images/avatar/${user.image}`} style={{ width: '32px' }} />
                                 <span className="font-bold">{user.name}</span>
                             </div>
                             <Tag value={user.role} severity={getBadge(user)} />
diff --git a/components/doc/dialog/templatedoc.js b/components/doc/dialog/templatedoc.js
index 86ce319bb6..17a312d40f 100644
--- a/components/doc/dialog/templatedoc.js
+++ b/components/doc/dialog/templatedoc.js
@@ -10,7 +10,7 @@ export function TemplateDoc(props) {
 
     const headerElement = (
         <div className="inline-flex align-items-center justify-content-center gap-2">
-            <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+            <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
             <span className="font-bold white-space-nowrap">Amy Elsner</span>
         </div>
     );
@@ -44,7 +44,7 @@ export default function TemplateDemo() {
 
     const headerElement = (
         <div className="inline-flex align-items-center justify-content-center gap-2">
-            <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+            <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
             <span className="font-bold white-space-nowrap">Amy Elsner</span>
         </div>
     );
@@ -79,7 +79,7 @@ export default function TemplateDemo() {
 
     const headerElement = (
         <div className="inline-flex align-items-center justify-content-center gap-2">
-            <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+            <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
             <span className="font-bold white-space-nowrap">Amy Elsner</span>
         </div>
     );
diff --git a/components/doc/megamenu/templatedoc.js b/components/doc/megamenu/templatedoc.js
index 3dedb319f7..b037f003e6 100644
--- a/components/doc/megamenu/templatedoc.js
+++ b/components/doc/megamenu/templatedoc.js
@@ -73,7 +73,7 @@ export function TemplateDoc(props) {
                 ],
                 [
                     {
-                        items: [{ image: 'https://primefaces.org/cdn/primevue/images/uikit/uikit-system.png', label: 'GET STARTED', subtext: 'Build spectacular apps in no time.', template: itemRenderer }]
+                        items: [{ image: 'https://primefaces.org/cdn/primereact/images/uikit/uikit-system.png', label: 'GET STARTED', subtext: 'Build spectacular apps in no time.', template: itemRenderer }]
                     }
                 ]
             ]
@@ -112,7 +112,7 @@ export function TemplateDoc(props) {
             <path d="M12.1762 10.1789L8.4462 9.794L10.8145 7.09967H13.5378L12.1762 10.1789Z" fill="var(--primary-color)" />
         </svg>
     );
-    const end = <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />;
+    const end = <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />;
 
     const code = {
         basic: `
@@ -193,7 +193,7 @@ export default function TemplateDemo() {
                 ],
                 [
                     {
-                        items: [{ image: 'https://primefaces.org/cdn/primevue/images/uikit/uikit-system.png', label: 'GET STARTED', subtext: 'Build spectacular apps in no time.', template: itemRenderer }]
+                        items: [{ image: 'https://primefaces.org/cdn/primereact/images/uikit/uikit-system.png', label: 'GET STARTED', subtext: 'Build spectacular apps in no time.', template: itemRenderer }]
                     }
                 ]
             ]
@@ -237,7 +237,7 @@ export default function TemplateDemo() {
             <path d="M12.1762 10.1789L8.4462 9.794L10.8145 7.09967H13.5378L12.1762 10.1789Z" fill="var(--primary-color)" />
         </svg>
     );
-    const end = <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />;
+    const end = <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />;
 
     return (
         <div className="card">
@@ -322,7 +322,7 @@ export default function TemplateDemo() {
                 ],
                 [
                     {
-                        items: [{ image: 'https://primefaces.org/cdn/primevue/images/uikit/uikit-system.png', label: 'GET STARTED', subtext: 'Build spectacular apps in no time.', template: itemRenderer }]
+                        items: [{ image: 'https://primefaces.org/cdn/primereact/images/uikit/uikit-system.png', label: 'GET STARTED', subtext: 'Build spectacular apps in no time.', template: itemRenderer }]
                     }
                 ]
             ]
@@ -361,7 +361,7 @@ export default function TemplateDemo() {
             <path d="M12.1762 10.1789L8.4462 9.794L10.8145 7.09967H13.5378L12.1762 10.1789Z" fill="var(--primary-color)" />
         </svg>
     );
-    const end = <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />;
+    const end = <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />;
 
     return (
         <div className="card">
diff --git a/components/doc/mention/triggersdoc.js b/components/doc/mention/triggersdoc.js
index 6dcff755dd..29c18da688 100644
--- a/components/doc/mention/triggersdoc.js
+++ b/components/doc/mention/triggersdoc.js
@@ -9,7 +9,7 @@ export function TriggersDoc(props) {
     const [value, setValue] = useState('');
     const [customers, setCustomers] = useState([]);
     const [multipleSuggestions, setMultipleSuggestions] = useState([]);
-    const tagSuggestions = ['primereact', 'primefaces', 'primeng', 'primevue'];
+    const tagSuggestions = ['primereact', 'primefaces', 'primeng', 'primereact'];
 
     useEffect(() => {
         CustomerService.getCustomersSmall().then((data) => {
@@ -95,7 +95,7 @@ export default function TriggersDemo() {
     const [value, setValue] = useState('');
     const [customers, setCustomers] = useState([]);
     const [multipleSuggestions, setMultipleSuggestions]= useState([]);
-    const tagSuggestions = ['primereact', 'primefaces', 'primeng', 'primevue'];
+    const tagSuggestions = ['primereact', 'primefaces', 'primeng', 'primereact'];
 
     useEffect(() => {
         CustomerService.getCustomersSmall().then(data => {
@@ -188,7 +188,7 @@ export default function TriggersDemo() {
     const [value, setValue] = useState<string>('');
     const [customers, setCustomers] = useState<any>([]);
     const [multipleSuggestions, setMultipleSuggestions]= useState<any>([]);
-    const tagSuggestions = ['primereact', 'primefaces', 'primeng', 'primevue'];
+    const tagSuggestions = ['primereact', 'primefaces', 'primeng', 'primereact'];
     
     useEffect(() => {
         CustomerService.getCustomersSmall().then(data => {
diff --git a/components/doc/menubar/templatedoc.js b/components/doc/menubar/templatedoc.js
index 9ca7086996..d353b5bc6a 100644
--- a/components/doc/menubar/templatedoc.js
+++ b/components/doc/menubar/templatedoc.js
@@ -80,7 +80,7 @@ export function TemplateDoc(props) {
     const end = (
         <div className="flex align-items-center gap-2">
             <InputText placeholder="Search" type="text" className="w-8rem sm:w-auto" />
-            <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+            <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
         </div>
     );
 
@@ -170,7 +170,7 @@ export default function TemplateDemo() {
     const end = (
         <div className="flex align-items-center gap-2">
             <InputText placeholder="Search" type="text" className="w-8rem sm:w-auto" />
-            <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+            <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
         </div>
     );
 
@@ -264,7 +264,7 @@ export default function TemplateDemo() {
     const end = (
         <div className="flex align-items-center gap-2">
             <InputText placeholder="Search" type="text" className="w-8rem sm:w-auto" />
-            <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+            <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
         </div>
     );
 
diff --git a/components/doc/messages/customicon.js b/components/doc/messages/customicon.js
index 08c34db751..955930c6b6 100644
--- a/components/doc/messages/customicon.js
+++ b/components/doc/messages/customicon.js
@@ -17,7 +17,7 @@ export function CustomIcon(props) {
                     sticky: true,
                     content: (
                         <React.Fragment>
-                            <img alt="logo" src="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" width="32" />
+                            <img alt="logo" src="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" width="32" />
                             <div className="ml-2">How may I help you?</div>
                         </React.Fragment>
                     )
@@ -35,7 +35,7 @@ msgs.current.show([
         sticky: true,
         content: (
             <React.Fragment>
-                <img alt="logo" src="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" width="32" />
+                <img alt="logo" src="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" width="32" />
                 <div className="ml-2">How may I help you?</div>
             </React.Fragment>
         )
@@ -60,7 +60,7 @@ export default function BasicDemo() {
                     sticky: true,
                     content: (
                         <React.Fragment>
-                            <img alt="logo" src="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" width="32" />
+                            <img alt="logo" src="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" width="32" />
                             <div className="ml-2">How may I help you?</div>
                         </React.Fragment>
                     )
@@ -93,7 +93,7 @@ export default function BasicDemo() {
                     sticky: true,
                     content: (
                         <React.Fragment>
-                            <img alt="logo" src="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" width="32" />
+                            <img alt="logo" src="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" width="32" />
                             <div className="ml-2">How may I help you?</div>
                         </React.Fragment>
                     )
diff --git a/components/doc/panel/templatedoc.js b/components/doc/panel/templatedoc.js
index c343e7c883..cb57ca6311 100644
--- a/components/doc/panel/templatedoc.js
+++ b/components/doc/panel/templatedoc.js
@@ -32,7 +32,7 @@ export function TemplateDoc(props) {
         return (
             <div className={className}>
                 <div className="flex align-items-center gap-2">
-                    <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" size="large" shape="circle" />
+                    <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" size="large" shape="circle" />
                     <span className="font-bold">Amy Elsner</span>
                 </div>
                 <div>
@@ -102,7 +102,7 @@ export default function TemplateDemo() {
         return (
             <div className={className}>
                 <div className="flex align-items-center gap-2">
-                    <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" size="large" shape="circle" />
+                    <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" size="large" shape="circle" />
                     <span className="font-bold">Amy Elsner</span>
                 </div>
                 <div>
@@ -173,7 +173,7 @@ export default function TemplateDemo() {
         return (
             <div className={className}>
                 <div className="flex align-items-center gap-2">
-                    <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" size="large" shape="circle" />
+                    <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" size="large" shape="circle" />
                     <span className="font-bold">Amy Elsner</span>
                 </div>
                 <div>
diff --git a/components/doc/sidebar/headlessdoc.js b/components/doc/sidebar/headlessdoc.js
index 1e7095e0fa..22985b9580 100644
--- a/components/doc/sidebar/headlessdoc.js
+++ b/components/doc/sidebar/headlessdoc.js
@@ -183,7 +183,7 @@ export function HeadlessDoc(props) {
                     <div className="mt-auto">
                         <hr className="mb-3 mx-3 border-top-1 border-none surface-border" />
                         <a v-ripple className="m-3 flex align-items-center cursor-pointer p-3 gap-2 border-round text-700 hover:surface-100 transition-duration-150 transition-colors p-ripple">
-                            <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+                            <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
                             <span className="font-bold">Amy Elsner</span>
                         </a>
                     </div>
@@ -387,7 +387,7 @@ export default function HeadlessDemo() {
                                 <div className="mt-auto">
                                     <hr className="mb-3 mx-3 border-top-1 border-none surface-border" />
                                     <a v-ripple className="m-3 flex align-items-center cursor-pointer p-3 gap-2 border-round text-700 hover:surface-100 transition-duration-150 transition-colors p-ripple">
-                                        <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+                                        <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
                                         <span className="font-bold">Amy Elsner</span>
                                     </a>
                                 </div>
@@ -594,7 +594,7 @@ export default function HeadlessDemo() {
                                 <div className="mt-auto">
                                     <hr className="mb-3 mx-3 border-top-1 border-none surface-border" />
                                     <a v-ripple className="m-3 flex align-items-center cursor-pointer p-3 gap-2 border-round text-700 hover:surface-100 transition-duration-150 transition-colors p-ripple">
-                                        <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+                                        <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
                                         <span className="font-bold">Amy Elsner</span>
                                     </a>
                                 </div>
@@ -804,7 +804,7 @@ export default function HeadlessDemo() {
                                     <div className="mt-auto">
                                         <hr className="mb-3 mx-3 border-top-1 border-none surface-border" />
                                         <a v-ripple className="m-3 flex align-items-center cursor-pointer p-3 gap-2 border-round text-700 hover:surface-100 transition-duration-150 transition-colors p-ripple">
-                                            <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+                                            <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
                                             <span className="font-bold">Amy Elsner</span>
                                         </a>
                                     </div>
diff --git a/components/doc/sidebar/templatedoc.js b/components/doc/sidebar/templatedoc.js
index 27f93ff81b..efb3998015 100644
--- a/components/doc/sidebar/templatedoc.js
+++ b/components/doc/sidebar/templatedoc.js
@@ -18,7 +18,7 @@ export function TemplateDoc(props) {
 
     const customHeader = (
         <div className="flex align-items-center gap-2">
-            <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+            <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
             <span className="font-bold">Amy Elsner</span>
         </div>
     );
@@ -53,7 +53,7 @@ export default function TemplateDemo() {
 
     const customHeader = (
         <div className="flex align-items-center gap-2">
-            <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+            <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
             <span className="font-bold">Amy Elsner</span>
         </div>
     );
@@ -90,7 +90,7 @@ export default function TemplateDemo() {
 
     const customHeader = (
         <div className="flex align-items-center gap-2">
-            <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+            <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
             <span className="font-bold">Amy Elsner</span>
         </div>
     );
diff --git a/components/doc/stepper/pt/wireframe.js b/components/doc/stepper/pt/wireframe.js
index eb2d077f02..b8893b0902 100644
--- a/components/doc/stepper/pt/wireframe.js
+++ b/components/doc/stepper/pt/wireframe.js
@@ -5,7 +5,7 @@ export const Wireframe = (props) => {
         <>
             <DocSectionText {...props} />
             <div>
-                <img className="w-full" src="https://primefaces.org/cdn/primevue/images/pt/wireframe-placeholder.jpg" alt="pt_image" />
+                <img className="w-full" src="https://primefaces.org/cdn/primereact/images/pt/wireframe-placeholder.jpg" alt="pt_image" />
             </div>
         </>
     );
diff --git a/components/doc/tabmenu/templatedoc.js b/components/doc/tabmenu/templatedoc.js
index 5c14e4386d..a84e7da2fc 100644
--- a/components/doc/tabmenu/templatedoc.js
+++ b/components/doc/tabmenu/templatedoc.js
@@ -7,7 +7,7 @@ export function TemplateDoc(props) {
     const [activeIndex, setActiveIndex] = useState(0);
     const itemRenderer = (item, itemIndex) => (
         <a className="p-menuitem-link flex align-items-center gap-2" onClick={() => setActiveIndex(itemIndex)}>
-            <img alt={item.name} src={`https://primefaces.org/cdn/primevue/images/avatar/${item.image}`} style={{ width: '32px' }} />
+            <img alt={item.name} src={`https://primefaces.org/cdn/primereact/images/avatar/${item.image}`} style={{ width: '32px' }} />
             <span className="font-bold">{item.name}</span>
         </a>
     );
@@ -42,7 +42,7 @@ export default function TemplateDemo() {
     const [activeIndex, setActiveIndex] = useState(0);
     const itemRenderer = (item, itemIndex) => (
         <a className="p-menuitem-link flex align-items-center gap-2" onClick={() => setActiveIndex(itemIndex)}>
-            <img alt={item.name} src={\`https://primefaces.org/cdn/primevue/images/avatar/\${item.image}\`} style={{ width: '32px' }} />
+            <img alt={item.name} src={\`https://primefaces.org/cdn/primereact/images/avatar/\${item.image}\`} style={{ width: '32px' }} />
             <span className="font-bold">{item.name}</span>
         </a>
     );
@@ -82,7 +82,7 @@ export default function TemplateDemo() {
     const [activeIndex, setActiveIndex] = useState<number>(0);
     const itemRenderer = (item, itemIndex) => (
         <a className="p-menuitem-link flex align-items-center gap-2" onClick={() => setActiveIndex(itemIndex)}>
-            <img alt={item.name} src={\`https://primefaces.org/cdn/primevue/images/avatar/\${item.image}\`} style={{ width: '32px' }} />
+            <img alt={item.name} src={\`https://primefaces.org/cdn/primereact/images/avatar/\${item.image}\`} style={{ width: '32px' }} />
             <span className="font-bold">{item.name}</span>
         </a>
     );
diff --git a/components/doc/tabview/templatedoc.js b/components/doc/tabview/templatedoc.js
index 06253303e8..e5ece90664 100644
--- a/components/doc/tabview/templatedoc.js
+++ b/components/doc/tabview/templatedoc.js
@@ -8,7 +8,7 @@ export function TemplateDoc(props) {
     const tab1HeaderTemplate = (options) => {
         return (
             <div className="flex align-items-center gap-2 p-3" style={{ cursor: 'pointer' }} onClick={options.onClick}>
-                <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+                <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
                 <span className="font-bold white-space-nowrap">Amy Elsner</span>
             </div>
         );
@@ -17,7 +17,7 @@ export function TemplateDoc(props) {
     const tab2HeaderTemplate = (options) => {
         return (
             <div className="flex align-items-center gap-2 p-3" style={{ cursor: 'pointer' }} onClick={options.onClick}>
-                <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/onyamalimba.png" shape="circle" />
+                <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/onyamalimba.png" shape="circle" />
                 <span className="font-bold white-space-nowrap">Onyama Limba</span>
             </div>
         );
@@ -26,7 +26,7 @@ export function TemplateDoc(props) {
     const tab3HeaderTemplate = (options) => {
         return (
             <div className="flex align-items-center gap-2 p-3" style={{ cursor: 'pointer' }} onClick={options.onClick}>
-                <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/ionibowcher.png" shape="circle" />
+                <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/ionibowcher.png" shape="circle" />
                 <span className="font-bold white-space-nowrap">Ioni Bowcher</span>
                 <Badge value="2" />
             </div>
@@ -73,7 +73,7 @@ export default function TemplateDemo() {
     const tab1HeaderTemplate = (options) => {
         return (
             <div className="flex align-items-center gap-2 p-3" style={{ cursor: 'pointer' }} onClick={options.onClick}>
-                <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+                <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
                 <span className="font-bold white-space-nowrap">Amy Elsner</span>
             </div>
         );
@@ -82,7 +82,7 @@ export default function TemplateDemo() {
     const tab2HeaderTemplate = (options) => {
         return (
             <div className="flex align-items-center gap-2 p-3" style={{ cursor: 'pointer' }} onClick={options.onClick}>
-                <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/onyamalimba.png" shape="circle" />
+                <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/onyamalimba.png" shape="circle" />
                 <span className="font-bold white-space-nowrap">Onyama Limba</span>
             </div>
         )
@@ -91,7 +91,7 @@ export default function TemplateDemo() {
     const tab3HeaderTemplate = (options) => {
         return (
             <div className="flex align-items-center gap-2 p-3" style={{ cursor: 'pointer' }} onClick={options.onClick}>
-                <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/ionibowcher.png" shape="circle" />
+                <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/ionibowcher.png" shape="circle" />
                 <span className="font-bold white-space-nowrap">Ioni Bowcher</span>
                 <Badge value="2" />
             </div>
@@ -141,7 +141,7 @@ export default function TemplateDemo() {
     const tab1HeaderTemplate = (options: TabPanelHeaderTemplateOptions) => {
         return (
             <div className="flex align-items-center gap-2 p-3" style={{ cursor: 'pointer' }} onClick={options.onClick}>
-                <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+                <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
                 <span className="font-bold white-space-nowrap">Amy Elsner</span>
             </div>
         );
@@ -150,7 +150,7 @@ export default function TemplateDemo() {
     const tab2HeaderTemplate = (options: TabPanelHeaderTemplateOptions) => {
         return (
             <div className="flex align-items-center gap-2 p-3" style={{ cursor: 'pointer' }} onClick={options.onClick}>
-                <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/onyamalimba.png" shape="circle" />
+                <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/onyamalimba.png" shape="circle" />
                 <span className="font-bold white-space-nowrap">Onyama Limba</span>
             </div>
         )
@@ -159,7 +159,7 @@ export default function TemplateDemo() {
     const tab3HeaderTemplate = (options: TabPanelHeaderTemplateOptions) => {
         return (
             <div className="flex align-items-center gap-2 p-3" style={{ cursor: 'pointer' }} onClick={options.onClick}>
-                <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/ionibowcher.png" shape="circle" />
+                <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/ionibowcher.png" shape="circle" />
                 <span className="font-bold white-space-nowrap">Ioni Bowcher</span>
                 <Badge value="2" />
             </div>
diff --git a/components/doc/toolbar/customdoc.js b/components/doc/toolbar/customdoc.js
index 0d38c567a4..1e35a43272 100644
--- a/components/doc/toolbar/customdoc.js
+++ b/components/doc/toolbar/customdoc.js
@@ -47,7 +47,7 @@ export function CustomDoc(props) {
     const endContent = (
         <React.Fragment>
             <div className="flex align-items-center gap-2">
-                <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+                <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
                 <span className="font-bold text-bluegray-50">Amy Elsner</span>
             </div>
         </React.Fragment>
@@ -105,7 +105,7 @@ export default function CustomDemo() {
     const endContent = (
         <React.Fragment>
             <div className="flex align-items-center gap-2">
-                <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+                <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
                 <span className="font-bold text-bluegray-50">Amy Elsner</span>
             </div>
         </React.Fragment>
@@ -166,7 +166,7 @@ export default function CustomDemo() {
     const endContent = (
         <React.Fragment>
             <div className="flex align-items-center gap-2">
-                <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
+                <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
                 <span className="font-bold text-bluegray-50">Amy Elsner</span>
             </div>
         </React.Fragment>
diff --git a/components/lib/stepperpanel/stepperpanel.d.ts b/components/lib/stepperpanel/stepperpanel.d.ts
index 39fd8c1942..9d2d7ee040 100644
--- a/components/lib/stepperpanel/stepperpanel.d.ts
+++ b/components/lib/stepperpanel/stepperpanel.d.ts
@@ -72,7 +72,7 @@ export interface StepperPanelPassThroughOptions {
      */
     toggleableContent?: StepperPanelPassThroughOptionType;
     /**
-     * Used to control Vue Transition API.
+     * Used to control React Transition API.
      */
     transition?: StepperPanelPassThroughTransitionType;
     /**