diff --git a/test/fixtures/assignments.yml b/test/fixtures/assignments.yml
index f85aaac86..4e1ed1c11 100644
--- a/test/fixtures/assignments.yml
+++ b/test/fixtures/assignments.yml
@@ -1,7 +1,7 @@
-one:
+logo_kevin:
   user: kevin
   bubble: logo
 
-two:
+layout_jz:
   user: jz
   bubble: layout
diff --git a/test/fixtures/boosts.yml b/test/fixtures/boosts.yml
index b5f637f89..5d46d0cce 100644
--- a/test/fixtures/boosts.yml
+++ b/test/fixtures/boosts.yml
@@ -1,15 +1,15 @@
-logo_one:
+logo_jz_one:
   bubble: logo
   creator: jz
 
-logo_two:
+logo_jz_two:
   bubble: logo
   creator: jz
 
-logo_three:
+logo_kevin:
   bubble: logo
   creator: kevin
 
-layout_one:
+layout_jz:
   bubble: layout
   creator: jz
diff --git a/test/fixtures/comments.yml b/test/fixtures/comments.yml
index 435ee265e..4a931d6bb 100644
--- a/test/fixtures/comments.yml
+++ b/test/fixtures/comments.yml
@@ -1,16 +1,14 @@
-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-one:
+logo_jz:
   body: I agree.
   creator: jz
   bubble: logo
 
-two:
+logo_kevin:
   body: Same, let’s do it.
   creator: kevin
   bubble: logo
 
-three:
+layout_:
   body: The text is overflowing the container.
   creator: david
   bubble: layout
diff --git a/test/fixtures/taggings.yml b/test/fixtures/taggings.yml
index bd5c2ee6d..3eb5b11a8 100644
--- a/test/fixtures/taggings.yml
+++ b/test/fixtures/taggings.yml
@@ -1,15 +1,15 @@
-one:
+logo_web:
   bubble: logo
-  tag: one
+  tag: web
 
-two:
+layout_web:
   bubble: layout
-  tag: two
+  tag: web
 
-three:
+layout_mobile:
   bubble: layout
-  tag: one
+  tag: mobile
 
-four:
+text_mobile:
   bubble: text
-  tag: two
+  tag: mobile
diff --git a/test/fixtures/tags.yml b/test/fixtures/tags.yml
index 4bb1550db..19b47021f 100644
--- a/test/fixtures/tags.yml
+++ b/test/fixtures/tags.yml
@@ -1,7 +1,5 @@
-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-one:
+web:
   title: Web
 
-two:
+mobile:
   title: Mobile