diff --git a/ram/portal/views.py b/ram/portal/views.py
index dd7d3d4..7b90bc2 100644
--- a/ram/portal/views.py
+++ b/ram/portal/views.py
@@ -509,9 +509,9 @@ class Manufacturers(GetData):
             .annotate(
                 num_rollingclass=(
                     Count(
-                        "rollingclass__rolling_class",
+                        "rollingclass__rolling_stock",
                         filter=Q(
-                            rollingclass__rolling_class__in=(
+                            rollingclass__rolling_stock__in=(
                                 RollingStock.objects.get_published(
                                     request.user
                                 )
@@ -543,9 +543,9 @@ class Companies(GetData):
             Company.objects.annotate(
                 num_rollingstock=(
                     Count(
-                        "rollingclass__rolling_class",
+                        "rollingclass__rolling_stock",
                         filter=Q(
-                            rollingclass__rolling_class__in=(
+                            rollingclass__rolling_stock__in=(
                                 RollingStock.objects.get_published(
                                     request.user
                                 )
@@ -611,9 +611,9 @@ class Types(GetData):
     def get_data(self, request):
         return RollingStockType.objects.annotate(
             num_items=Count(
-                "rollingclass__rolling_class",
+                "rollingclass__rolling_stock",
                 filter=Q(
-                    rollingclass__rolling_class__in=(
+                    rollingclass__rolling_stock__in=(
                         RollingStock.objects.get_published(request.user)
                     )
                 ),
diff --git a/ram/roster/migrations/0038_alter_rollingstock_rolling_class.py b/ram/roster/migrations/0038_alter_rollingstock_rolling_class.py
new file mode 100644
index 0000000..78eaffc
--- /dev/null
+++ b/ram/roster/migrations/0038_alter_rollingstock_rolling_class.py
@@ -0,0 +1,24 @@
+# Generated by Django 5.1.4 on 2025-05-24 12:56
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("roster", "0037_alter_rollingstock_road_number_int"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="rollingstock",
+            name="rolling_class",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="rolling_stock",
+                to="roster.rollingclass",
+                verbose_name="Class",
+            ),
+        ),
+    ]
diff --git a/ram/roster/models.py b/ram/roster/models.py
index 7e1534d..27f374d 100644
--- a/ram/roster/models.py
+++ b/ram/roster/models.py
@@ -63,7 +63,7 @@ class RollingStock(BaseModel):
         on_delete=models.CASCADE,
         null=False,
         blank=False,
-        related_name="rolling_class",
+        related_name="rolling_stock",
         verbose_name="Class",
     )
     road_number = models.CharField(max_length=128, unique=False)