diff --git a/src/pages/admin/events/index.tsx b/src/pages/admin/events/index.tsx
index 632b886..922d0c8 100644
--- a/src/pages/admin/events/index.tsx
+++ b/src/pages/admin/events/index.tsx
@@ -66,12 +66,12 @@ const renderData = (events: Event[]) => {
 };
 
 const AdminEventPage: NextPage = () => {
-  const { data } = useSWR<Event[]>([APIPath.EVENTS, { auth: true }], fetcher);
+  const { data: events } = useSWR<Event[]>([APIPath.EVENTS, { auth: true }], fetcher);
   return (
     <AdminListCommon>
       <h1>Events</h1>
       <AddLink text="Create event" to={`${URL}/create`} data-e2e="create-event" />
-      {renderData(data)}
+      {renderData(events)}
     </AdminListCommon>
   );
 };
diff --git a/src/pages/admin/feed/index.tsx b/src/pages/admin/feed/index.tsx
index a61e235..09d9d25 100644
--- a/src/pages/admin/feed/index.tsx
+++ b/src/pages/admin/feed/index.tsx
@@ -66,12 +66,12 @@ const renderData = (feed: Post[]) => {
 };
 
 const AdminFeedPage: NextPage = () => {
-  const { data } = useSWR<Post[]>([APIPath.FEED, { auth: true }], fetcher);
+  const { data: feed } = useSWR<Post[]>([APIPath.FEED, { auth: true }], fetcher);
   return (
     <AdminListCommon>
       <h1>Feed</h1>
       <AddLink text="Create news post" to={`${URL}/create`} />
-      {renderData(data)}
+      {renderData(feed)}
     </AdminListCommon>
   );
 };
diff --git a/src/pages/admin/jobads/index.tsx b/src/pages/admin/jobads/index.tsx
index 67c9dfe..e5cb9f7 100644
--- a/src/pages/admin/jobads/index.tsx
+++ b/src/pages/admin/jobads/index.tsx
@@ -70,12 +70,12 @@ const renderData = (jobAds: JobAd[]) => {
 };
 
 const AdminJobAdPage: NextPage = () => {
-  const { data } = useSWR<JobAd[]>([APIPath.JOBADS, { auth: true }], fetcher);
+  const { data: jobAds } = useSWR<JobAd[]>([APIPath.JOBADS, { auth: true }], fetcher);
   return (
     <AdminListCommon>
       <h1>Job advertisements</h1>
       <AddLink text="Create job ad" to={`${URL}/create`} />
-      {renderData(data)}
+      {renderData(jobAds)}
     </AdminListCommon>
   );
 };
diff --git a/src/pages/in_english.tsx b/src/pages/in_english.tsx
index b60a8fc..121a9af 100644
--- a/src/pages/in_english.tsx
+++ b/src/pages/in_english.tsx
@@ -24,8 +24,8 @@ interface InitialProps {
 }
 
 const InEnglishPage: NextPage<InitialProps> = ({ initialEvents, initialFeed }) => {
-  const eventResult = useSWR<Event[]>([APIPath.EVENTS, eventOptions], fetcher, { fallbackData: initialEvents });
-  const feedResult = useSWR<Post[]>([APIPath.FEED, feedOptions], fetcher, { fallbackData: initialFeed });
+  const { data: events } = useSWR<Event[]>([APIPath.EVENTS, eventOptions], fetcher, { fallbackData: initialEvents });
+  const { data: feed } = useSWR<Post[]>([APIPath.FEED, feedOptions], fetcher, { fallbackData: initialFeed });
 
   return (
     <>
@@ -33,7 +33,7 @@ const InEnglishPage: NextPage<InitialProps> = ({ initialEvents, initialFeed }) =
         <link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/in_english`} />
       </Head>
       <PageWrapper>
-        <InEnglishPageView events={eventResult.data} feed={feedResult.data} />
+        <InEnglishPageView events={events} feed={feed} />
       </PageWrapper>
     </>
   );
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 3846a7d..6101204 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -24,8 +24,8 @@ interface InitialProps {
 }
 
 const FrontPage: NextPage<InitialProps> = ({ initialEvents, initialFeed }) => {
-  const eventResult = useSWR<Event[]>([APIPath.EVENTS, eventOptions], fetcher, { fallbackData: initialEvents });
-  const feedResult = useSWR<Post[]>([APIPath.FEED, feedOptions], fetcher, { fallbackData: initialFeed });
+  const { data: events } = useSWR<Event[]>([APIPath.EVENTS, eventOptions], fetcher, { fallbackData: initialEvents });
+  const { data: feed } = useSWR<Post[]>([APIPath.FEED, feedOptions], fetcher, { fallbackData: initialFeed });
 
   return (
     <>
@@ -33,7 +33,7 @@ const FrontPage: NextPage<InitialProps> = ({ initialEvents, initialFeed }) => {
         <link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/`} />
       </Head>
       <PageWrapper>
-        <FrontPageView events={eventResult.data} feed={feedResult.data} />
+        <FrontPageView events={events} feed={feed} />
       </PageWrapper>
     </>
   );
