diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index c14c33f221127d8b3cc908c2566aadd4ae47a621..cd0507c55bc7d26a280d794161c738e9feccaa03 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -13,9 +13,9 @@ sib-widget(name='cs-display-property')
 sib-widget(name='cs-steps-resources-multiple')
   template
     div.resource_resume_header
-      p ${value.name}
-    p ${value.publication_year}
-    p ${value.description}
+      p ${await value.name}
+    p ${await value.publication_year}
+    p ${await value.description}
 
 sib-widget(name='cs-steps-header')
   template
@@ -47,20 +47,20 @@ sib-widget(name='cs-display-checkbox')
 
 sib-widget(name='cs-display-related-property')
   template
-    p #[a(href="${value.name}")] ${value.name}
+    p #[a(href="${value.name}")] ${await value.name}
 
 sib-widget(name='cs-display-multiple-property')
   template
-    p #[b ${label}] ${value.name} 
+    p #[b ${label}] ${await value.name} 
 
 sib-widget(name='cs-display-step-property')
   template
-    p #[b ${label} ${value.order}:] ${value.name} 
+    p #[b ${label} ${await value.order}:] ${await value.name} 
 
 sib-widget(name='cs-resource-format-name')
     template
         div
-            p ${value.name}
+            p ${await value.name}
 
 sib-widget(name='cs-resource-reviewer')
   template
diff --git a/src/includes/entrepreneur/profile/create.pug b/src/includes/entrepreneur/profile/create.pug
index a3dd7eadb3b8ed83e54dd22731ecf98123a530fc..98ad2e04a66cddff45d7db4296bf41713e858e72 100644
--- a/src/includes/entrepreneur/profile/create.pug
+++ b/src/includes/entrepreneur/profile/create.pug
@@ -12,16 +12,16 @@ h2.title_create=`${data.CompleteEntrepreneurAccount}`
 
 sib-form#entrepreneur_profile_creation.block_log.block_creat_count(
     bind-user
-    fields="last_name, first_name, entrepreneur_profile.organisation, account.picture, username"
+    fields="last_name, first_name, entrepreneurProfile.organisation, account.picture, username"
     
-    range-entrepreneur_profile.organisation=`${endpoints.organisations}`
+    range-entrepreneurProfile.organisation=`${endpoints.organisations}`
 
     label-first_name=`${data.Surname}`
     label-last_name=`${data.Name}`
-    label-entrepreneur_profile.organisation=`${data.Organisation}`
+    label-entrepreneurProfile.organisation=`${data.Organisation}`
     
-    class-entrepreneur_profile.organisation='form-label is-dark'
-    widget-entrepreneur_profile.organisation='sib-form-auto-completion'
+    class-entrepreneurProfile.organisation='form-label is-dark'
+    widget-entrepreneurProfile.organisation='sib-form-auto-completion'
 
     widget-username='sib-form-hidden'
 
diff --git a/src/includes/entrepreneur/profile/detail.pug b/src/includes/entrepreneur/profile/detail.pug
index eeea2edfd88d9d0e3c3e3c7bacaf1da1676c4408..dd7f8e29e369f434c7df44c2a7690dc98221ded8 100644
--- a/src/includes/entrepreneur/profile/detail.pug
+++ b/src/includes/entrepreneur/profile/detail.pug
@@ -25,11 +25,11 @@ div.block_list.flex
 
         sib-display#entrepreneur_info(
             bind-user
-            fields='account.picture, name, entrepreneur_profile.organisation.name, registered_on'
+            fields='account.picture, name, entrepreneurProfile.organisation.name, registeredOn'
             widget-name='cs-display-property'
             widget-account.picture='cs-profile-picture'
-            widget-entrepreneur_profile.organisation.name='cs-display-property'
-            widget-entrepreneur_profile.registered_on='cs-display-property'
+            widget-entrepreneurProfile.organisation.name='cs-display-property'
+            widget-entrepreneurProfile.registeredOn='cs-display-property'
         )
 
         sib-display#entrepreneur_contact(
