From e09fcf9039e37994d620fa1ef76b274a2a2fee8f Mon Sep 17 00:00:00 2001
From: Christopher Ng <chrng8@gmail.com>
Date: Tue, 21 Sep 2021 16:46:33 +0000
Subject: [PATCH] [WHIP] - Design updates - Naming updates

Signed-off-by: Christopher Ng <chrng8@gmail.com>
---
 .../lib/Controller/UsersController.php        | 24 ++++----
 .../tests/Controller/UsersControllerTest.php  | 36 ++++++------
 .../lib/Settings/Personal/PersonalInfo.php    | 40 +++++++-------
 .../Organisation.vue}                         | 46 ++++++++--------
 .../OrganisationSection.vue}                  | 22 ++++----
 .../ProfileSection/ProfilePreviewCard.vue     |  4 +-
 .../ProfileSection/ProfileSection.vue         | 15 +++--
 .../Company.vue => RoleSection/Role.vue}      | 46 ++++++++--------
 .../RoleSection.vue}                          | 22 ++++----
 .../PersonalInfo/shared/HeaderBar.vue         |  2 +-
 .../src/constants/AccountPropertyConstants.js | 34 ++++++------
 apps/settings/src/main-personal-info.js       | 12 ++--
 .../settings/personal/personal.info.php       |  4 +-
 core/Controller/ProfileController.php         |  8 +--
 .../Profile/PrimaryActionButton.vue           |  1 +
 core/src/views/Profile.vue                    | 55 ++++++++++++-------
 lib/private/Accounts/AccountManager.php       | 17 ++++--
 lib/private/Profile/Actions/TwitterAction.php |  4 +-
 lib/public/Accounts/IAccountManager.php       |  5 +-
 19 files changed, 209 insertions(+), 188 deletions(-)
 rename apps/settings/src/components/PersonalInfo/{JobTitleSection/JobTitle.vue => OrganisationSection/Organisation.vue} (77%)
 rename apps/settings/src/components/PersonalInfo/{JobTitleSection/JobTitleSection.vue => OrganisationSection/OrganisationSection.vue} (74%)
 rename apps/settings/src/components/PersonalInfo/{CompanySection/Company.vue => RoleSection/Role.vue} (80%)
 rename apps/settings/src/components/PersonalInfo/{CompanySection/CompanySection.vue => RoleSection/RoleSection.vue} (77%)

diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php
index 9dd235feb732d..b85b85596aa39 100644
--- a/apps/provisioning_api/lib/Controller/UsersController.php
+++ b/apps/provisioning_api/lib/Controller/UsersController.php
@@ -611,8 +611,8 @@ public function getEditableFieldsForUser(string $userId): DataResponse {
 		$permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
 		$permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
 		$permittedFields[] = IAccountManager::PROPERTY_TWITTER;
-		$permittedFields[] = IAccountManager::PROPERTY_COMPANY;
-		$permittedFields[] = IAccountManager::PROPERTY_JOB_TITLE;
+		$permittedFields[] = IAccountManager::PROPERTY_ORGANISATION;
+		$permittedFields[] = IAccountManager::PROPERTY_ROLE;
 		$permittedFields[] = IAccountManager::PROPERTY_HEADLINE;
 		$permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY;
 		$permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED;
@@ -772,8 +772,8 @@ public function editUser(string $userId, string $key, string|bool $value): DataR
 			$permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
 			$permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
 			$permittedFields[] = IAccountManager::PROPERTY_TWITTER;
-			$permittedFields[] = IAccountManager::PROPERTY_COMPANY;
-			$permittedFields[] = IAccountManager::PROPERTY_JOB_TITLE;
+			$permittedFields[] = IAccountManager::PROPERTY_ORGANISATION;
+			$permittedFields[] = IAccountManager::PROPERTY_ROLE;
 			$permittedFields[] = IAccountManager::PROPERTY_HEADLINE;
 			$permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY;
 			$permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED;
@@ -781,8 +781,8 @@ public function editUser(string $userId, string $key, string|bool $value): DataR
 			$permittedFields[] = IAccountManager::PROPERTY_ADDRESS . self::SCOPE_SUFFIX;
 			$permittedFields[] = IAccountManager::PROPERTY_WEBSITE . self::SCOPE_SUFFIX;
 			$permittedFields[] = IAccountManager::PROPERTY_TWITTER . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_COMPANY . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_JOB_TITLE . self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_ORGANISATION . self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_ROLE . self::SCOPE_SUFFIX;
 			$permittedFields[] = IAccountManager::PROPERTY_HEADLINE . self::SCOPE_SUFFIX;
 			$permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY . self::SCOPE_SUFFIX;
 
@@ -816,8 +816,8 @@ public function editUser(string $userId, string $key, string|bool $value): DataR
 				$permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
 				$permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
 				$permittedFields[] = IAccountManager::PROPERTY_TWITTER;
-				$permittedFields[] = IAccountManager::PROPERTY_COMPANY;
-				$permittedFields[] = IAccountManager::PROPERTY_JOB_TITLE;
+				$permittedFields[] = IAccountManager::PROPERTY_ORGANISATION;
+				$permittedFields[] = IAccountManager::PROPERTY_ROLE;
 				$permittedFields[] = IAccountManager::PROPERTY_HEADLINE;
 				$permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY;
 				$permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED;
@@ -937,8 +937,8 @@ public function editUser(string $userId, string $key, string|bool $value): DataR
 			case IAccountManager::PROPERTY_ADDRESS:
 			case IAccountManager::PROPERTY_WEBSITE:
 			case IAccountManager::PROPERTY_TWITTER:
-			case IAccountManager::PROPERTY_COMPANY:
-			case IAccountManager::PROPERTY_JOB_TITLE:
+			case IAccountManager::PROPERTY_ORGANISATION:
+			case IAccountManager::PROPERTY_ROLE:
 			case IAccountManager::PROPERTY_HEADLINE:
 			case IAccountManager::PROPERTY_BIOGRAPHY:
 				$userAccount = $this->accountManager->getAccount($targetUser);
@@ -982,8 +982,8 @@ public function editUser(string $userId, string $key, string|bool $value): DataR
 			case IAccountManager::PROPERTY_ADDRESS . self::SCOPE_SUFFIX:
 			case IAccountManager::PROPERTY_WEBSITE . self::SCOPE_SUFFIX:
 			case IAccountManager::PROPERTY_TWITTER . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_COMPANY . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_JOB_TITLE . self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_ORGANISATION . self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_ROLE . self::SCOPE_SUFFIX:
 			case IAccountManager::PROPERTY_HEADLINE . self::SCOPE_SUFFIX:
 			case IAccountManager::PROPERTY_BIOGRAPHY . self::SCOPE_SUFFIX:
 			case IAccountManager::PROPERTY_AVATAR . self::SCOPE_SUFFIX:
diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php
index 27bc708c5b1fe..ed68c08b47f82 100644
--- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php
+++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php
@@ -1002,8 +1002,8 @@ public function testGetUserDataAsAdmin() {
 			IAccountManager::PROPERTY_PHONE => ['value' => 'phone'],
 			IAccountManager::PROPERTY_TWITTER => ['value' => 'twitter'],
 			IAccountManager::PROPERTY_WEBSITE => ['value' => 'website'],
-			IAccountManager::PROPERTY_COMPANY => ['value' => 'company'],
-			IAccountManager::PROPERTY_JOB_TITLE => ['value' => 'job_title'],
+			IAccountManager::PROPERTY_ORGANISATION => ['value' => 'organisation'],
+			IAccountManager::PROPERTY_ROLE => ['value' => 'role'],
 			IAccountManager::PROPERTY_HEADLINE => ['value' => 'headline'],
 			IAccountManager::PROPERTY_BIOGRAPHY => ['value' => 'biography'],
 		]);
