diff --git a/test/e2e/cypress/integration/profiles/email/login/error.spec.ts b/test/e2e/cypress/integration/profiles/email/login/error.spec.ts
index 3c7c4ea517fe..90873f9cb882 100644
--- a/test/e2e/cypress/integration/profiles/email/login/error.spec.ts
+++ b/test/e2e/cypress/integration/profiles/email/login/error.spec.ts
@@ -27,7 +27,7 @@ describe('Basic email profile with failing login flows', () => {
       })
 
       it('fails when CSRF cookies are missing', () => {
-        cy.get(`${appPrefix(app)}input[name="password_identifier"]`).type(
+        cy.get(`${appPrefix(app)}input[name="identifier"]`).type(
           'i-do-not-exist'
         )
         cy.get('input[name="password"]').type('invalid-password')
@@ -47,7 +47,7 @@ describe('Basic email profile with failing login flows', () => {
           cy.submitPasswordForm()
           cy.get('*[data-testid="ui/message/4000002"]').should(
             'contain.text',
-            'Property password_identifier is missing'
+            'Property identifier is missing'
           )
           cy.get('*[data-testid="ui/message/4000002"]').should(
             'contain.text',
@@ -57,7 +57,7 @@ describe('Basic email profile with failing login flows', () => {
 
         it('should show an error when the password is missing', () => {
           const identity = gen.email()
-          cy.get('input[name="password_identifier"]')
+          cy.get('input[name="identifier"]')
             .type(identity)
             .should('have.value', identity)
 
@@ -73,7 +73,7 @@ describe('Basic email profile with failing login flows', () => {
         })
 
         it('should show fail to sign in', () => {
-          cy.get('input[name="password_identifier"]').type('i-do-not-exist')
+          cy.get('input[name="identifier"]').type('i-do-not-exist')
           cy.get('input[name="password"]').type('invalid-password')
 
           cy.submitPasswordForm()
diff --git a/test/e2e/cypress/integration/profiles/email/login/success.spec.ts b/test/e2e/cypress/integration/profiles/email/login/success.spec.ts
index a6674f59bcdb..c64874d868e8 100644
--- a/test/e2e/cypress/integration/profiles/email/login/success.spec.ts
+++ b/test/e2e/cypress/integration/profiles/email/login/success.spec.ts
@@ -33,7 +33,7 @@ describe('Basic email profile with succeeding login flows', () => {
       })
 
       it('should sign in and be logged in', () => {
-        cy.get(`${appPrefix(app)}input[name="password_identifier"]`).type(email)
+        cy.get(`${appPrefix(app)}input[name="identifier"]`).type(email)
         cy.get('input[name="password"]').type(password)
         cy.submitPasswordForm()
         cy.location('pathname').should('not.contain', '/login')
@@ -49,7 +49,7 @@ describe('Basic email profile with succeeding login flows', () => {
       })
 
       it('should sign in with case insensitive identifier surrounded by whitespace', () => {
-        cy.get('input[name="password_identifier"]').type(
+        cy.get('input[name="identifier"]').type(
           '  ' + email.toUpperCase() + '  '
         )
         cy.get('input[name="password"]').type(password)
@@ -70,7 +70,7 @@ describe('Basic email profile with succeeding login flows', () => {
         cy.browserReturnUrlOry()
         cy.visit(route + '?return_to=https://www.ory.sh/')
 
-        cy.get('input[name="password_identifier"]').type(email.toUpperCase())
+        cy.get('input[name="identifier"]').type(email.toUpperCase())
         cy.get('input[name="password"]').type(password)
         cy.submitPasswordForm()
 
@@ -99,7 +99,7 @@ describe('Basic email profile with succeeding login flows', () => {
 
       cy.longLoginLifespan()
 
-      cy.get(appPrefix('express') + 'input[name="password_identifier"]').type(
+      cy.get(appPrefix('express') + 'input[name="identifier"]').type(
         email.toUpperCase()
       )
       cy.get('input[name="password"]').type(password)
@@ -111,7 +111,7 @@ describe('Basic email profile with succeeding login flows', () => {
       )
 
       // try again with long lifespan set
-      cy.get('input[name="password_identifier"]').type(email.toUpperCase())
+      cy.get('input[name="identifier"]').type(email.toUpperCase())
       cy.get('input[name="password"]').type(password)
       cy.submitPasswordForm()
 
diff --git a/test/e2e/cypress/integration/profiles/email/login/ui.spec.ts b/test/e2e/cypress/integration/profiles/email/login/ui.spec.ts
index 85733e7c8aa0..883a7f9a28d9 100644
--- a/test/e2e/cypress/integration/profiles/email/login/ui.spec.ts
+++ b/test/e2e/cypress/integration/profiles/email/login/ui.spec.ts
@@ -26,7 +26,7 @@ context('UI tests using the email profile', () => {
       })
 
       it('should use the json schema titles', () => {
-        cy.get(`${appPrefix(app)}input[name="password_identifier"]`)
+        cy.get(`${appPrefix(app)}input[name="identifier"]`)
           .parent()
           .should('contain.text', 'ID')
         cy.get('input[name="password"]')
diff --git a/test/e2e/cypress/integration/profiles/mfa/totp.spec.ts b/test/e2e/cypress/integration/profiles/mfa/totp.spec.ts
index fee4436a2827..9f29b66b8f24 100644
--- a/test/e2e/cypress/integration/profiles/mfa/totp.spec.ts
+++ b/test/e2e/cypress/integration/profiles/mfa/totp.spec.ts
@@ -65,7 +65,7 @@ context('2FA lookup secrets', () => {
         cy.clearAllCookies()
         cy.visit(login)
 
-        cy.get('input[name="password_identifier"]').type(email)
+        cy.get('input[name="identifier"]').type(email)
         cy.get('input[name="password"]').type(password)
         cy.submitPasswordForm()
 
@@ -120,7 +120,7 @@ context('2FA lookup secrets', () => {
         cy.clearAllCookies()
         cy.visit(`${login}?return_to=https://www.ory.sh/`)
 
-        cy.get('input[name="password_identifier"]').type(email)
+        cy.get('input[name="identifier"]').type(email)
         cy.get('input[name="password"]').type(password)
         cy.submitPasswordForm()
 
diff --git a/test/e2e/cypress/integration/profiles/mobile/login/errors.spec.ts b/test/e2e/cypress/integration/profiles/mobile/login/errors.spec.ts
index 249949f25e81..8eb44b7c607a 100644
--- a/test/e2e/cypress/integration/profiles/mobile/login/errors.spec.ts
+++ b/test/e2e/cypress/integration/profiles/mobile/login/errors.spec.ts
@@ -12,14 +12,14 @@ context('Mobile Profile', () => {
     })
 
     describe('shows validation errors when invalid signup data is used', () => {
-      it('should show an error when the password_identifier is missing', () => {
+      it('should show an error when the identifier is missing', () => {
         cy.get('input[data-testid="password"]').type(gen.password())
 
         cy.get('div[data-testid="submit-form"]').click()
 
-        cy.get('*[data-testid="field/password_identifier"]').should(
+        cy.get('*[data-testid="field/identifier"]').should(
           'contain.text',
-          'Property password_identifier is missing.'
+          'Property identifier is missing.'
         )
 
         cy.get('*[data-testid="field/password"]').should(
@@ -30,7 +30,7 @@ context('Mobile Profile', () => {
 
       it('should show an error when the password is missing', () => {
         const email = gen.email()
-        cy.get('input[data-testid="password_identifier"]')
+        cy.get('input[data-testid="identifier"]')
           .type(email)
           .should('have.value', email)
 
@@ -43,7 +43,7 @@ context('Mobile Profile', () => {
       })
 
       it('should show fail to sign in', () => {
-        cy.get('input[data-testid="password_identifier"]').type(gen.email())
+        cy.get('input[data-testid="identifier"]').type(gen.email())
         cy.get('input[data-testid="password"]').type(gen.password())
         cy.get('*[data-testid="submit-form"]').click()
         cy.get('*[data-testid="form-messages"]').should(
diff --git a/test/e2e/cypress/integration/profiles/mobile/login/success.spec.ts b/test/e2e/cypress/integration/profiles/mobile/login/success.spec.ts
index fbc6a210d85a..37d4cd391b79 100644
--- a/test/e2e/cypress/integration/profiles/mobile/login/success.spec.ts
+++ b/test/e2e/cypress/integration/profiles/mobile/login/success.spec.ts
@@ -18,7 +18,7 @@ context('Mobile Profile', () => {
     })
 
     it('should sign up and be logged in', () => {
-      cy.get('input[data-testid="password_identifier"]').type(email)
+      cy.get('input[data-testid="identifier"]').type(email)
       cy.get('input[data-testid="password"]').type(password)
       cy.get('div[data-testid="submit-form"]').click()
 
diff --git a/test/e2e/cypress/integration/profiles/verification/login/errors.spec.ts b/test/e2e/cypress/integration/profiles/verification/login/errors.spec.ts
index bd54e8090bb0..0aa5a3820ae1 100644
--- a/test/e2e/cypress/integration/profiles/verification/login/errors.spec.ts
+++ b/test/e2e/cypress/integration/profiles/verification/login/errors.spec.ts
@@ -30,7 +30,7 @@ context('Account Verification Login Errors', () => {
         cy.registerApi(identity)
         cy.visit(login)
 
-        cy.get(appPrefix(app) + '[name="password_identifier"]').type(
+        cy.get(appPrefix(app) + '[name="identifier"]').type(
           identity.email
         )
         cy.get('[name="password"]').type(identity.password)
diff --git a/test/e2e/cypress/integration/profiles/verification/login/success.spec.ts b/test/e2e/cypress/integration/profiles/verification/login/success.spec.ts
index fd558d8c3510..b6365cb9cca8 100644
--- a/test/e2e/cypress/integration/profiles/verification/login/success.spec.ts
+++ b/test/e2e/cypress/integration/profiles/verification/login/success.spec.ts
@@ -32,7 +32,7 @@ context('Account Verification Login Success', () => {
 
         cy.visit(login)
 
-        cy.get(appPrefix(app) + 'input[name="password_identifier"]').type(
+        cy.get(appPrefix(app) + 'input[name="identifier"]').type(
           identity.email
         )
         cy.get('input[name="password"]').type(identity.password)