diff --git a/src/includes/entrepreneur/profile/edit.pug b/src/includes/entrepreneur/profile/edit.pug
index f3f90cb1256d0d746ad950c2da72b2b1ef6dda6c..0c43b55a72fc74a65608eb02f4ded15ff9a846f8 100644
--- a/src/includes/entrepreneur/profile/edit.pug
+++ b/src/includes/entrepreneur/profile/edit.pug
@@ -4,22 +4,22 @@ h2.title_create= data.EditYourAccount
 
 sib-form#entrepreneur_profile_edition.block_log.block_creat_count(
     bind-user
-    fields="info(last_name, first_name, username, email, entrepreneur_profile.organisation, account.picture)"     
-    range-entrepreneur_profile.organisation=`${endpoints.organisations}`
+    fields="info(last_name, first_name, username, email, entrepreneurProfile.organisation, account.picture)"     
+    range-entrepreneurProfile.organisation=`${endpoints.organisations}`
     
     label-first_name=`${data.Surname}`
     label-last_name=`${data.Name}`
-    label-entrepreneur_profile.organisation=`${data.Organisation}`
+    label-entrepreneurProfile.organisation=`${data.Organisation}`
     label-account.picture=`${data.Photo}`
     widget-username="sib-form-hidden"
 
     class-last_name='form-label is-dark input_big'
     class-first_name='form-label is-dark input_big'
     class-email='form-label is-dark input_big'
-    class-entrepreneur_profile.phone='form-label is-dark input_big'
+    class-entrepreneurProfile.phone='form-label is-dark input_big'
 
-    class-entrepreneur_profile.organisation='form-label is-dark input_big'
-    widget-entrepreneur_profile.organisation='sib-form-auto-completion'
+    class-entrepreneurProfile.organisation='form-label is-dark input_big'
+    widget-entrepreneurProfile.organisation='sib-form-auto-completion'
 
     upload-url-account.picture=`${sdn}upload/`
     widget-account.picture='cs-form-file-custom'
diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug
index 399d29fc5bdedcb50d3dace21641b3d606b78556..f0b2c64494951023e3f19da9c7a7f2ac66cc6d87 100644
--- a/src/includes/entrepreneur/resources/detail.pug
+++ b/src/includes/entrepreneur/resources/detail.pug
@@ -14,7 +14,7 @@ include ../../components/widgets
     bind-resources,
     fields='name, steps, format.name, \
             submitter_info(submitter.account.picture, submitter.name, \
-            submitter.mentor_profile.organisation.name, skills, uri, broken),\
+            submitter.mentorProfile.organisation.name, skills, uri, broken),\
             content(preview_image, tags),\
             description, review.reviewer.account.picture, review.reviewer.name,\
             copyright, specifications(\
@@ -26,7 +26,7 @@ include ../../components/widgets
     class-steps="steps"
     widget-author='cs-display-resource-property',
     widget-country.name='cs-display-resource-property',
-    widget-submitter.mentor_profile.organisation.name='cs-display-resource-property'
+    widget-submitter.mentorProfile.organisation.name='cs-display-resource-property'
     class-submitter.name="autor_ressource"
     class-broken="broken"
     widget-format.name='cs-display-resource-property'
@@ -68,7 +68,7 @@ include ../../components/widgets
     label-uri=`${data.LinkToResource}`
     name-uri='original-link'
     label-country.name=`${data.Country}`
-    label-submitter.mentor_profile.organisation.name=`${data.Organisation}`
+    label-submitter.mentorProfile.organisation.name=`${data.Organisation}`
     label-author=`${data.Author}`
     label-submitter.name=`${data.ResourcePostedBy}`
     action-broken='resource-report-broken-link-entrepreneur'
diff --git a/src/includes/head.pug b/src/includes/head.pug
index 907cc5fc4ad7e7f01b96f182cc4888633a610f1e..f56002384b93bcf66a10bee7f5c0df2fdbcfad72 100644
--- a/src/includes/head.pug
+++ b/src/includes/head.pug
@@ -2,7 +2,7 @@ head
     title CoopStarter
     meta(charset="utf-8")
     script(src="https://unpkg.com/@webcomponents/webcomponentsjs@1.2.7/webcomponents-loader.js")
