diff --git a/app/assets/stylesheets/sdg/goals/filter_links.scss b/app/assets/stylesheets/sdg/goals/tag_cloud.scss
similarity index 69%
rename from app/assets/stylesheets/sdg/goals/filter_links.scss
rename to app/assets/stylesheets/sdg/goals/tag_cloud.scss
index 914c4e7b0..8008cfb64 100644
--- a/app/assets/stylesheets/sdg/goals/filter_links.scss
+++ b/app/assets/stylesheets/sdg/goals/tag_cloud.scss
@@ -1,4 +1,4 @@
-.sdg-goal-filter-links {
+.sdg-goal-tag-cloud {
 
   .sdg-goal-tag-list {
     @extend %sdg-goal-list;
diff --git a/app/components/sdg/goals/filter_links_component.html.erb b/app/components/sdg/goals/tag_cloud_component.html.erb
similarity index 81%
rename from app/components/sdg/goals/filter_links_component.html.erb
rename to app/components/sdg/goals/tag_cloud_component.html.erb
index dc4b3c122..ebd572a6f 100644
--- a/app/components/sdg/goals/filter_links_component.html.erb
+++ b/app/components/sdg/goals/tag_cloud_component.html.erb
@@ -1,4 +1,4 @@
-<div class="sdg-goal-filter-links">
+<div class="sdg-goal-tag-cloud">
   <div class="sidebar-divider"></div>
   <h2 class="sidebar-title"><%= heading %></h2>
   <%= render SDG::Goals::TagListComponent.new(class_name) %>
diff --git a/app/components/sdg/goals/filter_links_component.rb b/app/components/sdg/goals/tag_cloud_component.rb
similarity index 79%
rename from app/components/sdg/goals/filter_links_component.rb
rename to app/components/sdg/goals/tag_cloud_component.rb
index 3d4affc78..36a202263 100644
--- a/app/components/sdg/goals/filter_links_component.rb
+++ b/app/components/sdg/goals/tag_cloud_component.rb
@@ -1,4 +1,4 @@
-class SDG::Goals::FilterLinksComponent < ApplicationComponent
+class SDG::Goals::TagCloudComponent < ApplicationComponent
   attr_reader :class_name
 
   def initialize(class_name)
diff --git a/app/views/shared/_tag_cloud.html.erb b/app/views/shared/_tag_cloud.html.erb
index 05507c5e2..1983f262a 100644
--- a/app/views/shared/_tag_cloud.html.erb
+++ b/app/views/shared/_tag_cloud.html.erb
@@ -13,4 +13,4 @@
   </ul>
 </div>
 
-<%= render SDG::Goals::FilterLinksComponent.new(taggable) %>
+<%= render SDG::Goals::TagCloudComponent.new(taggable) %>
diff --git a/spec/components/sdg/goals/filter_links_component_spec.rb b/spec/components/sdg/goals/tag_cloud_component_spec.rb
similarity index 67%
rename from spec/components/sdg/goals/filter_links_component_spec.rb
rename to spec/components/sdg/goals/tag_cloud_component_spec.rb
index 408e8ee1b..46f543987 100644
--- a/spec/components/sdg/goals/filter_links_component_spec.rb
+++ b/spec/components/sdg/goals/tag_cloud_component_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-describe SDG::Goals::FilterLinksComponent, type: :component do
+describe SDG::Goals::TagCloudComponent, type: :component do
   before do
     Setting["feature.sdg"] = true
     Setting["sdg.process.debates"] = true
@@ -8,7 +8,7 @@ describe SDG::Goals::FilterLinksComponent, type: :component do
   end
 
   it "renders a title" do
-    component = SDG::Goals::FilterLinksComponent.new("Debate")
+    component = SDG::Goals::TagCloudComponent.new("Debate")
 
     render_inline component
 
@@ -16,7 +16,7 @@ describe SDG::Goals::FilterLinksComponent, type: :component do
   end
 
   it "renders all goals" do
-    component = SDG::Goals::FilterLinksComponent.new("Proposal")
+    component = SDG::Goals::TagCloudComponent.new("Proposal")
 
     render_inline component