diff --git a/backend/src/models/index.js b/backend/src/models/index.js
index d476e5f9b..d152979e0 100644
--- a/backend/src/models/index.js
+++ b/backend/src/models/index.js
@@ -1,20 +1,20 @@
 // NOTE: We cannot use `fs` here to clean up the code. Cypress breaks on any npm
 // module that is not browser-compatible. Node's `fs` module is server-side only
 export default {
-  Image: require('./Image.js').default,
-  Badge: require('./Badge.js').default,
-  User: require('./User.js').default,
-  Group: require('./Group.js').default,
-  EmailAddress: require('./EmailAddress.js').default,
-  UnverifiedEmailAddress: require('./UnverifiedEmailAddress.js').default,
-  SocialMedia: require('./SocialMedia.js').default,
-  Post: require('./Post.js').default,
-  Comment: require('./Comment.js').default,
-  Category: require('./Category.js').default,
-  Tag: require('./Tag.js').default,
-  Location: require('./Location.js').default,
-  Donations: require('./Donations.js').default,
-  Report: require('./Report.js').default,
-  Migration: require('./Migration.js').default,
-  InviteCode: require('./InviteCode.js').default,
+  Image: require('./Image.js'),
+  Badge: require('./Badge.js'),
+  User: require('./User.js'),
+  Group: require('./Group.js'),
+  EmailAddress: require('./EmailAddress.js'),
+  UnverifiedEmailAddress: require('./UnverifiedEmailAddress.js'),
+  SocialMedia: require('./SocialMedia.js'),
+  Post: require('./Post.js'),
+  Comment: require('./Comment.js'),
+  Category: require('./Category.js'),
+  Tag: require('./Tag.js'),
+  Location: require('./Location.js'),
+  Donations: require('./Donations.js'),
+  Report: require('./Report.js'),
+  Migration: require('./Migration.js'),
+  InviteCode: require('./InviteCode.js'),
 }
diff --git a/cypress/support/factories.js b/cypress/support/factories.js
index a8cd2d863..b08d83526 100644
--- a/cypress/support/factories.js
+++ b/cypress/support/factories.js
@@ -10,7 +10,7 @@ Cypress.Commands.add('neode', () => {
 })
 
 Cypress.Commands.add(
-  'first',
+  'firstOf',
   { prevSubject: true },
   (neode, model, properties) => {
     return neode.first(model, properties)
diff --git a/cypress/support/step_definitions/Moderation.ReportContent/there_is_an_annoying_user_who_has_muted_me.js b/cypress/support/step_definitions/Moderation.ReportContent/there_is_an_annoying_user_who_has_muted_me.js
index 011e15d81..71e29ce91 100644
--- a/cypress/support/step_definitions/Moderation.ReportContent/there_is_an_annoying_user_who_has_muted_me.js
+++ b/cypress/support/step_definitions/Moderation.ReportContent/there_is_an_annoying_user_who_has_muted_me.js
@@ -7,7 +7,7 @@ Given("there is an annoying user who has muted me", () => {
     })
     .then(mutedUser => {
       cy.neode()
-        .first("User", {
+        .firstOf("User", {
           id: 'user'
         })
       .relateTo(mutedUser, "muted");
diff --git a/cypress/support/step_definitions/User.Block/I_block_the_user_{string}.js b/cypress/support/step_definitions/User.Block/I_block_the_user_{string}.js
index 6bbca8ece..be82f00d9 100644
--- a/cypress/support/step_definitions/User.Block/I_block_the_user_{string}.js
+++ b/cypress/support/step_definitions/User.Block/I_block_the_user_{string}.js
@@ -2,10 +2,10 @@ import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I block the user {string}", name => {
   cy.neode()
-    .first("User", { name })
+    .firstOf("User", { name })
     .then(blockedUser => {
       cy.neode()
-        .first("User", {id: "id-of-peter-pan"})
+        .firstOf("User", {id: "id-of-peter-pan"})
         .relateTo(blockedUser, "blocked");
     });
 });
diff --git a/cypress/support/step_definitions/User.Block/a_user_has_blocked_me.js b/cypress/support/step_definitions/User.Block/a_user_has_blocked_me.js
index 8a68f6e65..13b247ccf 100644
--- a/cypress/support/step_definitions/User.Block/a_user_has_blocked_me.js
+++ b/cypress/support/step_definitions/User.Block/a_user_has_blocked_me.js
@@ -2,12 +2,12 @@ import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("a user has blocked me", () => {
   cy.neode()
-    .first("User", {
+    .firstOf("User", {
       name: "Peter Pan"
     })
     .then(blockedUser => {
       cy.neode()
-        .first("User", {
+        .firstOf("User", {
           name: 'Harassing User'
         })
         .relateTo(blockedUser, "blocked");
diff --git a/cypress/support/step_definitions/User.Mute/I_mute_the_user_{string}.js b/cypress/support/step_definitions/User.Mute/I_mute_the_user_{string}.js
index 449aa87d8..7b52ca373 100644
--- a/cypress/support/step_definitions/User.Mute/I_mute_the_user_{string}.js
+++ b/cypress/support/step_definitions/User.Mute/I_mute_the_user_{string}.js
@@ -2,10 +2,10 @@ import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I mute the user {string}", name => {
   cy.neode()
-    .first("User", { name })
+    .firstOf("User", { name })
     .then(mutedUser => {
       cy.neode()
-        .first("User", {
+        .firstOf("User", {
           name: "Peter Pan"
         })
         .relateTo(mutedUser, "muted");
diff --git a/cypress/support/step_definitions/common/I_am_logged_in_as_{string}.js b/cypress/support/step_definitions/common/I_am_logged_in_as_{string}.js
index 309194fd5..dfbfd519c 100644
--- a/cypress/support/step_definitions/common/I_am_logged_in_as_{string}.js
+++ b/cypress/support/step_definitions/common/I_am_logged_in_as_{string}.js
@@ -3,7 +3,7 @@ import encode from '../../../../backend/src/jwt/encode'
 
 Given("I am logged in as {string}", slug => {
   cy.neode()
-    .first("User", { slug })
+    .firstOf("User", { slug })
     .then(user => {
       return new Cypress.Promise((resolve, reject) => {
         if(!user) {
diff --git a/cypress/support/step_definitions/common/I_follow_the_user_{string}.js b/cypress/support/step_definitions/common/I_follow_the_user_{string}.js
index deb5f1ba6..3698daee8 100644
--- a/cypress/support/step_definitions/common/I_follow_the_user_{string}.js
+++ b/cypress/support/step_definitions/common/I_follow_the_user_{string}.js
@@ -2,10 +2,10 @@ import { Given } from "@badeball/cypress-cucumber-preprocessor";
 
 Given("I follow the user {string}", name => {
   cy.neode()
-    .first("User", {name})
+    .firstOf("User", {name})
     .then(followed => {
       cy.neode()
-        .first("User", {
+        .firstOf("User", {
           name: "Peter Pan"
         })
         .relateTo(followed, "following");