-    script(type="module" src="https://unpkg.com/@startinblox/core@0.8")
+    script(type="module" src="https://unpkg.com/@startinblox/core")
     script(type="module" src="https://unpkg.com/@startinblox/router")
     script(type="module" src="https://unpkg.com/@startinblox/oidc")
     script(type="module" src="https://unpkg.com/@startinblox/component-conversation")
@@ -10,3 +10,11 @@ head
     script(src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous")
     script(src="/scripts/coopstarter.js")
     link(rel="stylesheet" href="/styles/index.css")
+    script(data-default-context type="application/ld+json" ).
+        
+            {
+                "entrepreneurProfile": "http://happy-dev.fr/owl/#entrepreneur_profile",
+                "mentorProfile": "http://happy-dev.fr/owl/#mentor_profile",
+                "account": "http://happy-dev.fr/owl/#account"
+            }
+        
\ No newline at end of file
diff --git a/src/includes/mentor/profile/create.pug b/src/includes/mentor/profile/create.pug
index 318cce1d3aefee711c86c602c6d85a2be743b9b1..92c27f8f339f9d351ff92c26a1639543de13b576 100644
--- a/src/includes/mentor/profile/create.pug
+++ b/src/includes/mentor/profile/create.pug
@@ -12,16 +12,16 @@ h2.title_create= data.CompleteMentorAccount
 
 sib-form#mentor_profile_creation.block_log.block_creat_count(
     bind-user
-    fields="account_information(last_name, first_name, mentor_profile.organisation,\
-            mentor_profile.phone, mentor_profile.languages, mentor_profile.fields),\
-            about_you(header_about_you, account.picture, mentor_profile.headline, mentor_profile.city, mentor_profile.country,\
-            mentor_profile.biography, mentor_profile.skills),\
-            social_media(header_social_media, mentor_profile.linkedin, mentor_profile.twitter), username"
+    fields="account_information(last_name, first_name, mentorProfile.organisation,\
+            mentorProfile.phone, mentorProfile.languages, mentorProfile.fields),\
+            about_you(header_about_you, account.picture, mentorProfile.headline, mentorProfile.city, mentorProfile.country,\
+            mentorProfile.biography, mentorProfile.skills),\
+            social_media(header_social_media, mentorProfile.linkedin, mentorProfile.twitter), username"
     
-    range-mentor_profile.fields=`${endpoints.fields}`
-    range-mentor_profile.organisation=`${endpoints.organisations}`
-    range-mentor_profile.languages=`${endpoints.languages}`
-    range-mentor_profile.country=`${endpoints.countries}`
+    range-mentorProfile.fields=`${endpoints.fields}`
+    range-mentorProfile.organisation=`${endpoints.organisations}`
+    range-mentorProfile.languages=`${endpoints.languages}`
+    range-mentorProfile.country=`${endpoints.countries}`
 
     label-header_about_you=`${data.AboutYou}`
     label-header_social_media=`${data.SocialMedias}`
@@ -31,35 +31,35 @@ sib-form#mentor_profile_creation.block_log.block_creat_count(
     
     label-first_name=`${data.Surname}`
     label-last_name=`${data.Name}`
-    label-mentor_profile.organisation=`${data.Organisation}`
-    label-mentor_profile.phone=`${data.PhoneNumber}`
-    label-mentor_profile.languages=`${data.Language}`
-    label-mentor_profile.fields=`${data.Field}`
+    label-mentorProfile.organisation=`${data.Organisation}`
+    label-mentorProfile.phone=`${data.PhoneNumber}`
+    label-mentorProfile.languages=`${data.Language}`
+    label-mentorProfile.fields=`${data.Field}`
     label-account.picture=`${data.Photo}`
-    label-mentor_profile.headline=`${data.Headline}`
-    class-mentor_profile.headline="w_75"
-    label-mentor_profile.city=`${data.City}`
-    label-mentor_profile.country=`${data.Country}`
-    label-mentor_profile.biography=`${data.ActivitiesMore}`
-    label-mentor_profile.skills=`${data.SkillForEntrepreneur}`
-    label-mentor_profile.linkedin="Linkedin"
-    label-mentor_profile.twitter="Twitter"
+    label-mentorProfile.headline=`${data.Headline}`
+    class-mentorProfile.headline="w_75"
+    label-mentorProfile.city=`${data.City}`
+    label-mentorProfile.country=`${data.Country}`
+    label-mentorProfile.biography=`${data.ActivitiesMore}`
+    label-mentorProfile.skills=`${data.SkillForEntrepreneur}`
+    label-mentorProfile.linkedin="Linkedin"
+    label-mentorProfile.twitter="Twitter"
 
-    widget-mentor_profile.skills="sib-form-textarea"
-    widget-mentor_profile.biography="sib-form-textarea"
+    widget-mentorProfile.skills="sib-form-textarea"
+    widget-mentorProfile.biography="sib-form-textarea"
     widget-username="sib-form-hidden"
 
-    class-mentor_profile.organisation='form-label is-dark'
-    widget-mentor_profile.organisation='sib-form-auto-completion'
-    widget-mentor_profile.country='sib-form-auto-completion'
+    class-mentorProfile.organisation='form-label is-dark'
+    widget-mentorProfile.organisation='sib-form-auto-completion'
+    widget-mentorProfile.country='sib-form-auto-completion'
 
-    class-mentor_profile.languages='form-label is-dark'
-    multiple-mentor_profile.languages='sib-multiple-select'
-    widget-mentor_profile.languages='sib-form-auto-completion'
+    class-mentorProfile.languages='form-label is-dark'
+    multiple-mentorProfile.languages='sib-multiple-select'
+    widget-mentorProfile.languages='sib-form-auto-completion'
 
-    class-mentor_profile.fields='form-label is-dark'
-    multiple-mentor_profile.fields='sib-multiple-select'
-    widget-mentor_profile.fields='sib-form-auto-completion'
+    class-mentorProfile.fields='form-label is-dark'
+    multiple-mentorProfile.fields='sib-multiple-select'
+    widget-mentorProfile.fields='sib-form-auto-completion'
 
     upload-url-account.picture=`${sdn}upload/`
     widget-account.picture='cs-form-file-custom'
diff --git a/src/includes/mentor/profile/detail.pug b/src/includes/mentor/profile/detail.pug
index 147889288bef207a6ceb811c7a8563967ce809ed..9ed918d6d5b5e74ee4cd69d8679b27254735787e 100644
--- a/src/includes/mentor/profile/detail.pug
+++ b/src/includes/mentor/profile/detail.pug
@@ -29,13 +29,13 @@ div.block_list.flex
 
         sib-display#mentor_info(
             bind-user
-            fields='account.picture, name, mentor_profile.headline, mentor_profile.city, mentor_profile.country.name, registered_on'
+            fields='account.picture, name, mentorProfile.headline, mentorProfile.city, mentorProfile.country.name, registered_on'
             widget-account.picture='cs-profile-picture'
             widget-name='cs-display-property'
-            widget-mentor_profile.headline='cs-display-property'
-            widget-mentor_profile.city='cs-display-property'
-            widget-mentor_profile.country.name='cs-display-property'
-            widget-mentor_profile.registered_on='cs-display-property'
+            widget-mentorProfile.headline='cs-display-property'
+            widget-mentorProfile.city='cs-display-property'
+            widget-mentorProfile.country.name='cs-display-property'
+            widget-mentorProfile.registered_on='cs-display-property'
         )
 
         sib-display.bold(
@@ -47,26 +47,26 @@ div.block_list.flex
 
         sib-display#mentor_complementary(
             bind-user
-            fields='biography_label, mentor_profile.biography, skills_label, mentor_profile.skills'
+            fields='biography_label, mentorProfile.biography, skills_label, mentorProfile.skills'
             widget-biography_label='cs-display-label'
             widget-skills_label='cs-display-label'
             label-skills_label=`${data.Skills}`
             label-biography_label=`${data.Activities}`
-            widget-mentor_profile.skills='cs-display-property'
-            widget-mentor_profile.biography='cs-display-property'
+            widget-mentorProfile.skills='cs-display-property'
+            widget-mentorProfile.biography='cs-display-property'
         )
 
         sib-display#mentor_contact(
             bind-user
