diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/LinkList.tsx b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/LinkList.tsx
index d27fcdd355..ded167dded 100644
--- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/LinkList.tsx
+++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/LinkList.tsx
@@ -29,7 +29,7 @@ type LinkListItemProps = {
   key: string;
   index: number;
   total: number;
-  field: ResultsFieldLink;
+  field: LinkField;
 };
 
 const LinkListItem = (props: LinkListItemProps) => {
@@ -61,7 +61,7 @@ export const Default = (props: LinkListProps): JSX.Element => {
           index={key}
           key={`${key}${element.field.link}`}
           total={datasource.children.results.length}
-          field={element}
+          field={element.field.link}
         />
       ));
 
diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/RichText.tsx b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/RichText.tsx
index 20225d9c65..b874d9a833 100644
--- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/RichText.tsx
+++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/RichText.tsx
@@ -10,7 +10,7 @@ export type RichTextProps = {
   fields: Fields;
 };
 
-export const RichText = (props: RichTextProps): JSX.Element => {
+export const Default = (props: RichTextProps): JSX.Element => {
   const text = props.fields ? (
     <JssRichText field={props.fields.Text} />
   ) : (
diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/Title.tsx b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/Title.tsx
index 5ebd4eb50a..e7ab828cf6 100644
--- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/Title.tsx
+++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/Title.tsx
@@ -50,7 +50,7 @@ const ComponentContent = (props: ComponentContentProps) => {
   );
 };
 
-export const Title = (props: TitleProps): JSX.Element => {
+export const Default = (props: TitleProps): JSX.Element => {
   const datasource = props.fields?.data?.datasource || props.fields?.data?.contextItem;
   const text: TextField = {
     value: datasource?.field?.jsonValue?.value,