@@ -1075,8 +1075,8 @@ public function testGetUserDataAsAdmin() {
 				'setPassword' => true,
 			],
 			'additional_mail' => [],
-			'company' => 'company',
-			'job_title' => 'job_title',
+			'organisation' => 'organisation',
+			'role' => 'role',
 			'headline' => 'headline',
 			'biography' => 'biography',
 			'profile_enabled' => '1',
@@ -1179,8 +1179,8 @@ public function testGetUserDataAsSubAdminAndUserIsAccessible() {
 			IAccountManager::PROPERTY_PHONE => ['value' => 'phone'],
 			IAccountManager::PROPERTY_TWITTER => ['value' => 'twitter'],
 			IAccountManager::PROPERTY_WEBSITE => ['value' => 'website'],
-			IAccountManager::PROPERTY_COMPANY => ['value' => 'company'],
-			IAccountManager::PROPERTY_JOB_TITLE => ['value' => 'job_title'],
+			IAccountManager::PROPERTY_ORGANISATION => ['value' => 'organisation'],
+			IAccountManager::PROPERTY_ROLE => ['value' => 'role'],
 			IAccountManager::PROPERTY_HEADLINE => ['value' => 'headline'],
 			IAccountManager::PROPERTY_BIOGRAPHY => ['value' => 'biography'],
 		]);
@@ -1213,8 +1213,8 @@ public function testGetUserDataAsSubAdminAndUserIsAccessible() {
 				'setPassword' => true,
 			],
 			'additional_mail' => [],
-			'company' => 'company',
-			'job_title' => 'job_title',
+			'organisation' => 'organisation',
+			'role' => 'role',
 			'headline' => 'headline',
 			'biography' => 'biography',
 			'profile_enabled' => '1',
@@ -1356,8 +1356,8 @@ public function testGetUserDataAsSubAdminSelfLookup() {
 			IAccountManager::PROPERTY_PHONE => ['value' => 'phone'],
 			IAccountManager::PROPERTY_TWITTER => ['value' => 'twitter'],
 			IAccountManager::PROPERTY_WEBSITE => ['value' => 'website'],
-			IAccountManager::PROPERTY_COMPANY => ['value' => 'company'],
-			IAccountManager::PROPERTY_JOB_TITLE => ['value' => 'job_title'],
+			IAccountManager::PROPERTY_ORGANISATION => ['value' => 'organisation'],
+			IAccountManager::PROPERTY_ROLE => ['value' => 'role'],
 			IAccountManager::PROPERTY_HEADLINE => ['value' => 'headline'],
 			IAccountManager::PROPERTY_BIOGRAPHY => ['value' => 'biography'],
 		]);
@@ -1389,8 +1389,8 @@ public function testGetUserDataAsSubAdminSelfLookup() {
 				'setPassword' => false,
 			],
 			'additional_mail' => [],
-			'company' => 'company',
-			'job_title' => 'job_title',
+			'organisation' => 'organisation',
+			'role' => 'role',
 			'headline' => 'headline',
 			'biography' => 'biography',
 			'profile_enabled' => '1',