-            fields='email, mentor_profile.phone, mentor_profile.linkedin, mentor_profile.twitter'
+            fields='email, mentorProfile.phone, mentorProfile.linkedin, mentorProfile.twitter'
             label-email=`${data.Email}`
             class-email="contact_profil"
-            label-mentor_profile.phone=`${data.PhoneNumber}`
-            class-mentor_profile.phone="contact_profil"
+            label-mentorProfile.phone=`${data.PhoneNumber}`
+            class-mentorProfile.phone="contact_profil"
             widget-email='cs-display-resource-property'
-            widget-mentor_profile.phone='cs-display-resource-property'
-            widget-mentor_profile.linkedin='cs-display-link'
-            widget-mentor_profile.twitter='cs-display-link'
-            label-mentor_profile.twitter='<i class="fab fa-twitter"></i>'
-            label-mentor_profile.linkedin='<i class="fab fa-linkedin-in"></i>'
+            widget-mentorProfile.phone='cs-display-resource-property'
+            widget-mentorProfile.linkedin='cs-display-link'
+            widget-mentorProfile.twitter='cs-display-link'
+            label-mentorProfile.twitter='<i class="fab fa-twitter"></i>'
+            label-mentorProfile.linkedin='<i class="fab fa-linkedin-in"></i>'
         )
