diff --git a/gesso_helper/src/Element/GessoButton.php b/gesso_helper/src/Element/GessoButton.php
index 48ae65d7..734d4794 100644
--- a/gesso_helper/src/Element/GessoButton.php
+++ b/gesso_helper/src/Element/GessoButton.php
@@ -5,6 +5,7 @@
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Render\Element\RenderElementBase;
+use Drupal\Core\Render\Element\RenderElement;
 use Drupal\Core\Url as CoreUrl;
 
 /**
@@ -33,7 +34,7 @@
  * ];
  * @endcode
  *
- * @RenderElementBase("gesso_button")
+ * @RenderElement("gesso_button")
  */
 class GessoButton extends RenderElementBase {
 
diff --git a/gesso_helper/src/Element/GessoIcon.php b/gesso_helper/src/Element/GessoIcon.php
index 6564ad1b..893cfb8a 100644
--- a/gesso_helper/src/Element/GessoIcon.php
+++ b/gesso_helper/src/Element/GessoIcon.php
@@ -3,11 +3,12 @@
 namespace Drupal\gesso_helper\Element;
 
 use Drupal\Core\Render\Element\RenderElementBase;
+use Drupal\Core\Render\Element\RenderElement;
 
 /**
  * Provides an SVG icon element.
  *
- * @RenderElementBase("gesso_icon")
+ * @RenderElement("gesso_icon")
  */
 class GessoIcon extends RenderElementBase {
 
diff --git a/gesso_helper/src/Element/GessoIconLink.php b/gesso_helper/src/Element/GessoIconLink.php
index 81d5eae2..1f5fce71 100644
--- a/gesso_helper/src/Element/GessoIconLink.php
+++ b/gesso_helper/src/Element/GessoIconLink.php
@@ -5,6 +5,7 @@
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Render\Element\RenderElementBase;
+use Drupal\Core\Render\Element\RenderElement;
 use Drupal\Core\Url as CoreUrl;
 
 /**
@@ -33,7 +34,7 @@
  * ];
  * @endcode
  *
- * @RenderElementBase("gesso_icon_link")
+ * @RenderElement("gesso_icon_link")
  */
 class GessoIconLink extends RenderElementBase {