diff --git a/layouts/partials/blocks/templates/agenda.html b/layouts/partials/blocks/templates/agenda.html
index b2ed0712c4f813bbb3e7ed024e809166f1f20d0c..2f60da49610e4d373c087a1485cefa6b43c57024 100644
--- a/layouts/partials/blocks/templates/agenda.html
+++ b/layouts/partials/blocks/templates/agenda.html
@@ -3,7 +3,7 @@
 {{- $title := .block.title -}}
 
 {{- with .block.data }}
-  <div itemscope itemtype="http://schema.org/Blog" class="block block-agenda{{ if $title }} block-with-title{{ end }}">
+  <div class="block block-agenda{{ if $title }} block-with-title{{ end }}">
     <div class="container">
       <div class="block-content">
         {{ if or $title .description }}
@@ -21,16 +21,16 @@
 
         <div class="events">
           {{ range .elements }}
-            <article class="event" itemprop="events" itemscope itemtype="https://schema.org/Event">
+            <article class="event" itemscope itemtype="https://schema.org/Event">
               {{ if .data.image }}
                 {{- $direction = partial "GetImageDirection" .data.image -}}
               {{ end }}  
               <div class="event-content">
                 {{- $title := partial "PrepareHTML" .title -}}
-                <h3><a href="{{ .url }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">{{ $title }}</a></h3>
+                <h3><a href="{{ .url }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}" itemprop="name">{{ $title }}</a></h3>
                 {{ if site.Params.events.index.show_description }}
                   {{- if (partial "GetTextFromHTML" .summary) -}}
-                    <p itemprop="articleBody">
+                    <p itemprop="description">
                       {{ if site.Params.events.index.truncate_description }}
                         {{ partial "GetTruncateContent" ( dict 
                           "text" .summary
diff --git a/layouts/partials/events/event.html b/layouts/partials/events/event.html
index 480dcc4b36f3b302305d019f66a377dd30ddbd98..efd43851b71925dca3c57dfc836afaaa1d104ed5 100644
--- a/layouts/partials/events/event.html
+++ b/layouts/partials/events/event.html
@@ -14,17 +14,17 @@
   {{- $direction = partial "GetImageDirection" .Params.image -}}
 {{ end }}
 
-<article class='event {{ if $alternate }}{{ $direction }} {{if not (modBool $index 2)}}left{{ else}}right{{end}}{{end}}' itemprop="events" itemscope itemtype="https://schema.org/Event">
+<article class="event" itemscope itemtype="https://schema.org/Event">
   <div class="event-content">
     {{- $title := partial "PrepareHTML" .Title -}}
 
     {{ $heading_tag.open }}
-      <a href="{{ .Permalink }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">{{ $title }}</a>
+      <a href="{{ .Permalink }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}" itemprop="name">{{ $title }}</a>
     {{ $heading_tag.close }}
 
     {{ if site.Params.events.index.show_description }}
       {{- if (partial "GetTextFromHTML" .Params.summary) -}}
-        <p itemprop="articleBody">
+        <p itemprop="description">
           {{ if site.Params.events.index.truncate_description }}
             {{ partial "GetTruncateContent" ( dict 
               "text" .Params.summary