diff --git a/src/pages/projects.astro b/src/pages/projects.astro
index d2245452..f77411e2 100644
--- a/src/pages/projects.astro
+++ b/src/pages/projects.astro
@@ -12,7 +12,7 @@ const metadata: Partial<SeoMetadata> = {
 	title: "Projects",
 };
 ---
-<BaseLayout>
+<BaseLayout {...metadata}>
   <ProjectsIntro />
   {projects.map((project, index) =>(
     <ProjectSection id={project.data.id}>
diff --git a/src/pages/tags/[slug].astro b/src/pages/tags/[slug].astro
index 2b11d964..517c29dd 100644
--- a/src/pages/tags/[slug].astro
+++ b/src/pages/tags/[slug].astro
@@ -42,7 +42,7 @@ export async function getStaticPaths() {
 const { slug } = Astro.params as TagParams;
 const { tag } = Astro.props as TagProps;
 const metadata: Partial<SeoMetadata> = {
-	title: tag.title,
+	title: `#${slug}`,
 };
 ---
 <BaseLayout {...metadata}>
diff --git a/src/pages/tags/index.astro b/src/pages/tags/index.astro
index b6e575cf..5a8a6534 100644
--- a/src/pages/tags/index.astro
+++ b/src/pages/tags/index.astro
@@ -8,7 +8,7 @@ import "./_tags.css";
 
 const tags = await getCollection("tags");
 const metadata: Partial<SeoMetadata> = {
-	title: tag.title,
+	title: "Tags",
 };
 ---
 <BaseLayout {...metadata}>
@@ -21,7 +21,7 @@ const metadata: Partial<SeoMetadata> = {
                   <h2 class="tags__item__letter">{letter.data.name}</h2>
                   <ul class="tags__item__list flex column-wrap">
                     {tags[index].data.tags.map((tag) => (
-                        <li class="tag__item font-sans-serif">
+                        <li class="tag__item font-sans-serif --is-clickable">
                             <a href={`${PAGES_ROUTES.TAGS}/${tag.slug}`} class="--underline-on-hover">{tag.name}(&times;{tag.count})</a>
                         </li>
                         <script is:inline type="application/ld+json" set:html={JSON.stringify({
diff --git a/src/ui/modules/core/components/articleCard/ArticleCard.astro b/src/ui/modules/core/components/articleCard/ArticleCard.astro
index 3dc49726..47c17f32 100644
--- a/src/ui/modules/core/components/articleCard/ArticleCard.astro
+++ b/src/ui/modules/core/components/articleCard/ArticleCard.astro
@@ -1,22 +1,22 @@
 ---
-import { Image } from "astro:assets";
-import type { CollectionEntry } from "astro:content";
-import { ArticleType } from "@application/dto/article/types";
-import { PAGES_ROUTES } from "@const/index";
-import { getLocation } from "@modules/core/utils/getLocation";
-import clsx from "clsx";
-import "./article-card.css";
-
-type ArticleCardProps = CollectionEntry<"articles">;
-
-const article = Astro.props as ArticleCardProps;
-const { pathname } = Astro.url;
-const location = getLocation(Astro.url);
+import { Image } from "astro:assets";
+import type { CollectionEntry } from "astro:content";
+import { ArticleType } from "@application/dto/article/types";
+import { PAGES_ROUTES } from "@const/index";
+import { getLocation } from "@modules/core/utils/getLocation";
+import clsx from "clsx";
+import "./article-card.css";
+
+type ArticleCardProps = CollectionEntry<"articles">;
+
+const article = Astro.props as ArticleCardProps;
+const { pathname } = Astro.url;
+const location = getLocation(Astro.url);
 ---
-<a class="article__link-card" href={`${PAGES_ROUTES.ARTICLES}/${article.data.slug}`} aria-label={article.data.title}>{' '}</a>
+<a class="article-card__link" href={`${PAGES_ROUTES.ARTICLES}/${article.data.slug}`} aria-label={article.data.title}>{' '}</a>
 <article
     class={clsx(
-        'article__item',
+        'article-card__item',
         {
           '--default-variant': article.data.variant === ArticleType.DEFAULT,
           '--no-image-variant': article.data.variant === ArticleType.NO_IMAGE,
@@ -26,7 +26,7 @@ const location = getLocation(Astro.url);
 >
   {article.data.featuredImage && (
       <Image
-          class="article__item__featured-image"
+          class="article-card__featured-image"
           src={article.data.featuredImage.url}
           width={article.data.featuredImage.details.width}
           height={article.data.featuredImage.details.height}
@@ -34,18 +34,18 @@ const location = getLocation(Astro.url);
           transition:name=`featured-image-${pathname}`
       />
   )}
-    <time class="article__item__publish-date" datetime={article.data.publishDate}>
+    <time class="article-card__publish-date" datetime={article.data.publishDate}>
       {article.data.publishDate}
     </time>
-    <h3 class="article__title font-serif inner-section-title">{article.data.title}</h3>
-    <p class="article__author">
-        by <a href={`${PAGES_ROUTES.TAGS}/${article.data.author.slug}`} class="article__author__name --is-clickable --underline-on-hover ">{article.data.author.name}</a>
+    <h3 class="article-card__title font-serif inner-section-title">{article.data.title}</h3>
+    <p class="article-card__author">
+        by <a href={`${PAGES_ROUTES.TAGS}/${article.data.author.slug}`} class="article-card__author__name --is-clickable --underline-on-hover ">{article.data.author.name}</a>
     </p>
-    <p class="article__excerpt">{article.data.description}</p>
-    <p class="article__reading-time">{article.data.readingTime} minutes read</p>
-    <ul class="article__tags__list flex">
+    <p class="article-card__excerpt">{article.data.description}</p>
+    <p class="article-card__reading-time">{article.data.readingTime} minutes read</p>
+    <ul class="article-card__tags__list flex">
       {article.data.tags?.map(({ slug, name }, index) => (
-          <a class="article__tag__item --underline-on-hover --is-clickable" href={`${PAGES_ROUTES.TAGS}/${slug}`} style={`--inline-index: ${String(index)}`}>
+          <a class="article-card__tag__item --underline-on-hover --is-clickable" href={`${PAGES_ROUTES.TAGS}/${slug}`} style={`--inline-index: ${String(index)}`}>
               #{name}
           </a>
       ))}
diff --git a/src/ui/modules/core/components/articleCard/ArticleCard.tsx b/src/ui/modules/core/components/articleCard/ArticleCard.tsx
index 167c8fcd..16411d98 100644
--- a/src/ui/modules/core/components/articleCard/ArticleCard.tsx
+++ b/src/ui/modules/core/components/articleCard/ArticleCard.tsx
@@ -32,12 +32,12 @@ export const ArticleCard = ({ children, location: origin, data }: ArticleCardPro
 
 	return (
 		<>
-			<a className={"article__link-card"} href={`${PAGES_ROUTES.ARTICLES}/${data.slug}`} aria-label={data.title}>
+			<a className={"article-card__link"} href={`${PAGES_ROUTES.ARTICLES}/${data.slug}`} aria-label={data.title}>
 				{" "}
 			</a>
 			<article
 				className={clsx(
-					"article__item",
+					"article-card__item",
 					{
 						"--default-variant": data.variant === ArticleType.DEFAULT,
 						"--no-image-variant": data.variant === ArticleType.NO_IMAGE,
diff --git a/src/ui/modules/core/components/articleCard/article-card.css b/src/ui/modules/core/components/articleCard/article-card.css
index 87e95762..6537642b 100644
--- a/src/ui/modules/core/components/articleCard/article-card.css
+++ b/src/ui/modules/core/components/articleCard/article-card.css
@@ -18,18 +18,18 @@
     will-change: transform;
 }
 
-.article__link-card {
+.article-card__link {
     inset: 0;
     position: absolute;
     width: 100%;
     z-index: 1;
 
-    &:hover ~ .article__item .article__tag__item {
+    &:hover ~ .article-card__item .article-card__tag__item {
         translate: 0 0;
     }
 }
 
-.article__item {
+.article-card__item {
     color: var(--white);
     display: grid;
     gap: 0.5rem 0;
diff --git a/src/ui/modules/core/components/articleCard/atoms/articleCardAuthor/ArticleCardAuthor.tsx b/src/ui/modules/core/components/articleCard/atoms/articleCardAuthor/ArticleCardAuthor.tsx
index 6bfafe23..832a2cf8 100644
--- a/src/ui/modules/core/components/articleCard/atoms/articleCardAuthor/ArticleCardAuthor.tsx
+++ b/src/ui/modules/core/components/articleCard/atoms/articleCardAuthor/ArticleCardAuthor.tsx
@@ -8,9 +8,9 @@ export interface ArticleCardAuthorProps {
 }
 
 export const ArticleCardAuthor = ({ children, slug }: ArticleCardAuthorProps) => (
-	<p className={"article__author"}>
+	<p className={"article-card__author"}>
 		by{" "}
-		<a href={`${PAGES_ROUTES.TAGS}/${slug}`} className="article__author__name --underline-on-hover --is-clickable">
+		<a href={`${PAGES_ROUTES.TAGS}/${slug}`} className="article-card__author__name --underline-on-hover --is-clickable">
 			{children}
 		</a>
 	</p>
diff --git a/src/ui/modules/core/components/articleCard/atoms/articleCardAuthor/article-card-author.css b/src/ui/modules/core/components/articleCard/atoms/articleCardAuthor/article-card-author.css
index ebc7e8dd..b70ed929 100644
--- a/src/ui/modules/core/components/articleCard/atoms/articleCardAuthor/article-card-author.css
+++ b/src/ui/modules/core/components/articleCard/atoms/articleCardAuthor/article-card-author.css
@@ -1,4 +1,4 @@
-.article__author {
+.article-card__author {
     color: currentColor;
     grid-area: Article-Card-Author;
 
@@ -8,11 +8,11 @@
         z-index: 10;
     }
 
-    &:has(a:hover) ~ .article__tags__list .article__tag__item {
+    &:has(a:hover) ~ .article-card__tags__list .article-card__tag__item {
         translate: 0 0;
     }
 }
 
-.article__author__name {
+.article-card__author__name {
     display: inline-block;
 }
\ No newline at end of file
diff --git a/src/ui/modules/core/components/articleCard/atoms/articleCardExcerpt/ArticleCardExcerpt.tsx b/src/ui/modules/core/components/articleCard/atoms/articleCardExcerpt/ArticleCardExcerpt.tsx
index 3273df79..b082dc97 100644
--- a/src/ui/modules/core/components/articleCard/atoms/articleCardExcerpt/ArticleCardExcerpt.tsx
+++ b/src/ui/modules/core/components/articleCard/atoms/articleCardExcerpt/ArticleCardExcerpt.tsx
@@ -6,5 +6,5 @@ export interface ArticleCardExcerptProps {
 }
 
 export const ArticleCardExcerpt = ({ children }: ArticleCardExcerptProps) => (
-	<p className="article__excerpt">{children}</p>
+	<p className="article-card__excerpt">{children}</p>
 );
diff --git a/src/ui/modules/core/components/articleCard/atoms/articleCardExcerpt/article-card-excerpt.css b/src/ui/modules/core/components/articleCard/atoms/articleCardExcerpt/article-card-excerpt.css
index 5ac67e9b..54bbc8cc 100644
--- a/src/ui/modules/core/components/articleCard/atoms/articleCardExcerpt/article-card-excerpt.css
+++ b/src/ui/modules/core/components/articleCard/atoms/articleCardExcerpt/article-card-excerpt.css
@@ -1,4 +1,4 @@
-.article__excerpt {
+.article-card__excerpt {
     color: currentColor;
     grid-area: Article-Card-Excerpt;
 }
\ No newline at end of file
diff --git a/src/ui/modules/core/components/articleCard/atoms/articleCardImage/ArticleCardImage.tsx b/src/ui/modules/core/components/articleCard/atoms/articleCardImage/ArticleCardImage.tsx
index b03b37ba..27ace189 100644
--- a/src/ui/modules/core/components/articleCard/atoms/articleCardImage/ArticleCardImage.tsx
+++ b/src/ui/modules/core/components/articleCard/atoms/articleCardImage/ArticleCardImage.tsx
@@ -4,5 +4,5 @@ import "./article-card-image.css";
 export type ArticleCardImageProps = Pick<HTMLImageElement, "src" | "alt">;
 
 export const ArticleCardImage = ({ src, alt }: ArticleCardImageProps) => (
-	<Image classNames="article__item__featured-image" src={src} alt={alt} />
+	<Image classNames="article-card__featured-image" src={src} alt={alt} />
 );
diff --git a/src/ui/modules/core/components/articleCard/atoms/articleCardImage/article-card-image.css b/src/ui/modules/core/components/articleCard/atoms/articleCardImage/article-card-image.css
index 7a7d23aa..4b002704 100644
--- a/src/ui/modules/core/components/articleCard/atoms/articleCardImage/article-card-image.css
+++ b/src/ui/modules/core/components/articleCard/atoms/articleCardImage/article-card-image.css
@@ -1,4 +1,4 @@
-.article__item__featured-image {
+.article-card__featured-image {
     grid-area: Article-Card-Featured-Image;
     object-fit: cover;
     z-index: 0;
diff --git a/src/ui/modules/core/components/articleCard/atoms/articleCardPublishDate/ArticleCardPublishDate.tsx b/src/ui/modules/core/components/articleCard/atoms/articleCardPublishDate/ArticleCardPublishDate.tsx
index 449be208..227692e7 100644
--- a/src/ui/modules/core/components/articleCard/atoms/articleCardPublishDate/ArticleCardPublishDate.tsx
+++ b/src/ui/modules/core/components/articleCard/atoms/articleCardPublishDate/ArticleCardPublishDate.tsx
@@ -7,7 +7,7 @@ export interface ArticleCardPublishDateProps {
 }
 
 export const ArticleCardPublishDate = ({ children, publishDate }: ArticleCardPublishDateProps) => (
-	<time className={"article__item__publish-date"} dateTime={publishDate}>
+	<time className={"article-card__publish-date"} dateTime={publishDate}>
 		{children}
 	</time>
 );
diff --git a/src/ui/modules/core/components/articleCard/atoms/articleCardPublishDate/article-card-publish-date.css b/src/ui/modules/core/components/articleCard/atoms/articleCardPublishDate/article-card-publish-date.css
index c57e8027..389ec8a3 100644
--- a/src/ui/modules/core/components/articleCard/atoms/articleCardPublishDate/article-card-publish-date.css
+++ b/src/ui/modules/core/components/articleCard/atoms/articleCardPublishDate/article-card-publish-date.css
@@ -1,3 +1,3 @@
-.article__item__publish-date {
+.article-card__publish-date {
     grid-area: Article-Card-Publish-Date;
 }
\ No newline at end of file
diff --git a/src/ui/modules/core/components/articleCard/atoms/articleCardReadingTime/ArticleCardReadingTime.tsx b/src/ui/modules/core/components/articleCard/atoms/articleCardReadingTime/ArticleCardReadingTime.tsx
index 9b113c4f..5e7de6dd 100644
--- a/src/ui/modules/core/components/articleCard/atoms/articleCardReadingTime/ArticleCardReadingTime.tsx
+++ b/src/ui/modules/core/components/articleCard/atoms/articleCardReadingTime/ArticleCardReadingTime.tsx
@@ -6,5 +6,5 @@ export interface ArticleCardReadingTimeProps {
 }
 
 export const ArticleCardReadingTime = ({ children }: ArticleCardReadingTimeProps) => (
-	<p className={"article__reading-time"}>{children}</p>
+	<p className={"article-card__reading-time"}>{children}</p>
 );
diff --git a/src/ui/modules/core/components/articleCard/atoms/articleCardReadingTime/article-card-reading-time.css b/src/ui/modules/core/components/articleCard/atoms/articleCardReadingTime/article-card-reading-time.css
index 8265ba96..7f57d5a3 100644
--- a/src/ui/modules/core/components/articleCard/atoms/articleCardReadingTime/article-card-reading-time.css
+++ b/src/ui/modules/core/components/articleCard/atoms/articleCardReadingTime/article-card-reading-time.css
@@ -1,4 +1,4 @@
-.article__reading-time {
+.article-card__reading-time {
     grid-area: Article-Card-Reading-Time;
     justify-self: flex-end;
 }
diff --git a/src/ui/modules/core/components/articleCard/atoms/articleCardTagItem/ArticleCardTagItem.tsx b/src/ui/modules/core/components/articleCard/atoms/articleCardTagItem/ArticleCardTagItem.tsx
index fb5d3a15..8babf4e6 100644
--- a/src/ui/modules/core/components/articleCard/atoms/articleCardTagItem/ArticleCardTagItem.tsx
+++ b/src/ui/modules/core/components/articleCard/atoms/articleCardTagItem/ArticleCardTagItem.tsx
@@ -12,7 +12,7 @@ export interface ArticleCardTagItemProps {
 export const ArticleCardTagItem = ({ children, tag, style }: ArticleCardTagItemProps) => (
 	<a
 		key={tag.name}
-		className="article__tag__item --underline-on-hover --is-clickable"
+		className="article-card__tag__item --underline-on-hover --is-clickable"
 		href={`${PAGES_ROUTES.TAGS}/${tag.slug}`}
 		style={style}
 	>
diff --git a/src/ui/modules/core/components/articleCard/atoms/articleCardTagItem/article-card-tag-item.css b/src/ui/modules/core/components/articleCard/atoms/articleCardTagItem/article-card-tag-item.css
index f8243bbc..5809a02a 100644
--- a/src/ui/modules/core/components/articleCard/atoms/articleCardTagItem/article-card-tag-item.css
+++ b/src/ui/modules/core/components/articleCard/atoms/articleCardTagItem/article-card-tag-item.css
@@ -1,4 +1,4 @@
-.article__tag__item {
+.article-card__tag__item {
     transition: all 0.3s ease;
     transition-delay: calc(var(--inline-index) * 0.1s);
     translate: 0 100px;
diff --git a/src/ui/modules/core/components/articleCard/atoms/articleCardTagsList/ArticleCardTagsList.tsx b/src/ui/modules/core/components/articleCard/atoms/articleCardTagsList/ArticleCardTagsList.tsx
index 556e522d..1ae59f75 100644
--- a/src/ui/modules/core/components/articleCard/atoms/articleCardTagsList/ArticleCardTagsList.tsx
+++ b/src/ui/modules/core/components/articleCard/atoms/articleCardTagsList/ArticleCardTagsList.tsx
@@ -6,5 +6,5 @@ export interface ArticleCardTagsListProps {
 }
 
 export const ArticleCardTagsList = ({ children }: ArticleCardTagsListProps) => (
-	<ul className="article__tags__list flex">{children}</ul>
+	<ul className="article-card__tags__list flex">{children}</ul>
 );
diff --git a/src/ui/modules/core/components/articleCard/atoms/articleCardTagsList/article-card-tags-list.css b/src/ui/modules/core/components/articleCard/atoms/articleCardTagsList/article-card-tags-list.css
index 3065cf40..a3e7facf 100644
--- a/src/ui/modules/core/components/articleCard/atoms/articleCardTagsList/article-card-tags-list.css
+++ b/src/ui/modules/core/components/articleCard/atoms/articleCardTagsList/article-card-tags-list.css
@@ -1,4 +1,4 @@
-.article__tags__list {
+.article-card__tags__list {
     color: currentColor;
     gap: 0 1rem;
     grid-area: Article-Card-Tags;
@@ -6,7 +6,7 @@
     text-transform: lowercase;
     z-index: 10;
 
-    &:hover .article__tag__item {
+    &:hover .article-card__tag__item {
         translate: 0 0;
     }
 }
diff --git a/src/ui/modules/core/components/articleCard/atoms/articleCardTitle/ArticleCardTitle.tsx b/src/ui/modules/core/components/articleCard/atoms/articleCardTitle/ArticleCardTitle.tsx
index e0b927bc..0e31579f 100644
--- a/src/ui/modules/core/components/articleCard/atoms/articleCardTitle/ArticleCardTitle.tsx
+++ b/src/ui/modules/core/components/articleCard/atoms/articleCardTitle/ArticleCardTitle.tsx
@@ -6,5 +6,5 @@ export interface ArticleCardTitleProps {
 }
 
 export const ArticleCardTitle = ({ children }: ArticleCardTitleProps) => (
-	<h3 className="article__title font-serif inner-section-title">{children}</h3>
+	<h3 className="article-card__title font-serif inner-section-title">{children}</h3>
 );
diff --git a/src/ui/modules/core/components/articleCard/atoms/articleCardTitle/article-card-title.css b/src/ui/modules/core/components/articleCard/atoms/articleCardTitle/article-card-title.css
index 8c6ca9cc..1bdf4819 100644
--- a/src/ui/modules/core/components/articleCard/atoms/articleCardTitle/article-card-title.css
+++ b/src/ui/modules/core/components/articleCard/atoms/articleCardTitle/article-card-title.css
@@ -1,4 +1,4 @@
-.article__title {
+.article-card__title {
     align-self: center;
     color: currentColor;
     grid-area: Article-Card-Title;
diff --git a/src/ui/modules/core/components/footer/Footer.astro b/src/ui/modules/core/components/footer/Footer.astro
index 72aa251d..6d210d34 100644
--- a/src/ui/modules/core/components/footer/Footer.astro
+++ b/src/ui/modules/core/components/footer/Footer.astro
@@ -10,7 +10,7 @@ const currentYear = new Date().getFullYear();
 <footer>
   <section class="footer__wrapper common-wrapper">
     <div class="footer__logo flex row-wrap justify-center">
-      <a href="/public">
+      <a href={PAGES_ROUTES.HOME}>
           <Fragment set:html={logo} />
       </a>
     </div>
diff --git a/src/ui/modules/core/components/linkWithArrow/LinkWithArrow.astro b/src/ui/modules/core/components/linkWithArrow/LinkWithArrow.astro
index 8180a8a0..da21e9d0 100644
--- a/src/ui/modules/core/components/linkWithArrow/LinkWithArrow.astro
+++ b/src/ui/modules/core/components/linkWithArrow/LinkWithArrow.astro
@@ -3,12 +3,11 @@ import horizontalArrowRaw from "@assets/images/svg/left-arrow.svg?raw";
 import "./link-with-arrow.css";
 
 interface LinkWithArrowProps {
-	title: string;
 	href: string;
 	classNames: string;
 }
 
-const { href, classNames, title } = Astro.props as LinkWithArrowProps;
+const { href, classNames } = Astro.props as LinkWithArrowProps;
 ---
 <a href={href} class:list={[`${classNames} link-with-arrow flex align-center --underline-on-hover --is-clickable`]}>
     <slot />
diff --git a/src/ui/modules/core/components/relatedArticles/atoms/relatedArticleCard/RelatedArticleCard.astro b/src/ui/modules/core/components/relatedArticles/atoms/relatedArticleCard/RelatedArticleCard.astro
index 44910d91..41ffb351 100644
--- a/src/ui/modules/core/components/relatedArticles/atoms/relatedArticleCard/RelatedArticleCard.astro
+++ b/src/ui/modules/core/components/relatedArticles/atoms/relatedArticleCard/RelatedArticleCard.astro
@@ -1,21 +1,21 @@
 ---
-import { Image } from "astro:assets";
-import type { CollectionEntry } from "astro:content";
-import { ArticleType } from "@application/dto/article/types";
-import { PAGES_ROUTES } from "@const/index";
-import clsx from "clsx";
-import "./related-article-card.css";
-
-type RelatedArticleCardProps = CollectionEntry<"articles">;
-
-const { pathname } = Astro.url;
-const relatedArticle = Astro.props as RelatedArticleCardProps;
+import { Image } from "astro:assets";
+import type { CollectionEntry } from "astro:content";
+import { ArticleType } from "@application/dto/article/types";
+import { PAGES_ROUTES } from "@const/index";
+import clsx from "clsx";
+import "./related-article-card.css";
+
+type RelatedArticleCardProps = CollectionEntry<"articles">;
+
+const { pathname } = Astro.url;
+const relatedArticle = Astro.props as RelatedArticleCardProps;
 ---
-<a class="related-article__link-card" href={`${PAGES_ROUTES.ARTICLES}/${relatedArticle.data.slug}`}
+<a class="related-article-card__link" href={`${PAGES_ROUTES.ARTICLES}/${relatedArticle.data.slug}`}
    aria-label={relatedArticle.data.title}>{' '}</a>
 <article
     class={clsx(
-        'related-article__item',
+        'related-article-card__item',
         {
           '--default-variant': relatedArticle.data.variant === ArticleType.DEFAULT,
           '--no-image-variant': relatedArticle.data.variant === ArticleType.NO_IMAGE,
@@ -24,7 +24,7 @@ const relatedArticle = Astro.props as RelatedArticleCardProps;
 >
   {relatedArticle.data.featuredImage && (
       <Image
-          class="related-article__item__featured-image"
+          class="related-article-card__item__featured-image"
           src={relatedArticle.data.featuredImage.url}
           width={relatedArticle.data.featuredImage.details.width}
           height={relatedArticle.data.featuredImage.details.height}
@@ -32,18 +32,18 @@ const relatedArticle = Astro.props as RelatedArticleCardProps;
           transition:name=`featured-image-${pathname}`
       />
   )}
-    <time class="related-article__item__publish-date" datetime={relatedArticle.data.publishDate}>
+    <time class="related-article-card__item__publish-date" datetime={relatedArticle.data.publishDate}>
       {relatedArticle.data.publishDate}
     </time>
-    <h3 class="related-article__title font-serif inner-section-title">{relatedArticle.data.title}</h3>
-    <p class="related-article__author">
-        by <a href={`${PAGES_ROUTES.TAGS}/${relatedArticle.data.author.slug}`} class="related-article__author__name --underline-on-hover --is-clickable">{relatedArticle.data.author.name}</a>
+    <h3 class="related-article-card__title font-serif inner-section-title">{relatedArticle.data.title}</h3>
+    <p class="related-article-card__author">
+        by <a href={`${PAGES_ROUTES.TAGS}/${relatedArticle.data.author.slug}`} class="related-article-card__author__name --underline-on-hover --is-clickable">{relatedArticle.data.author.name}</a>
     </p>
-    <p class="related-article__excerpt">{relatedArticle.data.description}</p>
-    <p class="related-article__reading-time">{relatedArticle.data.readingTime} minutes read</p>
-    <ul class="related-article__tags__list flex">
+    <p class="related-article-card__excerpt">{relatedArticle.data.description}</p>
+    <p class="related-article-card__reading-time">{relatedArticle.data.readingTime} minutes read</p>
+    <ul class="related-article-card__tags__list flex">
       {relatedArticle.data.tags?.map(({ slug, name }, index) => (
-          <a class="related-article__tag__item --underline-on-hover --is-clickable" href={`${PAGES_ROUTES.TAGS}/${slug}`} style={`--inline-index: ${String(index)}`}>
+          <a class="related-article-card__tag__item --underline-on-hover --is-clickable" href={`${PAGES_ROUTES.TAGS}/${slug}`} style={`--inline-index: ${String(index)}`}>
               #{name}
           </a>
       ))}
diff --git a/src/ui/modules/core/components/relatedArticles/atoms/relatedArticleCard/related-article-card.css b/src/ui/modules/core/components/relatedArticles/atoms/relatedArticleCard/related-article-card.css
index a52d71b8..83354bab 100644
--- a/src/ui/modules/core/components/relatedArticles/atoms/relatedArticleCard/related-article-card.css
+++ b/src/ui/modules/core/components/relatedArticles/atoms/relatedArticleCard/related-article-card.css
@@ -9,7 +9,7 @@
     will-change: transform;
 }
 
-.related-article__item {
+.related-article-card__item {
     display: grid;
     gap: 0.5rem 0;
     height: 100%;
@@ -37,48 +37,48 @@
     }
 }
 
-.related-article__excerpt {
+.related-article-card__excerpt {
     color: currentColor;
     grid-area: Excerpt;
 }
 
-.related-article__item__featured-image {
+.related-article-card__item__featured-image {
     grid-area: Featured-Image;
     object-fit: cover;
     z-index: 0;
 }
 
-.related-article__item__publish-date {
+.related-article-card__item__publish-date {
     grid-area: Publish-Date;
 }
 
-.related-article__reading-time {
+.related-article-card__reading-time {
     grid-area: Reading-Time;
     justify-self: flex-end;
 }
 
-.related-article__tag__item {
+.related-article-card__tag__item {
     transition: all 0.3s ease;
     transition-delay: calc(var(--inline-index) * 0.1s);
     translate: 0 100px;
 }
 
-.related-article__tags__list:hover .related-article__tag__item {
+.related-article-card__tags__list:hover .related-article-card__tag__item {
     translate: 0 0;
 }
 
-.related-article__link-card {
+.related-article-card__link {
     inset: 0;
     position: absolute;
     width: 100%;
     z-index: 1;
 
-    &:hover ~ .related-article__item .related-article__tag__item {
+    &:hover ~ .related-article-card__item .related-article-card__tag__item {
         translate: 0 0;
     }
 }
 
-.related-article__author {
+.related-article-card__author {
     color: currentColor;
     grid-area: Author;
 
@@ -88,19 +88,19 @@
         z-index: 10;
     }
 
-    &:has(a:hover) ~ .related-article__tags__list .related-article__tag__item {
+    &:has(a:hover) ~ .related-article-card__tags__list .related-article-card__tag__item {
         translate: 0 0;
     }
 }
 
-.related-article__title {
+.related-article-card__title {
     align-self: center;
     color: currentColor;
     grid-area: Title;
     letter-spacing: normal;
 }
 
-.related-article__tags__list {
+.related-article-card__tags__list {
     color: currentColor;
     gap: 0 1rem;
     grid-area: Tags;
@@ -109,6 +109,6 @@
     z-index: 10;
 }
 
-.related-article__author__name {
+.related-article-card__author__name {
     display: inline-block;
 }
\ No newline at end of file