diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 8d546ff42..6b2369fd4 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -557,8 +557,8 @@ RSpec/DescribedClass:
     - 'spec/presenters/account_relationships_presenter_spec.rb'
     - 'spec/presenters/instance_presenter_spec.rb'
     - 'spec/presenters/status_relationships_presenter_spec.rb'
-    - 'spec/serializers/activitypub/note_spec.rb'
-    - 'spec/serializers/activitypub/update_poll_spec.rb'
+    - 'spec/serializers/activitypub/note_serializer_spec.rb'
+    - 'spec/serializers/activitypub/update_poll_serializer_spec.rb'
     - 'spec/serializers/rest/account_serializer_spec.rb'
     - 'spec/services/activitypub/fetch_remote_account_service_spec.rb'
     - 'spec/services/activitypub/fetch_remote_actor_service_spec.rb'
@@ -698,8 +698,8 @@ RSpec/FilePath:
     - 'spec/lib/activitypub/tag_manager_spec.rb'
     - 'spec/lib/ostatus/tag_manager_spec.rb'
     - 'spec/lib/sanitize_config_spec.rb'
-    - 'spec/serializers/activitypub/note_spec.rb'
-    - 'spec/serializers/activitypub/update_poll_spec.rb'
+    - 'spec/serializers/activitypub/note_serializer_spec.rb'
+    - 'spec/serializers/activitypub/update_poll_serializer_spec.rb'
     - 'spec/services/activitypub/fetch_featured_collection_service_spec.rb'
     - 'spec/services/activitypub/fetch_featured_tags_collection_service_spec.rb'
     - 'spec/services/activitypub/fetch_remote_account_service_spec.rb'
@@ -733,8 +733,8 @@ RSpec/HookArgument:
     - 'spec/helpers/instance_helper_spec.rb'
     - 'spec/models/user_spec.rb'
     - 'spec/rails_helper.rb'
-    - 'spec/serializers/activitypub/note_spec.rb'
-    - 'spec/serializers/activitypub/update_poll_spec.rb'
+    - 'spec/serializers/activitypub/note_serializer_spec.rb'
+    - 'spec/serializers/activitypub/update_poll_serializer_spec.rb'
     - 'spec/services/import_service_spec.rb'
     - 'spec/spec_helper.rb'
 
@@ -755,8 +755,8 @@ RSpec/InstanceVariable:
     - 'spec/models/concerns/account_interactions_spec.rb'
     - 'spec/models/concerns/remotable_spec.rb'
     - 'spec/models/public_feed_spec.rb'
-    - 'spec/serializers/activitypub/note_spec.rb'
-    - 'spec/serializers/activitypub/update_poll_spec.rb'
+    - 'spec/serializers/activitypub/note_serializer_spec.rb'
+    - 'spec/serializers/activitypub/update_poll_serializer_spec.rb'
     - 'spec/services/remove_status_service_spec.rb'
     - 'spec/services/search_service_spec.rb'
     - 'spec/services/unblock_domain_service_spec.rb'
@@ -1022,8 +1022,8 @@ RSpec/NamedSubject:
     - 'spec/policies/tag_policy_spec.rb'
     - 'spec/policies/user_policy_spec.rb'
     - 'spec/presenters/familiar_followers_presenter_spec.rb'
-    - 'spec/serializers/activitypub/note_spec.rb'
-    - 'spec/serializers/activitypub/update_poll_spec.rb'
+    - 'spec/serializers/activitypub/note_serializer_spec.rb'
+    - 'spec/serializers/activitypub/update_poll_serializer_spec.rb'
     - 'spec/serializers/rest/account_serializer_spec.rb'
     - 'spec/services/account_search_service_spec.rb'
     - 'spec/services/account_statuses_cleanup_service_spec.rb'
diff --git a/spec/serializers/activitypub/note_spec.rb b/spec/serializers/activitypub/note_serializer_spec.rb
similarity index 100%
rename from spec/serializers/activitypub/note_spec.rb
rename to spec/serializers/activitypub/note_serializer_spec.rb
diff --git a/spec/serializers/activitypub/update_poll_spec.rb b/spec/serializers/activitypub/update_poll_serializer_spec.rb
similarity index 100%
rename from spec/serializers/activitypub/update_poll_spec.rb
rename to spec/serializers/activitypub/update_poll_serializer_spec.rb