\ No newline at end of file
diff --git a/src/includes/mentor/profile/edit.pug b/src/includes/mentor/profile/edit.pug
index 71402553350b961983f41668d19d6120795467c8..41e72b2098fc51ad4dec235d83bde98ba820164d 100644
--- a/src/includes/mentor/profile/edit.pug
+++ b/src/includes/mentor/profile/edit.pug
@@ -4,15 +4,15 @@ h2.title_create= data.EditYourAccount
 
 sib-form#mentor_profile_edition.block_log.block_creat_count(
     bind-user
-    fields="account_information(last_name, first_name, mentor_profile.organisation,\
-            mentor_profile.phone, mentor_profile.languages, mentor_profile.fields),\
-            about_you(header_about_you, account.picture, mentor_profile.headline, mentor_profile.city, mentor_profile.country,\
-            mentor_profile.biography, mentor_profile.skills, resources),\
-            social_media(header_social_media, mentor_profile.linkedin, mentor_profile.twitter), username"
+    fields="account_information(last_name, first_name, mentorProfile.organisation,\
+            mentorProfile.phone, mentorProfile.languages, mentorProfile.fields),\
+            about_you(header_about_you, account.picture, mentorProfile.headline, mentorProfile.city, mentorProfile.country,\
+            mentorProfile.biography, mentorProfile.skills, resources),\
+            social_media(header_social_media, mentorProfile.linkedin, mentorProfile.twitter), username"
     
-    range-mentor_profile.fields=`${endpoints.fields}`
-    range-mentor_profile.organisation=`${endpoints.organisations}`
-    range-mentor_profile.languages=`${endpoints.languages}`
+    range-mentorProfile.fields=`${endpoints.fields}`
+    range-mentorProfile.organisation=`${endpoints.organisations}`
+    range-mentorProfile.languages=`${endpoints.languages}`
 
     label-header_about_you=`${data.AboutYou}`
     label-header_social_media=`${data.AboutYou}`
@@ -22,35 +22,35 @@ sib-form#mentor_profile_edition.block_log.block_creat_count(
     
     label-first_name=`${data.Surname}`
     label-last_name=`${data.Name}`
