diff --git a/src/registrar/migrations/0118_portfolio_federal_type_alter_portfolio_creator_and_more.py b/src/registrar/migrations/0118_alter_portfolio_options_portfolio_federal_type_and_more.py
similarity index 83%
rename from src/registrar/migrations/0118_portfolio_federal_type_alter_portfolio_creator_and_more.py
rename to src/registrar/migrations/0118_alter_portfolio_options_portfolio_federal_type_and_more.py
index 338107ece..693744951 100644
--- a/src/registrar/migrations/0118_portfolio_federal_type_alter_portfolio_creator_and_more.py
+++ b/src/registrar/migrations/0118_alter_portfolio_options_portfolio_federal_type_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.10 on 2024-08-13 20:01
+# Generated by Django 4.2.10 on 2024-08-14 18:50
 
 from django.conf import settings
 from django.db import migrations, models
@@ -12,6 +12,10 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.AlterModelOptions(
+            name="portfolio",
+            options={"ordering": ["organization_name"]},
+        ),
         migrations.AddField(
             model_name="portfolio",
             name="federal_type",
@@ -53,15 +57,4 @@ class Migration(migrations.Migration):
                 to="registrar.portfolio",
             ),
         ),
-        migrations.AlterField(
-            model_name="user",
-            name="portfolio",
-            field=models.ForeignKey(
-                blank=True,
-                null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
-                related_name="portfolio_users",
-                to="registrar.portfolio",
-            ),
-        ),
     ]
diff --git a/src/registrar/models/portfolio.py b/src/registrar/models/portfolio.py
index 9bf1581f4..25429c0fe 100644
--- a/src/registrar/models/portfolio.py
+++ b/src/registrar/models/portfolio.py
@@ -13,6 +13,10 @@ class Portfolio(TimeStampedModel):
     manageable groups.
     """
 
+    # Addresses the UnorderedObjectListWarning
+    class Meta:
+        ordering = ["organization_name"]
+
     # use the short names in Django admin
     OrganizationChoices = DomainRequest.OrganizationChoices
     StateTerritoryChoices = DomainRequest.StateTerritoryChoices
diff --git a/src/registrar/models/user.py b/src/registrar/models/user.py
index a532fe5fb..81d3b9b61 100644
--- a/src/registrar/models/user.py
+++ b/src/registrar/models/user.py
@@ -116,7 +116,7 @@ class User(AbstractUser):
         "registrar.Portfolio",
         null=True,
         blank=True,
-        related_name="portfolio_users",
+        related_name="user",
         on_delete=models.SET_NULL,
     )