diff --git a/themes/custom/apigee_kickstart/templates/block/block--page-title-block--breadcrumbs.html.twig b/themes/custom/apigee_kickstart/templates/block/block--page-title-block--breadcrumbs.html.twig
index f6533369..4aa013f7 100644
--- a/themes/custom/apigee_kickstart/templates/block/block--page-title-block--breadcrumbs.html.twig
+++ b/themes/custom/apigee_kickstart/templates/block/block--page-title-block--breadcrumbs.html.twig
@@ -5,7 +5,7 @@
  */
 #}
 
-{% embed '@radix/block/block.twig' with {
+{% embed 'radix:block' with {
   html_tag: 'li',
   block_utility_classes: [
     'breadcrumb-item',
diff --git a/themes/custom/apigee_kickstart/templates/block/block--page-title-block.html.twig b/themes/custom/apigee_kickstart/templates/block/block--page-title-block.html.twig
index 054f5601..7b554413 100644
--- a/themes/custom/apigee_kickstart/templates/block/block--page-title-block.html.twig
+++ b/themes/custom/apigee_kickstart/templates/block/block--page-title-block.html.twig
@@ -4,7 +4,7 @@
  * Template for the page title block.
  */
 #}
-{% embed '@radix/block/block.twig' with {
+{% embed 'radix:block' with {
   html_tag: 'div',
   block_utility_classes: [
     'bg-lighter',
diff --git a/themes/custom/apigee_kickstart/templates/block/block--system-branding-block.html.twig b/themes/custom/apigee_kickstart/templates/block/block--system-branding-block.html.twig
index 0dacebdc..985c36bb 100644
--- a/themes/custom/apigee_kickstart/templates/block/block--system-branding-block.html.twig
+++ b/themes/custom/apigee_kickstart/templates/block/block--system-branding-block.html.twig
@@ -4,6 +4,6 @@
  * Template for the branding block.
  */
 #}
-{% include '@radix/block/block--system-branding-block.html.twig' with {
+{% include 'radix:block' with {
   html_tag: 'div'
 } %}
diff --git a/themes/custom/apigee_kickstart/templates/block/block--system-breadcrumb-block.html.twig b/themes/custom/apigee_kickstart/templates/block/block--system-breadcrumb-block.html.twig
index 3b6937c6..83822beb 100644
--- a/themes/custom/apigee_kickstart/templates/block/block--system-breadcrumb-block.html.twig
+++ b/themes/custom/apigee_kickstart/templates/block/block--system-breadcrumb-block.html.twig
@@ -5,7 +5,7 @@
  */
 #}
 
-{% embed '@radix/block/block.twig' with {
+{% embed 'radix:block' with {
   html_tag: 'li'
 } %}
   {% block content %}
diff --git a/themes/custom/apigee_kickstart/templates/block/block--system-menu-block.html.twig b/themes/custom/apigee_kickstart/templates/block/block--system-menu-block.html.twig
index e7bbfdbe..35adfece 100644
--- a/themes/custom/apigee_kickstart/templates/block/block--system-menu-block.html.twig
+++ b/themes/custom/apigee_kickstart/templates/block/block--system-menu-block.html.twig
@@ -7,6 +7,6 @@
 
 {% set title_attributes = title_attributes.setAttribute('class', ['visually-hidden']) %}
 
-{% include '@radix/block/block.twig' with {
+{% include 'radix:block' with {
   html_tag: 'div',
 } %}
diff --git a/themes/custom/apigee_kickstart/templates/block/block--team-switcher.html.twig b/themes/custom/apigee_kickstart/templates/block/block--team-switcher.html.twig
index 7fe9a1cc..a22f1407 100644
--- a/themes/custom/apigee_kickstart/templates/block/block--team-switcher.html.twig
+++ b/themes/custom/apigee_kickstart/templates/block/block--team-switcher.html.twig
@@ -4,7 +4,7 @@
  * Template for the Team switcher block.
  */
 #}
-{% embed '@radix/block/block.twig' with {
+{% embed 'radix:block' with {
   html_tag: 'div',
 } %}
   {% block content %}
diff --git a/themes/custom/apigee_kickstart/templates/media/image.html.twig b/themes/custom/apigee_kickstart/templates/media/image.html.twig
index a2caee8e..fe2938de 100644
--- a/themes/custom/apigee_kickstart/templates/media/image.html.twig
+++ b/themes/custom/apigee_kickstart/templates/media/image.html.twig
@@ -4,8 +4,9 @@
  * Template for an image field.
  */
 #}
-{% include '@radix/image/image.twig' with {
-  responsive: true,
-  src: attributes.src,
-  alt: attributes.alt,
-} %}
+{%
+  include 'radix:image' with {
+    image_attributes: attributes,
+    responsive: true,
+  }
+%}