diff --git a/templates/pages/media-discovery.html.twig b/templates/pages/media-discovery.html.twig
index 593322a..9ad49dd 100644
--- a/templates/pages/media-discovery.html.twig
+++ b/templates/pages/media-discovery.html.twig
@@ -107,11 +107,11 @@
 
                         <a href="/e/{{ noteId }}" class="masonry-link">
                             {% if firstImageUrl %}
-                                <div class="masonry-image-container {% if aspectRatio %}has-dimensions{% endif %}" {% if aspectRatio %}style="padding-bottom: {{ aspectRatio }}%;"{% endif %} data-controller="image-loader">
+                                <div class="masonry-image-container {% if aspectRatio %}has-dimensions{% endif %}" {% if aspectRatio %}style="padding-bottom: {{ aspectRatio }}%;"{% endif %} data-controller="media--image-loader">
                                     <img data-src="{{ firstImageUrl }}"
                                          alt="{{ imageAlt|default(title|default(isVideo ? 'Video' : 'Picture')) }}"
                                          class="masonry-image"
-                                         data-image-loader-target="image"
+                                         data-media--image-loader-target="image"
                                          onerror="this.closest('.masonry-item').style.display='none'" />
                                     {% if isVideo %}
                                         <div class="video-overlay">
diff --git a/templates/profile/author-media.html.twig b/templates/profile/author-media.html.twig
index f03327b..6ce87e9 100644
--- a/templates/profile/author-media.html.twig
+++ b/templates/profile/author-media.html.twig
@@ -126,12 +126,12 @@
 
                 {% if hasMore %}
                     <div class="load-more-container">
-                        <button data-media-loader-target="button"
-                                data-action="click->media-loader#loadMore"
+                        <button data-media--media-loader-target="button"
+                                data-action="click->media--media-loader#loadMore"
                                 class="btn-load-more">
                             Load More
                         </button>
-                        <p data-media-loader-target="status" class="load-more-status">
+                        <p data-media--media-loader-target="status" class="load-more-status">
                             Showing {{ pictureEvents|length }} of {{ total }} media items
                         </p>
                     </div>