diff --git a/_includes/HakkenDates.tsx b/_includes/HakkenDates.tsx
index 16b866e..fb38d2a 100644
--- a/_includes/HakkenDates.tsx
+++ b/_includes/HakkenDates.tsx
@@ -43,13 +43,13 @@ const getStartAndEnd = (date) => {
   }
 };
 
-export default ({ data, lang, className = '', }) => {
+export default ({ data, language, className = '', }) => {
   const strings = data.strings;
   const dates = data.dates;
-  const t = (o) => o?.[lang] || '';
+  const t = (o) => o?.[language.slug] || '';
 
   return <section
-    id={`dates-list-${lang}`}
+    id={`dates-list-${language.slug}`}
     className={`ps-hakken-dates ${className}`}
   >
     <h3>{t(strings.comingDates)}</h3>
diff --git a/_includes/Langlink.tsx b/_includes/Langlink.tsx
index b3d4f35..0918808 100644
--- a/_includes/Langlink.tsx
+++ b/_includes/Langlink.tsx
@@ -1,4 +1,4 @@
 export default ({ otherLang, baseURL }) => <a
   href={otherLang.urlPrefix ? `/${otherLang.urlPrefix }${baseURL}` : baseURL}
-  class="ps-homelink ps-homelink_lang"
+  className="ps-homelink ps-homelink_lang"
 >{otherLang.slug}</a>
diff --git a/_includes/layouts/default.tsx b/_includes/layouts/default.tsx
index c35cdaa..bf79fc9 100644
--- a/_includes/layouts/default.tsx
+++ b/_includes/layouts/default.tsx
@@ -45,8 +45,8 @@ export default ({
       <main className="ps-main--page ps-page">
         <div className="ps-page--contents">
           <section dangerouslySetInnerHTML={{ __html: md(content) }}></section>
-          {showServices ? <Services lang="en" language={language} data={services} /> : null}
-          {showHakkenDates ? <HakkenDates lang="en" data={hakken} /> : null}
+          {showServices ? <Services language={language} data={services} /> : null}
+          {showHakkenDates ? <HakkenDates language={language} data={hakken} /> : null}
         </div>
 
       </main>