diff --git a/src/components/entry-header.tsx b/src/components/EntryHeader.tsx
similarity index 100%
rename from src/components/entry-header.tsx
rename to src/components/EntryHeader.tsx
diff --git a/src/components/footer.tsx b/src/components/Footer.tsx
similarity index 100%
rename from src/components/footer.tsx
rename to src/components/Footer.tsx
diff --git a/src/components/header.tsx b/src/components/Header.tsx
similarity index 100%
rename from src/components/header.tsx
rename to src/components/Header.tsx
diff --git a/src/components/post-list-item.tsx b/src/components/PostListItem.tsx
similarity index 100%
rename from src/components/post-list-item.tsx
rename to src/components/PostListItem.tsx
diff --git a/src/pages/example.tsx b/src/pages/example.tsx
index 705e1ea..91d07b5 100644
--- a/src/pages/example.tsx
+++ b/src/pages/example.tsx
@@ -1,9 +1,9 @@
 import { gql } from "../__generated__";
 import { useQuery } from "@apollo/client";
 import Head from "next/head";
-import Header from "../components/header";
-import EntryHeader from "../components/entry-header";
-import Footer from "../components/footer";
+import Header from "../components/Header";
+import EntryHeader from "../components/EntryHeader";
+import Footer from "../components/Footer";
 import { getNextStaticProps } from "@faustwp/core";
 import { GetStaticPropsContext } from "next";
 
diff --git a/src/wp-templates/archive.tsx b/src/wp-templates/archive.tsx
index b16d739..991ed7e 100644
--- a/src/wp-templates/archive.tsx
+++ b/src/wp-templates/archive.tsx
@@ -1,8 +1,8 @@
 import { gql, useQuery } from "@apollo/client";
 import Head from "next/head";
-import Header from "../components/header";
-import EntryHeader from "../components/entry-header";
-import Footer from "../components/footer";
+import Header from "../components/Header";
+import EntryHeader from "../components/EntryHeader";
+import Footer from "../components/Footer";
 import {
   SITE_DATA_QUERY,
   SiteDataQueryResponse,
@@ -12,7 +12,7 @@ import {
   HeaderMenuQueryResponse,
 } from "../queries/MenuQueries";
 import { POST_LIST_FRAGMENT } from "../fragments/PostListFragment";
-import PostListItem from "../components/post-list-item";
+import PostListItem from "../components/PostListItem";
 import { getNextStaticProps } from "@faustwp/core";
 import { useState } from "react";
 import styles from "../styles/archive.module.css";
diff --git a/src/wp-templates/front-page.tsx b/src/wp-templates/front-page.tsx
index b8a4cda..00af151 100644
--- a/src/wp-templates/front-page.tsx
+++ b/src/wp-templates/front-page.tsx
@@ -1,8 +1,8 @@
 import Head from "next/head";
 import Link from "next/link";
-import Header from "../components/header";
-import EntryHeader from "../components/entry-header";
-import Footer from "../components/footer";
+import Header from "../components/Header";
+import EntryHeader from "../components/EntryHeader";
+import Footer from "../components/Footer";
 import style from "../styles/front-page.module.css";
 import {
   SITE_DATA_QUERY,
diff --git a/src/wp-templates/page.tsx b/src/wp-templates/page.tsx
index 2328764..626caa3 100644
--- a/src/wp-templates/page.tsx
+++ b/src/wp-templates/page.tsx
@@ -1,8 +1,8 @@
 import { gql, useQuery } from "@apollo/client";
 import Head from "next/head";
-import EntryHeader from "../components/entry-header";
-import Footer from "../components/footer";
-import Header from "../components/header";
+import EntryHeader from "../components/EntryHeader";
+import Footer from "../components/Footer";
+import Header from "../components/Header";
 import {
   SITE_DATA_QUERY,
   SiteDataQueryResponse,
diff --git a/src/wp-templates/single.tsx b/src/wp-templates/single.tsx
index 9f7e160..48b7b58 100644
--- a/src/wp-templates/single.tsx
+++ b/src/wp-templates/single.tsx
@@ -1,8 +1,8 @@
 import { gql } from "../__generated__";
 import Head from "next/head";
-import EntryHeader from "../components/entry-header";
-import Footer from "../components/footer";
-import Header from "../components/header";
+import EntryHeader from "../components/EntryHeader";
+import Footer from "../components/Footer";
+import Header from "../components/Header";
 import {
   SITE_DATA_QUERY,
   SiteDataQueryResponse,
@@ -67,7 +67,7 @@ const Component: FaustTemplate<GetPostQuery> = (props) => {
       />
 
       <main className="container">
-        <EntryHeader title={title} date={date} author={author.node.name} />
+        <EntryHeader title={title} date={date} author={author?.node?.name} />
         <div dangerouslySetInnerHTML={{ __html: content }} />
       </main>