diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
index d81062bd..3cf59637 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
@@ -26,7 +26,7 @@
     
     <#local linkedIndividual>
         <#if statement.org??>
-            <a href="${profileUrl(statement.uri("org"))}" title="${i18n().organization_name}">${statement.orgName}</a>
+            <a itemscope itemtype="http://schema.org/CollegeOrUniversity" href="${profileUrl(statement.uri("org"))}" title="${i18n().organization_name}"><span itemprop="name">${statement.orgName}</span></a>
         <#elseif editable>
             <#-- Show the link to the context node only if the user is editing the page. -->
             <a href="${profileUrl(statement.uri("edTraining"))}" title="${i18n().missing_organization}">${i18n().missing_organization}</a>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-fullName.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-fullName.ftl
index a684bb48..229f54b7 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-fullName.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-fullName.ftl
@@ -11,10 +11,10 @@
 <#macro showFullName statement>
  
     <#if statement.fullName?has_content>
-        <#if statement.prefix??>${statement.prefix!}</#if>
-        ${statement.firstName!}
-        ${statement.middleName!}
-        ${statement.lastName!}<#if statement.suffix??>, ${statement.suffix!}</#if>
+        <#if statement.prefix??><span itemprop="honorificPrefix">${statement.prefix!}</span></#if>
+        <span itemprop="givenName">${statement.firstName!}</span>
+        <span itemprop="additionalName">${statement.middleName!}</span>
+        <span itemprop="familyName">${statement.lastName!}</span><#if statement.suffix??>, ${statement.suffix!}</#if>
     </#if>    
           
-</#macro>
\ No newline at end of file
+</#macro>