-    label-mentor_profile.organisation=`${data.Organisation}`
-    label-mentor_profile.phone=`${data.PhoneNumber}`
-    label-mentor_profile.languages=`${data.Language}`
-    label-mentor_profile.fields=`${data.Field}`
+    label-mentorProfile.organisation=`${data.Organisation}`
+    label-mentorProfile.phone=`${data.PhoneNumber}`
+    label-mentorProfile.languages=`${data.Language}`
+    label-mentorProfile.fields=`${data.Field}`
     label-account.picture=`${data.Photo}`
-    label-mentor_profile.headline=`${data.Headline}`
-    class-mentor_profile.headline="w_75"
-    label-mentor_profile.city=`${data.City}`
-    label-mentor_profile.country=`${data.Country}`
-    label-mentor_profile.biography=`${data.ActivitiesMore}`
-    label-mentor_profile.skills=`${data.SkillForEntrepreneur}`
-    label-mentor_profile.linkedin="Linkedin"
-    label-mentor_profile.twitter="Twitter"
+    label-mentorProfile.headline=`${data.Headline}`
+    class-mentorProfile.headline="w_75"
+    label-mentorProfile.city=`${data.City}`
+    label-mentorProfile.country=`${data.Country}`
+    label-mentorProfile.biography=`${data.ActivitiesMore}`
+    label-mentorProfile.skills=`${data.SkillForEntrepreneur}`
+    label-mentorProfile.linkedin="Linkedin"
+    label-mentorProfile.twitter="Twitter"
 
-    widget-mentor_profile.skills="sib-form-textarea"
-    widget-mentor_profile.biography="sib-form-textarea"
+    widget-mentorProfile.skills="sib-form-textarea"
+    widget-mentorProfile.biography="sib-form-textarea"
     widget-username="sib-form-hidden"
     widget-resources="hidden-widget"
 
-    class-mentor_profile.organisation='form-label is-dark'
-    widget-mentor_profile.organisation='sib-form-auto-completion'
+    class-mentorProfile.organisation='form-label is-dark'
+    widget-mentorProfile.organisation='sib-form-auto-completion'
 
-    class-mentor_profile.languages='form-label is-dark'
-    multiple-mentor_profile.languages='sib-multiple-select'
-    widget-mentor_profile.languages='sib-form-auto-completion'
+    class-mentorProfile.languages='form-label is-dark'
+    multiple-mentorProfile.languages='sib-multiple-select'
+    widget-mentorProfile.languages='sib-form-auto-completion'
 
-    class-mentor_profile.fields='form-label is-dark'
-    multiple-mentor_profile.fields='sib-multiple-select'
-    widget-mentor_profile.fields='sib-form-auto-completion'
+    class-mentorProfile.fields='form-label is-dark'
+    multiple-mentorProfile.fields='sib-multiple-select'
+    widget-mentorProfile.fields='sib-form-auto-completion'
 
     upload-url-account.picture=`${sdn}upload/`
     widget-account.picture='cs-form-file-custom'
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index b978db2a7d3c76e5dc72971c4cdc9693dff4283b..b7655c7d2dc13d0bc7400fc55efbb20e3522f33f 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -15,7 +15,7 @@ include ../../components/widgets
     bind-resources,
     fields='name, steps, format.name,\
             submitter_info(submitter.account.picture, submitter.name, \
-            submitter.mentor_profile.organisation.name, skills, uri, broken),\
+            submitter.mentorProfile.organisation.name, skills, uri, broken),\
             content(preview_image, tags),\
             description, review.reviewer.account.picture, review.reviewer.name,\
             copyright, specifications(\
@@ -27,7 +27,7 @@ include ../../components/widgets
     class-steps="steps"
     widget-author='cs-display-resource-property',
     widget-country='cs-display-resource-property',
-    widget-submitter.mentor_profile.organisation.name='cs-display-resource-property'
+    widget-submitter.mentorProfile.organisation.name='cs-display-resource-property'
     class-submitter.name="autor_ressource"
     class-broken="broken"
     widget-format.name='cs-display-resource-property'