diff --git a/src/pages/kilta/toiminta.tsx b/src/pages/kilta/toiminta.tsx
index 08cdd23..d773e26 100644
--- a/src/pages/kilta/toiminta.tsx
+++ b/src/pages/kilta/toiminta.tsx
@@ -16,8 +16,8 @@ interface InitialProps {
 }
 
 const ActualPage: NextPage<InitialProps> = ({ initialEvents, initialFeed }) => {
-  const eventResult = useSWR<Event[]>([APIPath.EVENTS, {}], fetcher, { fallbackData: initialEvents });
-  const feedResult = useSWR<Post[]>([APIPath.FEED, {}], fetcher, { fallbackData: initialFeed });
+  const { data: events } = useSWR<Event[]>([APIPath.EVENTS, {}], fetcher, { fallbackData: initialEvents });
+  const { data: feed } = useSWR<Post[]>([APIPath.FEED, {}], fetcher, { fallbackData: initialFeed });
 
   return (
     <>
@@ -25,7 +25,7 @@ const ActualPage: NextPage<InitialProps> = ({ initialEvents, initialFeed }) => {
         <link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/kilta/toiminta`} />
       </Head>
       <PageWrapper>
-        <ActualPageView events={eventResult.data} feed={feedResult.data} />
+        <ActualPageView events={events} feed={feed} />
       </PageWrapper>
     </>
   );
diff --git a/src/pages/signup/[id].tsx b/src/pages/signup/[id].tsx
index 5134d68..8ce4f8f 100644
--- a/src/pages/signup/[id].tsx
+++ b/src/pages/signup/[id].tsx
@@ -24,7 +24,7 @@ const SignUpPage: NextPage<InitialProps> = ({ initialForm }) => {
   const router = useRouter();
   const id = String(initialForm?.id ?? "");
   const URL = `${FORM_URL}${id}/`;
-  const { data, error } = useSWR<SignupForm>(URL, (url) => axios.get(url).then((res) => res.data), { fallbackData: initialForm });
+  const { data: signupForm, error } = useSWR<SignupForm>(URL, (url) => axios.get(url).then((res) => res.data), { fallbackData: initialForm });
 
   if (error) {
     console.error(error);
@@ -35,7 +35,7 @@ const SignUpPage: NextPage<InitialProps> = ({ initialForm }) => {
     return <LoadingView />;
   }
 
-  if (!data) {
+  if (!signupForm) {
     return (
       <NotFoundPage />
     );
@@ -43,7 +43,7 @@ const SignUpPage: NextPage<InitialProps> = ({ initialForm }) => {
 
   const onSubmit = async ({ formData }: ISubmitEvent<string>) => {
     const payload: Signup = {
-      signupForm_id: data.id,
+      signupForm_id: signupForm.id,
       answer: formData,
     };
 
@@ -60,11 +60,11 @@ const SignUpPage: NextPage<InitialProps> = ({ initialForm }) => {
   return (
     <>
       <Head>
-        <link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/signup/${data.id}`} />
+        <link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/signup/${signupForm.id}`} />
       </Head>
       <PageWrapper>
         <SignUpPageView
-          signUpForm={data}
+          signUpForm={signupForm}
           formData={{}}
           onChange={noop}
           onSubmit={onSubmit}
diff --git a/src/pages/yritysyhteistyo.tsx b/src/pages/yritysyhteistyo.tsx
index 7a057a1..5cb31a7 100644
--- a/src/pages/yritysyhteistyo.tsx
+++ b/src/pages/yritysyhteistyo.tsx
@@ -13,14 +13,14 @@ interface InitialProps {
 }
 
 const CorporatePage: NextPage<InitialProps> = ({ initialJobAds }) => {
-  const { data } = useSWR<JobAd[]>([APIPath.JOBADS, {}], fetcher, { fallbackData: initialJobAds });
+  const { data: jobAds } = useSWR<JobAd[]>([APIPath.JOBADS, {}], fetcher, { fallbackData: initialJobAds });
   return (
     <>
       <Head>
         <link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/yritysyhteistyo`} />
       </Head>
       <PageWrapper>
-        <CorporatePageView jobAds={data as JobAd[]} />
+        <CorporatePageView jobAds={jobAds} />
       </PageWrapper>
     </>
   );