diff --git a/packages/twenty-front/src/modules/companies/types/Company.ts b/packages/twenty-front/src/modules/companies/types/Company.ts
index 1ea1df3f98..b2ede19450 100644
--- a/packages/twenty-front/src/modules/companies/types/Company.ts
+++ b/packages/twenty-front/src/modules/companies/types/Company.ts
@@ -15,8 +15,8 @@ export type Company = {
       };
   address: {
     __typename?: 'Address';
-    addressLine1: string;
-    addressLine2: string;
+    addressStreet1: string;
+    addressStreet2: string;
     addressCity: string;
     addressState: string;
     addressPostcode: string;
diff --git a/packages/twenty-front/src/testing/mock-data/companies.ts b/packages/twenty-front/src/testing/mock-data/companies.ts
index 5b71b6778c..fe9c50f21a 100644
--- a/packages/twenty-front/src/testing/mock-data/companies.ts
+++ b/packages/twenty-front/src/testing/mock-data/companies.ts
@@ -25,6 +25,7 @@ export const companiesQueryResult = {
           employees: 100,
           createdAt: '2025-01-05T09:00:20.412Z',
           updatedAt: '2025-01-05T10:15:30.412Z',
+          deletedAt: null,
           name: 'Linkedin',
           accountOwnerId: null,
           accountOwner: null,
@@ -36,8 +37,8 @@ export const companiesQueryResult = {
           },
           address: {
             __typename: 'Address',
-            addressLine1: '',
-            addressLine2: '',
+            addressStreet1: '',
+            addressStreet2: '',
             addressCity: '',
             addressState: '',
             addressCountry: '',
@@ -139,6 +140,7 @@ export const companiesQueryResult = {
           employees: null,
           createdAt: '2025-01-06T08:30:15.412Z',
           updatedAt: '2025-01-06T14:45:22.412Z',
+          deletedAt: null,
           name: 'Facebook',
           idealCustomerProfile: false,
           accountOwner: null,
@@ -150,6 +152,7 @@ export const companiesQueryResult = {
             secondaryLinks: [],
           },
           address: {
+            __typename: 'Address',
             addressStreet1: '',
             addressStreet2: '',
             addressCity: '',
@@ -189,6 +192,7 @@ export const companiesQueryResult = {
           employees: null,
           createdAt: '2025-01-07T10:15:30.412Z',
           updatedAt: '2025-01-07T16:20:45.412Z',
+          deletedAt: null,
           name: 'Anthropic',
           idealCustomerProfile: false,
           accountOwner: null,
@@ -200,6 +204,7 @@ export const companiesQueryResult = {
             secondaryLinks: [],
           },
           address: {
+            __typename: 'Address',
             addressStreet1: '',
             addressStreet2: '',
             addressCity: '',
@@ -239,6 +244,7 @@ export const companiesQueryResult = {
           employees: null,
           createdAt: '2025-01-08T11:45:10.412Z',
           updatedAt: '2025-01-08T17:30:25.412Z',
+          deletedAt: null,
           name: 'Microsoft',
           idealCustomerProfile: true,
           accountOwner: null,
@@ -250,6 +256,7 @@ export const companiesQueryResult = {
             secondaryLinks: [],
           },
           address: {
+            __typename: 'Address',
             addressStreet1: '',
             addressStreet2: '',
             addressCity: '',
@@ -289,6 +296,7 @@ export const companiesQueryResult = {
           employees: null,
           createdAt: '2025-01-09T09:20:45.412Z',
           updatedAt: '2025-01-09T15:10:30.412Z',
+          deletedAt: null,
           name: 'Airbnb',
           idealCustomerProfile: true,
           accountOwner: null,
@@ -300,6 +308,7 @@ export const companiesQueryResult = {
             secondaryLinks: [],
           },
           address: {
+            __typename: 'Address',
             addressStreet1: '',
             addressStreet2: '',
             addressCity: '',
@@ -339,6 +348,7 @@ export const companiesQueryResult = {
           employees: null,
           createdAt: '2025-01-10T13:30:20.412Z',
           updatedAt: '2025-01-10T18:45:35.412Z',
+          deletedAt: null,
           name: 'Google',
           idealCustomerProfile: false,
           accountOwner: null,
@@ -350,6 +360,7 @@ export const companiesQueryResult = {
             secondaryLinks: [],
           },
           address: {
+            __typename: 'Address',
             addressStreet1: '',
             addressStreet2: '',
             addressCity: '',
@@ -389,6 +400,7 @@ export const companiesQueryResult = {
           employees: null,
           createdAt: '2025-01-11T07:15:50.412Z',
           updatedAt: '2025-01-11T12:25:15.412Z',
+          deletedAt: null,
           name: 'Netflix',
           idealCustomerProfile: true,
           accountOwner: null,
@@ -400,6 +412,7 @@ export const companiesQueryResult = {
             secondaryLinks: [],
           },
           address: {
+            __typename: 'Address',
             addressStreet1: '',
             addressStreet2: '',
             addressCity: '',
@@ -439,6 +452,7 @@ export const companiesQueryResult = {
           employees: null,
           createdAt: '2025-01-12T14:40:25.412Z',
           updatedAt: '2025-01-12T19:55:40.412Z',
+          deletedAt: null,
           name: 'Libeo',
           idealCustomerProfile: false,
           accountOwner: null,
@@ -450,6 +464,7 @@ export const companiesQueryResult = {
             secondaryLinks: [],
           },
           address: {
+            __typename: 'Address',
             addressStreet1: '',
             addressStreet2: '',
             addressCity: '',
@@ -489,6 +504,7 @@ export const companiesQueryResult = {
           employees: null,
           createdAt: '2025-01-13T08:25:35.412Z',
           updatedAt: '2025-01-13T13:40:50.412Z',
+          deletedAt: null,
           name: 'Claap',
           idealCustomerProfile: false,
           accountOwner: null,
@@ -500,6 +516,7 @@ export const companiesQueryResult = {
             secondaryLinks: [],
           },
           address: {
+            __typename: 'Address',
             addressStreet1: '',
             addressStreet2: '',
             addressCity: '',
@@ -539,6 +556,7 @@ export const companiesQueryResult = {
           employees: null,
           createdAt: '2025-01-14T16:10:15.412Z',
           updatedAt: '2025-01-14T21:30:25.412Z',
+          deletedAt: null,
           name: 'Hasura',
           idealCustomerProfile: false,
           accountOwner: null,
@@ -550,6 +568,7 @@ export const companiesQueryResult = {
             secondaryLinks: [],
           },
           address: {
+            __typename: 'Address',
             addressStreet1: '',
             addressStreet2: '',
             addressCity: '',
@@ -589,6 +608,7 @@ export const companiesQueryResult = {
           employees: null,
           createdAt: '2025-01-15T12:50:40.412Z',
           updatedAt: '2025-01-15T17:15:55.412Z',
+          deletedAt: null,
           name: 'Wework',
           idealCustomerProfile: false,
           accountOwner: null,
@@ -600,6 +620,7 @@ export const companiesQueryResult = {
             secondaryLinks: [],
           },
           address: {
+            __typename: 'Address',
             addressStreet1: '',
             addressStreet2: '',
             addressCity: '',
@@ -639,6 +660,7 @@ export const companiesQueryResult = {
           employees: null,
           createdAt: '2025-01-16T10:35:20.412Z',
           updatedAt: '2025-01-16T15:50:35.412Z',
+          deletedAt: null,
           name: 'Samsung',
           idealCustomerProfile: false,
           accountOwner: null,
@@ -650,6 +672,7 @@ export const companiesQueryResult = {
             secondaryLinks: [],
           },
           address: {
+            __typename: 'Address',
             addressStreet1: '',
             addressStreet2: '',
             addressCity: '',
@@ -689,6 +712,7 @@ export const companiesQueryResult = {
           employees: null,
           createdAt: '2025-01-17T11:20:10.412Z',
           updatedAt: '2025-01-17T16:45:25.412Z',
+          deletedAt: null,
           name: 'Algolia',
           idealCustomerProfile: false,
           accountOwner: null,
@@ -700,6 +724,7 @@ export const companiesQueryResult = {
             secondaryLinks: [],
           },
           address: {
+            __typename: 'Address',
             addressStreet1: '',
             addressStreet2: '',
             addressCity: '',