diff --git a/core/themes/classy/classy.libraries.yml b/core/themes/classy/classy.libraries.yml
index af0f891..29cb495 100644
--- a/core/themes/classy/classy.libraries.yml
+++ b/core/themes/classy/classy.libraries.yml
@@ -7,14 +7,14 @@ base:
 book-navigation:
   version: VERSION
   css:
-    theme:
-      css/navigation/book.theme.css: {}
+    component:
+      css/components/book-navigation.css: {}
 
-drupal.comment.threaded:
+indented:
   version: VERSION
   css:
-    theme:
-      css/comment/comment.theme.css: {}
+    component:
+      css/components/indented.css: {}
 
 node:
   version: VERSION
@@ -22,8 +22,8 @@ node:
     component:
       css/components/node.css: { weight: -10 }
 
-search.results:
+search-results:
   version: VERSION
   css:
-    theme:
-      css/search/search.theme.css: {}
+    component:
+      css/components/search-results.css: {}
diff --git a/core/themes/classy/css/navigation/book.theme.css b/core/themes/classy/css/components/book-navigation.css
similarity index 100%
rename from core/themes/classy/css/navigation/book.theme.css
rename to core/themes/classy/css/components/book-navigation.css
diff --git a/core/themes/classy/css/comment/comment.theme.css b/core/themes/classy/css/components/indented.css
similarity index 100%
rename from core/themes/classy/css/comment/comment.theme.css
rename to core/themes/classy/css/components/indented.css
diff --git a/core/themes/classy/css/search/search.theme.css b/core/themes/classy/css/components/search-results.css
similarity index 82%
rename from core/themes/classy/css/search/search.theme.css
rename to core/themes/classy/css/components/search-results.css
index 7d9980a..343ea8b 100644
--- a/core/themes/classy/css/search/search.theme.css
+++ b/core/themes/classy/css/components/search-results.css
@@ -2,6 +2,7 @@
  * @file
  * Stylesheet for results generated by the Search module.
  */
-ol.search-results {
+
+.search-results {
   list-style: none;
 }
diff --git a/core/themes/classy/templates/content/comment.html.twig b/core/themes/classy/templates/content/comment.html.twig
index 25e7d37..a4f7229 100644
--- a/core/themes/classy/templates/content/comment.html.twig
+++ b/core/themes/classy/templates/content/comment.html.twig
@@ -65,7 +65,7 @@
  */
 #}
 {% if threaded %}
-  {{ attach_library('classy/drupal.comment.threaded') }}
+  {{ attach_library('classy/indented') }}
 {% endif %}
 {%
   set classes = [
diff --git a/core/themes/classy/templates/content/search-result.html.twig b/core/themes/classy/templates/content/search-result.html.twig
index 714b005..c8275a2 100644
--- a/core/themes/classy/templates/content/search-result.html.twig
+++ b/core/themes/classy/templates/content/search-result.html.twig
@@ -56,7 +56,7 @@
  * @see template_preprocess_search_result()
  */
 #}
-{{ attach_library('classy/search.results') }}
+{{ attach_library('classy/search-results') }}
 {{ title_prefix }}
 <h3{{ title_attributes.addClass('search-result__title') }}>
   <a href="{{ url }}">{{ title }}</a>