@@ -3909,8 +3909,8 @@ public function dataGetEditableFields() {
 				IAccountManager::PROPERTY_ADDRESS,
 				IAccountManager::PROPERTY_WEBSITE,
 				IAccountManager::PROPERTY_TWITTER,
-				IAccountManager::PROPERTY_COMPANY,
-				IAccountManager::PROPERTY_JOB_TITLE,
+				IAccountManager::PROPERTY_ORGANISATION,
+				IAccountManager::PROPERTY_ROLE,
 				IAccountManager::PROPERTY_HEADLINE,
 				IAccountManager::PROPERTY_BIOGRAPHY,
 				IAccountManager::PROPERTY_PROFILE_ENABLED,
@@ -3923,8 +3923,8 @@ public function dataGetEditableFields() {
 				IAccountManager::PROPERTY_ADDRESS,
 				IAccountManager::PROPERTY_WEBSITE,
 				IAccountManager::PROPERTY_TWITTER,
-				IAccountManager::PROPERTY_COMPANY,
-				IAccountManager::PROPERTY_JOB_TITLE,
+				IAccountManager::PROPERTY_ORGANISATION,
+				IAccountManager::PROPERTY_ROLE,
 				IAccountManager::PROPERTY_HEADLINE,
 				IAccountManager::PROPERTY_BIOGRAPHY,
 				IAccountManager::PROPERTY_PROFILE_ENABLED,
@@ -3936,8 +3936,8 @@ public function dataGetEditableFields() {
 				IAccountManager::PROPERTY_ADDRESS,
 				IAccountManager::PROPERTY_WEBSITE,
 				IAccountManager::PROPERTY_TWITTER,
-				IAccountManager::PROPERTY_COMPANY,
-				IAccountManager::PROPERTY_JOB_TITLE,
+				IAccountManager::PROPERTY_ORGANISATION,
+				IAccountManager::PROPERTY_ROLE,
 				IAccountManager::PROPERTY_HEADLINE,
 				IAccountManager::PROPERTY_BIOGRAPHY,
 				IAccountManager::PROPERTY_PROFILE_ENABLED,
diff --git a/apps/settings/lib/Settings/Personal/PersonalInfo.php b/apps/settings/lib/Settings/Personal/PersonalInfo.php
index a406678c04988..def2f414ebc97 100644
--- a/apps/settings/lib/Settings/Personal/PersonalInfo.php
+++ b/apps/settings/lib/Settings/Personal/PersonalInfo.php
@@ -160,8 +160,8 @@ public function getForm(): TemplateResponse {
 			'emailMap' => $this->getEmailMap($account),
 			'languageMap' => $this->getLanguageMap($user),
 			'profileEnabled' => $this->isProfileEnabled($account),
-			'companyMap' => $this->getCompanyMap($account),
-			'jobTitleMap' => $this->getJobTitleMap($account),
+			'organisationMap' => $this->getOrganisationMap($account),
+			'roleMap' => $this->getRoleMap($account),
 			'headlineMap' => $this->getHeadlineMap($account),
 			'biographyMap' => $this->getBiographyMap($account),
 		];
@@ -196,21 +196,21 @@ private function getBiographyMap(IAccount $account): array {
 	}
 
 	/**
-	 * returns the primary company in an
+	 * returns the primary organisation in an
 	 * associative array
 	 */
-	private function getCompanyMap(IAccount $account): array {
-		$primaryCompany = [
-			'value' => $account->getProperty(IAccountManager::PROPERTY_COMPANY)->getValue(),
-			'scope' => $account->getProperty(IAccountManager::PROPERTY_COMPANY)->getScope(),
-			'verified' => $account->getProperty(IAccountManager::PROPERTY_COMPANY)->getVerified(),
+	private function getOrganisationMap(IAccount $account): array {
+		$primaryOrganisation = [
+			'value' => $account->getProperty(IAccountManager::PROPERTY_ORGANISATION)->getValue(),
+			'scope' => $account->getProperty(IAccountManager::PROPERTY_ORGANISATION)->getScope(),
+			'verified' => $account->getProperty(IAccountManager::PROPERTY_ORGANISATION)->getVerified(),
 		];
 
-		$companyMap = [
-			'primaryCompany' => $primaryCompany,
+		$organisationMap = [
+			'primaryOrganisation' => $primaryOrganisation,
 		];
 
-		return $companyMap;
+		return $organisationMap;
 	}
 
 	/**
@@ -232,21 +232,21 @@ private function getHeadlineMap(IAccount $account): array {
 	}
 
 	/**
-	 * returns the primary job title in an
+	 * returns the primary role in an
 	 * associative array
 	 */
-	private function getJobTitleMap(IAccount $account): array {
-		$primaryJobTitle = [
-			'value' => $account->getProperty(IAccountManager::PROPERTY_JOB_TITLE)->getValue(),
-			'scope' => $account->getProperty(IAccountManager::PROPERTY_JOB_TITLE)->getScope(),
-			'verified' => $account->getProperty(IAccountManager::PROPERTY_JOB_TITLE)->getVerified(),
+	private function getRoleMap(IAccount $account): array {
+		$primaryRole = [
+			'value' => $account->getProperty(IAccountManager::PROPERTY_ROLE)->getValue(),
+			'scope' => $account->getProperty(IAccountManager::PROPERTY_ROLE)->getScope(),
+			'verified' => $account->getProperty(IAccountManager::PROPERTY_ROLE)->getVerified(),
 		];
 
-		$jobTitleMap = [
-			'primaryJobTitle' => $primaryJobTitle,
+		$roleMap = [
+			'primaryRole' => $primaryRole,
 		];
 
-		return $jobTitleMap;
+		return $roleMap;
 	}
 
 	/**
diff --git a/apps/settings/src/components/PersonalInfo/JobTitleSection/JobTitle.vue b/apps/settings/src/components/PersonalInfo/OrganisationSection/Organisation.vue
similarity index 77%
rename from apps/settings/src/components/PersonalInfo/JobTitleSection/JobTitle.vue
rename to apps/settings/src/components/PersonalInfo/OrganisationSection/Organisation.vue
index 687642a46b993..98e1143dbbbdf 100644
--- a/apps/settings/src/components/PersonalInfo/JobTitleSection/JobTitle.vue
+++ b/apps/settings/src/components/PersonalInfo/OrganisationSection/Organisation.vue
@@ -21,18 +21,18 @@
 -->
 
 <template>
-	<div class="jobtitle">
+	<div class="organisation">
 		<input
-			id="jobtitle"
+			id="organisation"
 			type="text"
-			:placeholder="t('settings', 'Your job title')"
-			:value="jobTitle"
+			:placeholder="t('settings', 'Your organisation')"
+			:value="organisation"
 			autocapitalize="none"
 			autocomplete="on"
 			autocorrect="off"
-			@input="onJobTitleChange">
+			@input="onOrganisationChange">
 
-		<div class="jobtitle__actions-container">
+		<div class="organisation__actions-container">
 			<transition name="fade">
 				<span v-if="showCheckmarkIcon" class="icon-checkmark" />
 				<span v-else-if="showErrorIcon" class="icon-error" />
@@ -50,10 +50,10 @@ import { ACCOUNT_PROPERTY_ENUM } from '../../../constants/AccountPropertyConstan
 import { savePrimaryAccountProperty } from '../../../service/PersonalInfo/PersonalInfoService'
 
 export default {
-	name: 'JobTitle',
+	name: 'Organisation',
 
 	props: {
-		jobTitle: {
+		organisation: {
 			type: String,
 			required: true,
 		},
@@ -65,7 +65,7 @@ export default {
 
 	data() {
 		return {
-			initialJobTitle: this.jobTitle,
+			initialOrganisation: this.organisation,
 			localScope: this.scope,
 			showCheckmarkIcon: false,
 			showErrorIcon: false,
@@ -73,35 +73,35 @@ export default {
 	},
 
 	methods: {
-		onJobTitleChange(e) {
-			this.$emit('update:job-title', e.target.value)
-			this.debounceJobTitleChange(e.target.value.trim())
+		onOrganisationChange(e) {
+			this.$emit('update:organisation', e.target.value)
+			this.debounceOrganisationChange(e.target.value.trim())
 		},
 
-		debounceJobTitleChange: debounce(async function(jobTitle) {
-			await this.updatePrimaryJobTitle(jobTitle)
+		debounceOrganisationChange: debounce(async function(organisation) {
+			await this.updatePrimaryOrganisation(organisation)
 		}, 500),
 
-		async updatePrimaryJobTitle(jobTitle) {
+		async updatePrimaryOrganisation(organisation) {
 			try {
-				const responseData = await savePrimaryAccountProperty(ACCOUNT_PROPERTY_ENUM.JOB_TITLE, jobTitle)
+				const responseData = await savePrimaryAccountProperty(ACCOUNT_PROPERTY_ENUM.ORGANISATION, organisation)
 				this.handleResponse({
-					jobTitle,
+					organisation,
 					status: responseData.ocs?.meta?.status,
 				})
 			} catch (e) {
 				this.handleResponse({
-					errorMessage: t('settings', 'Unable to update job title'),
+					errorMessage: t('settings', 'Unable to update organisation'),
 					error: e,
 				})
 			}
 		},
 
-		handleResponse({ jobTitle, status, errorMessage, error }) {
+		handleResponse({ organisation, status, errorMessage, error }) {
 			if (status === 'ok') {
 				// Ensure that local state reflects server state
-				this.initialJobTitle = jobTitle
-				emit('settings:job-title:updated', jobTitle)
+				this.initialOrganisation = organisation
+				emit('settings:organisation:updated', organisation)
 				this.showCheckmarkIcon = true
 				setTimeout(() => { this.showCheckmarkIcon = false }, 2000)
 			} else {
@@ -120,7 +120,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.jobtitle {
+.organisation {
 	display: grid;
 	align-items: center;
 
@@ -138,7 +138,7 @@ export default {
 		cursor: text;
 	}
 
-	.jobtitle__actions-container {
+	.organisation__actions-container {
 		grid-area: 1 / 1;
 		justify-self: flex-end;
 		height: 30px;
diff --git a/apps/settings/src/components/PersonalInfo/JobTitleSection/JobTitleSection.vue b/apps/settings/src/components/PersonalInfo/OrganisationSection/OrganisationSection.vue
similarity index 74%
rename from apps/settings/src/components/PersonalInfo/JobTitleSection/JobTitleSection.vue
rename to apps/settings/src/components/PersonalInfo/OrganisationSection/OrganisationSection.vue
index 962c91af1340a..420f79fc8d03b 100644
--- a/apps/settings/src/components/PersonalInfo/JobTitleSection/JobTitleSection.vue
+++ b/apps/settings/src/components/PersonalInfo/OrganisationSection/OrganisationSection.vue
@@ -24,37 +24,37 @@
 	<section>
 		<HeaderBar
 			:account-property="accountProperty"
-			label-for="jobtitle"
-			:scope.sync="primaryJobTitle.scope" />
+			label-for="organisation"
+			:scope.sync="primaryOrganisation.scope" />
 
-		<JobTitle
-			:job-title.sync="primaryJobTitle.value"
-			:scope.sync="primaryJobTitle.scope" />
+		<Organisation
+			:organisation.sync="primaryOrganisation.value"
+			:scope.sync="primaryOrganisation.scope" />
 	</section>
 </template>
 
 <script>
 import { loadState } from '@nextcloud/initial-state'
 
-import JobTitle from './JobTitle'
+import Organisation from './Organisation'
 import HeaderBar from '../shared/HeaderBar'
 
 import { ACCOUNT_PROPERTY_READABLE_ENUM } from '../../../constants/AccountPropertyConstants'
 
-const { jobTitleMap: { primaryJobTitle } } = loadState('settings', 'personalInfoParameters', {})
+const { organisationMap: { primaryOrganisation } } = loadState('settings', 'personalInfoParameters', {})
 
 export default {
-	name: 'JobTitleSection',
+	name: 'OrganisationSection',
 
 	components: {
-		JobTitle,
+		Organisation,
 		HeaderBar,
 	},
 
 	data() {
 		return {
-			accountProperty: ACCOUNT_PROPERTY_READABLE_ENUM.JOB_TITLE,
-			primaryJobTitle,
+			accountProperty: ACCOUNT_PROPERTY_READABLE_ENUM.ORGANISATION,
+			primaryOrganisation,
 		}
 	},
 }
diff --git a/apps/settings/src/components/PersonalInfo/ProfileSection/ProfilePreviewCard.vue b/apps/settings/src/components/PersonalInfo/ProfileSection/ProfilePreviewCard.vue
index 1768e8ea91dbb..672cb99f71f88 100644
--- a/apps/settings/src/components/PersonalInfo/ProfileSection/ProfilePreviewCard.vue
+++ b/apps/settings/src/components/PersonalInfo/ProfileSection/ProfilePreviewCard.vue
@@ -38,7 +38,7 @@
 			<span>{{ displayName }}</span>
 		</div>
 		<div class="preview-card__footer">
-			<span>{{ company }}</span>
+			<span>{{ organisation }}</span>
 		</div>
 	</a>
 </template>
@@ -57,7 +57,7 @@ export default {
 	},
 
 	props: {
-		company: {
+		organisation: {
 			type: String,
 			required: true,
 		},
diff --git a/apps/settings/src/components/PersonalInfo/ProfileSection/ProfileSection.vue b/apps/settings/src/components/PersonalInfo/ProfileSection/ProfileSection.vue
index 6dd660b7ddfea..059233c939617 100644
--- a/apps/settings/src/components/PersonalInfo/ProfileSection/ProfileSection.vue
+++ b/apps/settings/src/components/PersonalInfo/ProfileSection/ProfileSection.vue
@@ -29,7 +29,7 @@
 			:profile-enabled.sync="profileEnabled" />
 
 		<ProfilePreviewCard
-			:company="company"
+			:organisation="organisation"
 			:display-name="displayName"
 			:profile-enabled="profileEnabled"
 			:user-id="userId" />
@@ -45,10 +45,9 @@ import ProfileCheckbox from './ProfileCheckbox'
 import ProfilePreviewCard from './ProfilePreviewCard'
 
 import { ACCOUNT_PROPERTY_READABLE_ENUM } from '../../../constants/AccountPropertyConstants'
-import { validateEnableProfile } from '../../../utils/validate'
 
 const {
-	companyMap: { primaryCompany: { value: company } },
+	organisationMap: { primaryOrganisation: { value: organisation } },
 	displayNameMap: { primaryDisplayName: { value: displayName } },
 	profileEnabled,
 	userId,
@@ -66,7 +65,7 @@ export default {
 	data() {
 		return {
 			accountProperty: ACCOUNT_PROPERTY_READABLE_ENUM.PROFILE_ENABLED,
-			company,
+			organisation,
 			displayName,
 			profileEnabled,
 			userId,
@@ -75,12 +74,12 @@ export default {
 
 	mounted() {
 		subscribe('settings:display-name:updated', this.handleDisplayNameUpdate)
-		subscribe('settings:company:updated', this.handleCompanyUpdate)
+		subscribe('settings:organisation:updated', this.handleOrganisationUpdate)
 	},
 
 	beforeDestroy() {
 		unsubscribe('settings:display-name:updated', this.handleDisplayNameUpdate)
-		unsubscribe('settings:company:updated', this.handleCompanyUpdate)
+		unsubscribe('settings:organisation:updated', this.handleOrganisationUpdate)
 	},
 
 	methods: {
@@ -88,8 +87,8 @@ export default {
 			this.displayName = displayName
 		},
 
-		handleCompanyUpdate(company) {
-			this.company = company
+		handleOrganisationUpdate(organisation) {
+			this.organisation = organisation
 		},
 	},
 }
diff --git a/apps/settings/src/components/PersonalInfo/CompanySection/Company.vue b/apps/settings/src/components/PersonalInfo/RoleSection/Role.vue
similarity index 80%
rename from apps/settings/src/components/PersonalInfo/CompanySection/Company.vue
rename to apps/settings/src/components/PersonalInfo/RoleSection/Role.vue
index 4d76c9090d297..c0e990388565b 100644
--- a/apps/settings/src/components/PersonalInfo/CompanySection/Company.vue
+++ b/apps/settings/src/components/PersonalInfo/RoleSection/Role.vue
@@ -21,18 +21,18 @@
 -->
 
 <template>
-	<div class="company">
+	<div class="role">
 		<input
-			id="company"
+			id="role"
 			type="text"
-			:placeholder="t('settings', 'Your company')"
-			:value="company"
+			:placeholder="t('settings', 'Your role')"
+			:value="role"
 			autocapitalize="none"
 			autocomplete="on"
 			autocorrect="off"
-			@input="onCompanyChange">
+			@input="onRoleChange">
 
-		<div class="company__actions-container">
+		<div class="role__actions-container">
 			<transition name="fade">
 				<span v-if="showCheckmarkIcon" class="icon-checkmark" />
 				<span v-else-if="showErrorIcon" class="icon-error" />
@@ -50,10 +50,10 @@ import { ACCOUNT_PROPERTY_ENUM } from '../../../constants/AccountPropertyConstan
 import { savePrimaryAccountProperty } from '../../../service/PersonalInfo/PersonalInfoService'
 
 export default {
-	name: 'Company',
+	name: 'Role',
 
 	props: {
-		company: {
+		role: {
 			type: String,
 			required: true,
 		},
@@ -65,7 +65,7 @@ export default {
 
 	data() {
 		return {
-			initialCompany: this.company,
+			initialRole: this.role,
 			localScope: this.scope,
 			showCheckmarkIcon: false,
 			showErrorIcon: false,
@@ -73,35 +73,35 @@ export default {
 	},
 
 	methods: {
-		onCompanyChange(e) {
-			this.$emit('update:company', e.target.value)
-			this.debounceCompanyChange(e.target.value.trim())
+		onRoleChange(e) {
+			this.$emit('update:role', e.target.value)
+			this.debounceRoleChange(e.target.value.trim())
 		},
 
-		debounceCompanyChange: debounce(async function(company) {
-			await this.updatePrimaryCompany(company)
+		debounceRoleChange: debounce(async function(role) {
+			await this.updatePrimaryRole(role)
 		}, 500),
 
-		async updatePrimaryCompany(company) {
+		async updatePrimaryRole(role) {
 			try {
-				const responseData = await savePrimaryAccountProperty(ACCOUNT_PROPERTY_ENUM.COMPANY, company)
+				const responseData = await savePrimaryAccountProperty(ACCOUNT_PROPERTY_ENUM.ROLE, role)
 				this.handleResponse({
-					company,
+					role,
 					status: responseData.ocs?.meta?.status,
 				})
 			} catch (e) {
 				this.handleResponse({
-					errorMessage: t('settings', 'Unable to update company'),
+					errorMessage: t('settings', 'Unable to update role'),
 					error: e,
 				})
 			}
 		},
 
-		handleResponse({ company, status, errorMessage, error }) {
+		handleResponse({ role, status, errorMessage, error }) {
 			if (status === 'ok') {
 				// Ensure that local state reflects server state
-				this.initialCompany = company
-				emit('settings:company:updated', company)
+				this.initialRole = role
+				emit('settings:role:updated', role)
 				this.showCheckmarkIcon = true
 				setTimeout(() => { this.showCheckmarkIcon = false }, 2000)
 			} else {
@@ -120,7 +120,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.company {
+.role {
 	display: grid;
 	align-items: center;
 
@@ -138,7 +138,7 @@ export default {
 		cursor: text;
 	}
 
-	.company__actions-container {
+	.role__actions-container {
 		grid-area: 1 / 1;
 		justify-self: flex-end;
 		height: 30px;
diff --git a/apps/settings/src/components/PersonalInfo/CompanySection/CompanySection.vue b/apps/settings/src/components/PersonalInfo/RoleSection/RoleSection.vue
similarity index 77%
rename from apps/settings/src/components/PersonalInfo/CompanySection/CompanySection.vue
rename to apps/settings/src/components/PersonalInfo/RoleSection/RoleSection.vue
index 7f506c94c75d6..4bfaa6b0eb8c7 100644
--- a/apps/settings/src/components/PersonalInfo/CompanySection/CompanySection.vue
+++ b/apps/settings/src/components/PersonalInfo/RoleSection/RoleSection.vue
@@ -24,37 +24,37 @@
 	<section>
 		<HeaderBar
 			:account-property="accountProperty"
-			label-for="company"
-			:scope.sync="primaryCompany.scope" />
+			label-for="role"
+			:scope.sync="primaryRole.scope" />
 
-		<Company
-			:company.sync="primaryCompany.value"
-			:scope.sync="primaryCompany.scope" />
+		<Role
+			:role.sync="primaryRole.value"
+			:scope.sync="primaryRole.scope" />
 	</section>
 </template>
 
 <script>
 import { loadState } from '@nextcloud/initial-state'
 
-import Company from './Company'
+import Role from './Role'
 import HeaderBar from '../shared/HeaderBar'
 
 import { ACCOUNT_PROPERTY_READABLE_ENUM } from '../../../constants/AccountPropertyConstants'
 
-const { companyMap: { primaryCompany } } = loadState('settings', 'personalInfoParameters', {})
+const { roleMap: { primaryRole } } = loadState('settings', 'personalInfoParameters', {})
 
 export default {
-	name: 'CompanySection',
+	name: 'RoleSection',
 
 	components: {
-		Company,
+		Role,
 		HeaderBar,
 	},
 
 	data() {
 		return {
-			accountProperty: ACCOUNT_PROPERTY_READABLE_ENUM.COMPANY,
-			primaryCompany,
+			accountProperty: ACCOUNT_PROPERTY_READABLE_ENUM.ROLE,
+			primaryRole,
 		}
 	},
 }
diff --git a/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue b/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue
index fe4fd4e6d918f..b78afd7849b22 100644
--- a/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue
+++ b/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue
@@ -95,7 +95,7 @@ export default {
 
 	computed: {
 		isProfileProperty() {
-			return this.accountProperty === t('settings', 'Profile')
+			return this.accountProperty === ACCOUNT_PROPERTY_READABLE_ENUM.PROFILE_ENABLED
 		},
 
 		isSettingProperty() {
diff --git a/apps/settings/src/constants/AccountPropertyConstants.js b/apps/settings/src/constants/AccountPropertyConstants.js
index a37e138b6d359..1c83491501668 100644
--- a/apps/settings/src/constants/AccountPropertyConstants.js
+++ b/apps/settings/src/constants/AccountPropertyConstants.js
@@ -31,15 +31,15 @@ export const ACCOUNT_PROPERTY_ENUM = Object.freeze({
 	ADDRESS: 'address',
 	AVATAR: 'avatar',
 	BIOGRAPHY: 'biography',
-	COMPANY: 'company',
 	DISPLAYNAME: 'displayname',
-	HEADLINE: 'headline',
-	JOB_TITLE: 'job_title',
-	EMAIL: 'email',
 	EMAIL_COLLECTION: 'additional_mail',
+	EMAIL: 'email',
+	HEADLINE: 'headline',
 	NOTIFICATION_EMAIL: 'notify_email',
+	ORGANISATION: 'organisation',
 	PHONE: 'phone',
 	PROFILE_ENABLED: 'profile_enabled',
+	ROLE: 'role',
 	TWITTER: 'twitter',
 	WEBSITE: 'website',
 })
@@ -48,15 +48,15 @@ export const ACCOUNT_PROPERTY_ENUM = Object.freeze({
 export const ACCOUNT_PROPERTY_READABLE_ENUM = Object.freeze({
 	ADDRESS: t('settings', 'Address'),
 	AVATAR: t('settings', 'Avatar'),
-	BIOGRAPHY: t('settings', 'Biography'),
-	COMPANY: t('settings', 'Company'),
+	BIOGRAPHY: t('settings', 'About'),
 	DISPLAYNAME: t('settings', 'Full name'),
-	HEADLINE: t('settings', 'Headline'),
-	JOB_TITLE: t('settings', 'Job Title'),
-	EMAIL: t('settings', 'Email'),
 	EMAIL_COLLECTION: t('settings', 'Additional email'),
+	EMAIL: t('settings', 'Email'),
+	HEADLINE: t('settings', 'Headline'),
+	ORGANISATION: t('settings', 'Organisation'),
 	PHONE: t('settings', 'Phone number'),
 	PROFILE_ENABLED: t('settings', 'Profile'),
+	ROLE: t('settings', 'Role'),
 	TWITTER: t('settings', 'Twitter'),
 	WEBSITE: t('settings', 'Website'),
 })
@@ -66,14 +66,14 @@ export const PROPERTY_READABLE_KEYS_ENUM = Object.freeze({
 	[ACCOUNT_PROPERTY_READABLE_ENUM.ADDRESS]: ACCOUNT_PROPERTY_ENUM.ADDRESS,
 	[ACCOUNT_PROPERTY_READABLE_ENUM.AVATAR]: ACCOUNT_PROPERTY_ENUM.AVATAR,
 	[ACCOUNT_PROPERTY_READABLE_ENUM.BIOGRAPHY]: ACCOUNT_PROPERTY_ENUM.BIOGRAPHY,
-	[ACCOUNT_PROPERTY_READABLE_ENUM.COMPANY]: ACCOUNT_PROPERTY_ENUM.COMPANY,
 	[ACCOUNT_PROPERTY_READABLE_ENUM.DISPLAYNAME]: ACCOUNT_PROPERTY_ENUM.DISPLAYNAME,
-	[ACCOUNT_PROPERTY_READABLE_ENUM.HEADLINE]: ACCOUNT_PROPERTY_ENUM.HEADLINE,
-	[ACCOUNT_PROPERTY_READABLE_ENUM.JOB_TITLE]: ACCOUNT_PROPERTY_ENUM.JOB_TITLE,
-	[ACCOUNT_PROPERTY_READABLE_ENUM.EMAIL]: ACCOUNT_PROPERTY_ENUM.EMAIL,
 	[ACCOUNT_PROPERTY_READABLE_ENUM.EMAIL_COLLECTION]: ACCOUNT_PROPERTY_ENUM.EMAIL_COLLECTION,
+	[ACCOUNT_PROPERTY_READABLE_ENUM.EMAIL]: ACCOUNT_PROPERTY_ENUM.EMAIL,
+	[ACCOUNT_PROPERTY_READABLE_ENUM.HEADLINE]: ACCOUNT_PROPERTY_ENUM.HEADLINE,
+	[ACCOUNT_PROPERTY_READABLE_ENUM.ORGANISATION]: ACCOUNT_PROPERTY_ENUM.ORGANISATION,
 	[ACCOUNT_PROPERTY_READABLE_ENUM.PHONE]: ACCOUNT_PROPERTY_ENUM.PHONE,
 	[ACCOUNT_PROPERTY_READABLE_ENUM.PROFILE_ENABLED]: ACCOUNT_PROPERTY_ENUM.PROFILE_ENABLED,
+	[ACCOUNT_PROPERTY_READABLE_ENUM.ROLE]: ACCOUNT_PROPERTY_ENUM.ROLE,
 	[ACCOUNT_PROPERTY_READABLE_ENUM.TWITTER]: ACCOUNT_PROPERTY_ENUM.TWITTER,
 	[ACCOUNT_PROPERTY_READABLE_ENUM.WEBSITE]: ACCOUNT_PROPERTY_ENUM.WEBSITE,
 })
@@ -105,14 +105,14 @@ export const PROPERTY_READABLE_SUPPORTED_SCOPES_ENUM = Object.freeze({
 	[ACCOUNT_PROPERTY_READABLE_ENUM.ADDRESS]: [SCOPE_ENUM.LOCAL, SCOPE_ENUM.PRIVATE],
 	[ACCOUNT_PROPERTY_READABLE_ENUM.AVATAR]: [SCOPE_ENUM.LOCAL, SCOPE_ENUM.PRIVATE],
 	[ACCOUNT_PROPERTY_READABLE_ENUM.BIOGRAPHY]: [SCOPE_ENUM.LOCAL],
-	[ACCOUNT_PROPERTY_READABLE_ENUM.COMPANY]: [SCOPE_ENUM.LOCAL],
 	[ACCOUNT_PROPERTY_READABLE_ENUM.DISPLAYNAME]: [SCOPE_ENUM.LOCAL],
-	[ACCOUNT_PROPERTY_READABLE_ENUM.HEADLINE]: [SCOPE_ENUM.LOCAL],
-	[ACCOUNT_PROPERTY_READABLE_ENUM.JOB_TITLE]: [SCOPE_ENUM.LOCAL],
-	[ACCOUNT_PROPERTY_READABLE_ENUM.EMAIL]: [SCOPE_ENUM.LOCAL],
 	[ACCOUNT_PROPERTY_READABLE_ENUM.EMAIL_COLLECTION]: [SCOPE_ENUM.LOCAL],
+	[ACCOUNT_PROPERTY_READABLE_ENUM.EMAIL]: [SCOPE_ENUM.LOCAL],
+	[ACCOUNT_PROPERTY_READABLE_ENUM.HEADLINE]: [SCOPE_ENUM.LOCAL],
+	[ACCOUNT_PROPERTY_READABLE_ENUM.ORGANISATION]: [SCOPE_ENUM.LOCAL],
 	[ACCOUNT_PROPERTY_READABLE_ENUM.PHONE]: [SCOPE_ENUM.LOCAL, SCOPE_ENUM.PRIVATE],
 	[ACCOUNT_PROPERTY_READABLE_ENUM.PROFILE_ENABLED]: [SCOPE_ENUM.LOCAL],
+	[ACCOUNT_PROPERTY_READABLE_ENUM.ROLE]: [SCOPE_ENUM.LOCAL],
 	[ACCOUNT_PROPERTY_READABLE_ENUM.TWITTER]: [SCOPE_ENUM.LOCAL, SCOPE_ENUM.PRIVATE],
 	[ACCOUNT_PROPERTY_READABLE_ENUM.WEBSITE]: [SCOPE_ENUM.LOCAL, SCOPE_ENUM.PRIVATE],
 })
diff --git a/apps/settings/src/main-personal-info.js b/apps/settings/src/main-personal-info.js
index 00b93d127417c..c06fcacca9d8d 100644
--- a/apps/settings/src/main-personal-info.js
+++ b/apps/settings/src/main-personal-info.js
@@ -31,8 +31,8 @@ import DisplayNameSection from './components/PersonalInfo/DisplayNameSection/Dis
 import EmailSection from './components/PersonalInfo/EmailSection/EmailSection'
 import LanguageSection from './components/PersonalInfo/LanguageSection/LanguageSection'
 import ProfileSection from './components/PersonalInfo/ProfileSection/ProfileSection'
-import CompanySection from './components/PersonalInfo/CompanySection/CompanySection'
-import JobTitleSection from './components/PersonalInfo/JobTitleSection/JobTitleSection'
+import OrganisationSection from './components/PersonalInfo/OrganisationSection/OrganisationSection'
+import RoleSection from './components/PersonalInfo/RoleSection/RoleSection'
 import HeadlineSection from './components/PersonalInfo/HeadlineSection/HeadlineSection'
 import BiographySection from './components/PersonalInfo/BiographySection/BiographySection'
 
@@ -51,8 +51,8 @@ const DisplayNameView = Vue.extend(DisplayNameSection)
 const EmailView = Vue.extend(EmailSection)
 const LanguageView = Vue.extend(LanguageSection)
 const ProfileView = Vue.extend(ProfileSection)
-const CompanyView = Vue.extend(CompanySection)
-const JobTitleView = Vue.extend(JobTitleSection)
+const OrganisationView = Vue.extend(OrganisationSection)
+const RoleView = Vue.extend(RoleSection)
 const HeadlineView = Vue.extend(HeadlineSection)
 const BiographyView = Vue.extend(BiographySection)
 
@@ -60,7 +60,7 @@ new DisplayNameView().$mount('#vue-displayname-section')
 new EmailView().$mount('#vue-email-section')
 new LanguageView().$mount('#vue-language-section')
 new ProfileView().$mount('#vue-profile-section')
-new CompanyView().$mount('#vue-company-section')
-new JobTitleView().$mount('#vue-jobtitle-section')
+new OrganisationView().$mount('#vue-organisation-section')
+new RoleView().$mount('#vue-role-section')
 new HeadlineView().$mount('#vue-headline-section')
 new BiographyView().$mount('#vue-biography-section')
diff --git a/apps/settings/templates/settings/personal/personal.info.php b/apps/settings/templates/settings/personal/personal.info.php
index 794b3f7a0cf5b..4f39be321f54a 100644
--- a/apps/settings/templates/settings/personal/personal.info.php
+++ b/apps/settings/templates/settings/personal/personal.info.php
@@ -231,10 +231,10 @@
 			</form>
 		</div>
 		<div class="personal-settings-setting-box">
-			<div id="vue-company-section"></div>
+			<div id="vue-organisation-section"></div>
 		</div>
 		<div class="personal-settings-setting-box">
-			<div id="vue-jobtitle-section"></div>
+			<div id="vue-role-section"></div>
 		</div>
 		<div class="personal-settings-setting-box">
 			<div id="vue-headline-section"></div>
diff --git a/core/Controller/ProfileController.php b/core/Controller/ProfileController.php
index 434cbb43534d6..323fce6916953 100644
--- a/core/Controller/ProfileController.php
+++ b/core/Controller/ProfileController.php
@@ -99,8 +99,8 @@ public function __construct(
 	public const PROFILE_DISPLAY_PROPERTIES = [
 		IAccountManager::PROPERTY_DISPLAYNAME,
 		IAccountManager::PROPERTY_ADDRESS,
-		IAccountManager::PROPERTY_COMPANY,
-		IAccountManager::PROPERTY_JOB_TITLE,
+		IAccountManager::PROPERTY_ORGANISATION,
+		IAccountManager::PROPERTY_ROLE,
 		IAccountManager::PROPERTY_HEADLINE,
 		IAccountManager::PROPERTY_BIOGRAPHY,
 	];
@@ -111,8 +111,8 @@ public function __construct(
 	public const PROFILE_DISPLAY_PROPERTY_JSON_MAP = [
 		IAccountManager::PROPERTY_DISPLAYNAME => 'displayName',
 		IAccountManager::PROPERTY_ADDRESS => 'address',
-		IAccountManager::PROPERTY_COMPANY => 'company',
-		IAccountManager::PROPERTY_JOB_TITLE => 'jobTitle',
+		IAccountManager::PROPERTY_ORGANISATION => 'organisation',
+		IAccountManager::PROPERTY_ROLE => 'role',
 		IAccountManager::PROPERTY_HEADLINE => 'headline',
 		IAccountManager::PROPERTY_BIOGRAPHY => 'biography',
 	];
diff --git a/core/src/components/Profile/PrimaryActionButton.vue b/core/src/components/Profile/PrimaryActionButton.vue
index d8df06a043604..cc1d405884e03 100644
--- a/core/src/components/Profile/PrimaryActionButton.vue
+++ b/core/src/components/Profile/PrimaryActionButton.vue
@@ -82,6 +82,7 @@ export default {
 
 <style lang="scss" scoped>
 	.profile__primary-action-button {
+		font-size: var(--default-font-size);
 		font-weight: bold;
 		width: 220px;
 		height: 44px;
diff --git a/core/src/views/Profile.vue b/core/src/views/Profile.vue
index db624090e82a2..0f3053071c4eb 100644
--- a/core/src/views/Profile.vue
+++ b/core/src/views/Profile.vue
@@ -29,9 +29,13 @@
 				<h2 class="profile__header__container__displayname">
 					{{ displayName }}
 					<a v-if="isCurrentUser"
-						class="primary profile__header__container__button"
+						class="primary profile__header__container__edit-button"
 						:href="settingsUrl">
-						{{ t('core', 'Edit profile') }}
+						<PencilIcon
+							decorative
+							title=""
+							:size="16" />
+						{{ t('core', 'Edit Profile') }}
 					</a>
 				</h2>
 				<div v-if="status.icon || status.message"
@@ -105,8 +109,8 @@
 
 			<div class="profile__blocks">
 				<div class="profile__blocks-details">
-					<div v-if="company || jobTitle" class="detail">
-						<p>{{ company }} {{ (company && jobTitle) && '•' }} {{ jobTitle }}</p>
+					<div v-if="organisation || role" class="detail">
+						<p>{{ organisation }} {{ (organisation && role) && '•' }} {{ role }}</p>
 					</div>
 					<div v-if="address" class="detail">
 						<p>
@@ -134,7 +138,7 @@
 							fill-color="var(--color-text-maxcontrast)"
 							:size="60" />
 						<h3>{{ displayName }} {{ t('core', 'hasn\'t added any info yet') }}</h3>
-						<p>Headline and biography will show up here</p>
+						<p>Headline and about sections will show up here</p>
 					</div>
 				</template>
 			</div>
@@ -155,12 +159,13 @@ import ActionLink from '@nextcloud/vue/dist/Components/ActionLink'
 // import ProfileSettings from './ProfileSettings'
 // import PhoneIcon from 'vue-material-design-icons/Phone'
 import MapMarkerIcon from 'vue-material-design-icons/MapMarker'
+import PencilIcon from 'vue-material-design-icons/Pencil'
 import AccountIcon from 'vue-material-design-icons/Account'
 import { showError } from '@nextcloud/dialogs'
 
 import PrimaryActionButton from '../components/Profile/PrimaryActionButton'
 
-const { actionParameters, userId, biography, company, headline, jobTitle, displayName, address, isAvatarDisplayed } = loadState('core', 'profileParameters', {})
+const { actionParameters, userId, biography, organisation, headline, role, displayName, address, isAvatarDisplayed } = loadState('core', 'profileParameters', {})
 const status = loadState('core', 'status', {})
 
 // const actionParameters = []
@@ -175,6 +180,7 @@ export default {
 		AccountIcon,
 		// PhoneIcon,
 		MapMarkerIcon,
+		PencilIcon,
 		PrimaryActionButton,
 	},
 
@@ -184,8 +190,8 @@ export default {
 			displayName,
 			address,
 			status,
-			company,
-			jobTitle,
+			organisation,
+			role,
 			headline,
 			biography,
 		}
@@ -297,10 +303,10 @@ $content-max-width: 640px;
 
 			&__displayname {
 				width: $content-max-width;
-				margin-top: 132px;
+				margin-top: 128px;
 				// Overrides the global style declaration
 				margin-bottom: 0;
-				font-size: 26px;
+				font-size: 30px;
 				display: flex;
 				align-items: center;
 				cursor: text;
@@ -310,23 +316,30 @@ $content-max-width: 640px;
 				}
 			}
 
-			&__button {
+			&__edit-button {
 				border: none;
-				box-shadow: 0 0 0 1px var(--color-primary-text);
-				margin-left: 12px;
-				margin-top: 8px;
-				background-color: var(--color-primary-element);
-				color: var(--color-primary-text);
+				margin-left: 18px;
+				margin-top: 6px;
+				color: var(--color-primary-element);
+				background-color: var(--color-primary-text);
+				box-shadow: 0 0 0 2px var(--color-primary-text);
 				border-radius: var(--border-radius-pill);
+				padding: 0 18px;
+				font-size: var(--default-font-size);
+				height: 44px;
+				line-height: 44px;
 				font-weight: bold;
-				padding: 6px 16px;
-				font-size: 13px;
-				height: 34px;
-				line-height: 22px;
 
 				&:hover {
+					color: var(--color-primary-text);
 					background-color: var(--color-primary-element-light);
 				}
+
+				span {
+					display: inline-block;
+					vertical-align: middle;
+					margin-top: 2px;
+				}
 			}
 
 			&__status {
@@ -415,7 +428,7 @@ $content-max-width: 640px;
 				display: inline-block;
 				color: var(--color-text-maxcontrast);
 
-				& span {
+				span {
 					display: inline-block;
 					vertical-align: middle;
 				}
diff --git a/lib/private/Accounts/AccountManager.php b/lib/private/Accounts/AccountManager.php
index 431848616c4cd..3416db56ba562 100644
--- a/lib/private/Accounts/AccountManager.php
+++ b/lib/private/Accounts/AccountManager.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @copyright Copyright (c) 2016, Björn Schießle
@@ -30,6 +31,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 namespace OC\Accounts;
 
 use Exception;
@@ -384,7 +386,8 @@ protected function checkEmailVerification(IAccount $updatedAccount, array $oldDa
 		}
 		$oldMail = isset($oldData[self::PROPERTY_EMAIL]) ? $oldData[self::PROPERTY_EMAIL]['value']['value'] : '';
 		if ($oldMail !== $property->getValue()) {
-			$this->jobList->add(VerifyUserData::class,
+			$this->jobList->add(
+				VerifyUserData::class,
 				[
 					'verificationCode' => '',
 					'data' => $property->getValue(),
@@ -416,12 +419,14 @@ protected function sendEmailVerificationEmail(IUser $user, string $email): bool
 		$key = $this->crypto->encrypt($email);
 		$token = $this->verificationToken->create($user, 'verifyMail' . $ref, $email);
 
-		$link = $this->urlGenerator->linkToRouteAbsolute('provisioning_api.Verification.verifyMail',
+		$link = $this->urlGenerator->linkToRouteAbsolute(
+			'provisioning_api.Verification.verifyMail',
 			[
 				'userId' => $user->getUID(),
 				'token' => $token,
 				'key' => $key
-			]);
+			]
+		);
 
 		$emailTemplate = $this->mailer->createEMailTemplate('core.EmailVerification', [
 			'link' => $link,
@@ -503,7 +508,7 @@ protected function updateVerificationStatus(IAccount $updatedAccount, array $old
 					|| $property->getValue() !== $oldData[$propertyName]['value'])
 				&& ($property->getVerified() !== self::NOT_VERIFIED
 					|| $wasVerified)
-				) {
+			) {
 				$property->setVerified(self::NOT_VERIFIED);
 			}
 		}
@@ -681,13 +686,13 @@ protected function buildDefaultUserRecord(IUser $user) {
 			],
 
 			[
-				'name' => self::PROPERTY_COMPANY,
+				'name' => self::PROPERTY_ORGANISATION,
 				'value' => '',
 				'scope' => self::SCOPE_LOCAL,
 			],
 
 			[
-				'name' => self::PROPERTY_JOB_TITLE,
+				'name' => self::PROPERTY_ROLE,
 				'value' => '',
 				'scope' => self::SCOPE_LOCAL,
 			],
diff --git a/lib/private/Profile/Actions/TwitterAction.php b/lib/private/Profile/Actions/TwitterAction.php
index 5df44e27a502c..087ed5cfeb2fe 100644
--- a/lib/private/Profile/Actions/TwitterAction.php
+++ b/lib/private/Profile/Actions/TwitterAction.php
@@ -24,6 +24,7 @@
 
 namespace OC\Profile\Actions;
 
+use function Safe\substr;
 use OCP\IURLGenerator;
 use OCP\L10N\IFactory;
 use OCP\Profile\IProfileAction;
@@ -75,7 +76,8 @@ public function getIcon(): string {
 	}
 
 	public function getTarget(): string {
-		return 'https://twitter.com/' . $this->value;
+		$username = $this->value[0] === '@' ? substr($this->value, 1) : $this->value;
+		return 'https://twitter.com/' . $username;
 	}
 
 	public function setValue(string $value): string {
diff --git a/lib/public/Accounts/IAccountManager.php b/lib/public/Accounts/IAccountManager.php
index 54da24a64eb86..216027e34ac3b 100644
--- a/lib/public/Accounts/IAccountManager.php
+++ b/lib/public/Accounts/IAccountManager.php
@@ -26,6 +26,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
 namespace OCP\Accounts;
 
 use OCP\IUser;
@@ -96,8 +97,8 @@ interface IAccountManager {
 	public const PROPERTY_ADDRESS = 'address';
 	public const PROPERTY_TWITTER = 'twitter';
 
-	public const PROPERTY_COMPANY = 'company';
-	public const PROPERTY_JOB_TITLE = 'job_title';
+	public const PROPERTY_ORGANISATION = 'organisation';
+	public const PROPERTY_ROLE = 'role';
 	public const PROPERTY_HEADLINE = 'headline';
 	public const PROPERTY_BIOGRAPHY = 'biography';
 	public const PROPERTY_PROFILE_ENABLED = 'profile_enabled';