@@ -69,7 +69,7 @@ include ../../components/widgets
     label-uri=`${data.LinkToResource}`
     name-uri='original-link'
     label-country=`${data.Country}`
-    label-submitter.mentor_profile.organisation.name=`${data.Organisation}`
+    label-submitter.mentorProfile.organisation.name=`${data.Organisation}`
     label-author=`${data.Author}`
     label-submitter.name=`${data.ResourcePostedBy}`
     action-broken='resource-report-broken-link-mentor'
diff --git a/src/includes/mentor/resources/validate.pug b/src/includes/mentor/resources/validate.pug
index ce160a326ddf13d9a8b7d41230bae9d9578d2707..92c8d5115e39aa765fdacf1c2a7c7a551142cf34 100644
--- a/src/includes/mentor/resources/validate.pug
+++ b/src/includes/mentor/resources/validate.pug
@@ -20,7 +20,7 @@ sib-router
     bind-resources,
     fields='name, steps, format.name,\
             submitter_info(submitter.account.picture, submitter.name, \
-            submitter.mentor_profile.organisation.name, skills, uri, broken),\
+            submitter.mentorProfile.organisation.name, skills, uri, broken),\
             content(preview_image, tags),\
             description, copyright, specifications(\
             header_specifications, author, country.name, language.name,\
@@ -31,7 +31,7 @@ sib-router
     class-steps="steps"
     widget-author='cs-display-resource-property',
     widget-country.name='cs-display-resource-property',
-    widget-submitter.mentor_profile.organisation.name='cs-display-resource-property'
+    widget-submitter.mentorProfile.organisation.name='cs-display-resource-property'
     class-submitter.name="autor_ressource"
     class-broken="broken"
     widget-format.name='cs-display-resource-property'
@@ -70,7 +70,7 @@ sib-router
     label-uri=`${data.LinkToResource}`
     name-uri='original-link'
     label-country.name=`${data.Country}`
-    label-submitter.mentor_profile.organisation.name=`${data.Organisation}`
+    label-submitter.mentorProfile.organisation.name=`${data.Organisation}`
     label-author=`${data.Author}`
     label-submitter.name=`${data.ResourcePostedBy}`
     action-broken='resource-report-broken-link-mentor'
diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug
index 5d14346438f70026cac312394162edad5c7aa967..6a500211d5a0fe4b66e36f90f76fa1840885f5a2 100644
--- a/src/includes/public/resources/detail.pug
+++ b/src/includes/public/resources/detail.pug
@@ -15,7 +15,7 @@ include ../../components/widgets
     bind-resources,
     fields='name, steps, format.name,\
             submitter_info(submitter.account.picture, submitter.name, \
-            submitter.mentor_profile.organisation.name, skills, uri, broken),\
+            submitter.mentorProfile.organisation.name, skills, uri, broken),\
             content(preview_image, tags),\
             description, review.reviewer.account.picture, review.reviewer.name,\
             copyright, specifications(\
@@ -27,7 +27,7 @@ include ../../components/widgets
     class-steps="steps"
     widget-author='cs-display-resource-property',
     widget-country.name='cs-display-resource-property',
-    widget-submitter.mentor_profile.organisation.name='cs-display-resource-property'
+    widget-submitter.mentorProfile.organisation.name='cs-display-resource-property'
     class-submitter.name="autor_ressource"
     class-broken="broken"
     widget-format.name='cs-display-resource-property'
@@ -69,7 +69,7 @@ include ../../components/widgets
     label-uri=`${data.LinkToResource}`
     name-uri='original-link'
     label-country=`${data.Country}`
-    label-submitter.mentor_profile.organisation.name=`${data.Organisation}`
+    label-submitter.mentorProfile.organisation.name=`${data.Organisation}`
     label-author=`${data.Author}`
     label-submitter.name=`${data.ResourcePostedBy}`
     action-broken='resource-report-broken-link-public'