diff --git a/frontend/componentTables/termComponents.tsx b/frontend/componentTables/termComponents.tsx
index 329e830a..97ce97e1 100644
--- a/frontend/componentTables/termComponents.tsx
+++ b/frontend/componentTables/termComponents.tsx
@@ -1,39 +1,39 @@
-import PriorConsulTerm from "@/components/terms/Term_PriorConsul"
-import FactionTerm from "@/components/terms/Term_Faction"
-import SecretTerm from "@/components/terms/Term_Secret"
-import SenatorTerm from "@/components/terms/Term_Senator"
-import MortalityPhaseTerm from "@/components/terms/Term_MortalityPhase"
-import ForumPhaseTerm from "@/components/terms/Term_ForumPhase"
-import RevolutionPhaseTerm from "@/components/terms/Term_RevolutionPhase"
-import CombatPhaseTerm from "@/components/terms/Term_CombatPhase"
-import PopulationPhaseTerm from "@/components/terms/Term_PopulationPhase"
-import RevenuePhaseTerm from "@/components/terms/Term_RevenuePhase"
-import SenatePhaseTerm from "@/components/terms/Term_SenatePhase"
-import TurnTerm from "@/components/terms/Term_Turn"
-import FactionPhaseTerm from "@/components/terms/Term_FactionPhase"
-import FinalForumPhaseTerm from "@/components/terms/Term_FinalForumPhase"
-import RomeConsulTerm from "@/components/terms/Term_RomeConsul"
-import HraoTerm from "@/components/terms/Term_Hrao"
-import WarTerm from "@/components/terms/Term_War"
-import ActiveWarTerm from "@/components/terms/Term_ActiveWar"
-import FactionLeaderTerm from "@/components/terms/Term_FactionLeader"
-import AlignedSenatorTerm from "@/components/terms/Term_AlignedSenator"
-import UnalignedSenatorTerm from "@/components/terms/Term_UnalignedSenator"
-import FamilyTerm from "@/components/terms/Term_Family"
-import StatesmanTerm from "@/components/terms/Term_Statesman"
-import ImminentWarTerm from "@/components/terms/Term_ImminentWar"
-import InactiveWarTerm from "@/components/terms/Term_InactiveWar"
-import EnemyLeaderTerm from "@/components/terms/Term_EnemyLeader"
-import MatchingWarsAndEnemyLeadersTerm from "@/components/terms/Term_MatchingWarsAndEnemyLeadersTerm"
-import MilitaryTerm from "@/components/terms/Term_Military"
-import OratoryTerm from "@/components/terms/Term_Oratory"
-import LoyaltyTerm from "@/components/terms/Term_Loyalty"
-import InfluenceTerm from "@/components/terms/Term_Influence"
-import PersonalTreasuryTerm from "@/components/terms/Term_PersonalTreasury"
-import PopularityTerm from "@/components/terms/Term_Popularity"
-import VotesTerm from "@/components/terms/Term_Votes"
-import KnightsTerm from "@/components/terms/Term_Knights"
-import TalentTerm from "@/components/terms/Term_Talents"
+import PriorConsulTerm from "@/components/terms/PriorConsulTerm"
+import FactionTerm from "@/components/terms/FactionTerm"
+import SecretTerm from "@/components/terms/SecretTerm"
+import SenatorTerm from "@/components/terms/SenatorTerm"
+import MortalityPhaseTerm from "@/components/terms/MortalityPhaseTerm"
+import ForumPhaseTerm from "@/components/terms/ForumPhaseTerm"
+import RevolutionPhaseTerm from "@/components/terms/RevolutionPhaseTerm"
+import CombatPhaseTerm from "@/components/terms/CombatPhaseTerm"
+import PopulationPhaseTerm from "@/components/terms/PopulationPhaseTerm"
+import RevenuePhaseTerm from "@/components/terms/RevenuePhaseTerm"
+import SenatePhaseTerm from "@/components/terms/SenatePhaseTerm"
+import TurnTerm from "@/components/terms/TurnTerm"
+import FactionPhaseTerm from "@/components/terms/FactionPhaseTerm"
+import FinalForumPhaseTerm from "@/components/terms/FinalForumPhaseTerm"
+import RomeConsulTerm from "@/components/terms/RomeConsulTerm"
+import HraoTerm from "@/components/terms/HraoTerm"
+import WarTerm from "@/components/terms/WarTerm"
+import ActiveWarTerm from "@/components/terms/ActiveWarTerm"
+import FactionLeaderTerm from "@/components/terms/FactionLeaderTerm"
+import AlignedSenatorTerm from "@/components/terms/AlignedSenatorTerm"
+import UnalignedSenatorTerm from "@/components/terms/UnalignedSenatorTerm"
+import FamilyTerm from "@/components/terms/FamilyTerm"
+import StatesmanTerm from "@/components/terms/StatesmanTerm"
+import ImminentWarTerm from "@/components/terms/ImminentWarTerm"
+import InactiveWarTerm from "@/components/terms/InactiveWarTerm"
+import EnemyLeaderTerm from "@/components/terms/EnemyLeaderTerm"
+import MatchingWarsAndEnemyLeadersTerm from "@/components/terms/MatchingWarsAndEnemyLeadersTerm"
+import MilitaryTerm from "@/components/terms/MilitaryTerm"
+import OratoryTerm from "@/components/terms/OratoryTerm"
+import LoyaltyTerm from "@/components/terms/LoyaltyTerm"
+import InfluenceTerm from "@/components/terms/InfluenceTerm"
+import PersonalTreasuryTerm from "@/components/terms/PersonalTreasuryTerm"
+import PopularityTerm from "@/components/terms/PopularityTerm"
+import VotesTerm from "@/components/terms/VotesTerm"
+import KnightsTerm from "@/components/terms/KnightsTerm"
+import TalentTerm from "@/components/terms/TalentsTerm"
 
 interface TermComponents {
   [key: string]: JSX.Element
diff --git a/frontend/components/ActionLog.tsx b/frontend/components/ActionLog.tsx
index 5f3c09ee..2a2a0c23 100644
--- a/frontend/components/ActionLog.tsx
+++ b/frontend/components/ActionLog.tsx
@@ -1,18 +1,18 @@
 import ActionLog from "@/classes/ActionLog"
-import NewFactionLeaderActionLog from "@/components/actionLogs/ActionLog_NewFactionLeader"
-import MortalityActionLog from "@/components/actionLogs/ActionLog_Mortality"
-import TemporaryRomeConsulActionLog from "@/components/actionLogs/ActionLog_TemporaryRomeConsul"
-import NewTurnActionLog from "@/components/actionLogs/ActionLog_NewTurn"
-import NewFamilyActionLog from "@/components/actionLogs/ActionLog_NewFamily"
-import NewWarActionLog from "@/components/actionLogs/ActionLog_NewWar"
-import MatchedWarActionLog from "@/components/actionLogs/ActionLog_MatchedWar"
-import NewEnemyLeaderActionLog from "@/components/actionLogs/ActionLog_NewEnemyLeader"
-import MatchedEnemyLeaderActionLog from "@/components/actionLogs/ActionLog_MatchedEnemyLeader"
-import NewSecretActionLog from "@/components/actionLogs/ActionLog_NewSecret"
-import PersonalRevenueActionLog from "@/components/actionLogs/ActionLog_PersonalRevenue"
-import EraEndsActionLog from "@/components/actionLogs/ActionLog_EraEnds"
-import FactionWinsActionLog from "@/components/actionLogs/ActionLog_FactionWins"
-import NewConcessionActionLog from "@/components/actionLogs/ActionLog_NewConcession"
+import NewFactionLeaderActionLog from "@/components/actionLogs/NewFactionLeaderActionLog"
+import MortalityActionLog from "@/components/actionLogs/MortalityActionLog"
+import TemporaryRomeConsulActionLog from "@/components/actionLogs/TemporaryRomeConsulActionLog"
+import NewTurnActionLog from "@/components/actionLogs/NewTurnActionLog"
+import NewFamilyActionLog from "@/components/actionLogs/NewFamilyActionLog"
+import NewWarActionLog from "@/components/actionLogs/NewWarActionLog"
+import MatchedWarActionLog from "@/components/actionLogs/MatchedWarActionLog"
+import NewEnemyLeaderActionLog from "@/components/actionLogs/NewEnemyLeaderActionLog"
+import MatchedEnemyLeaderActionLog from "@/components/actionLogs/MatchedEnemyLeaderActionLog"
+import NewSecretActionLog from "@/components/actionLogs/NewSecretActionLog"
+import PersonalRevenueActionLog from "@/components/actionLogs/PersonalRevenueActionLog"
+import EraEndsActionLog from "@/components/actionLogs/EraEndsActionLog"
+import FactionWinsActionLog from "@/components/actionLogs/FactionWinsActionLog"
+import NewConcessionActionLog from "@/components/actionLogs/NewConcessionActionLog"
 
 interface ActionLogItemProps {
   notification: ActionLog
diff --git a/frontend/components/DetailSection.tsx b/frontend/components/DetailSection.tsx
index 68dc25b1..8cb788eb 100644
--- a/frontend/components/DetailSection.tsx
+++ b/frontend/components/DetailSection.tsx
@@ -4,8 +4,8 @@ import { IconButton } from "@mui/material"
 import CloseIcon from "@mui/icons-material/Close"
 import ArrowBackIcon from "@mui/icons-material/ArrowBack"
 
-import SenatorDetailSection from "@/components/entityDetails/EntityDetail_Senator"
-import FactionDetailSection from "@/components/entityDetails/EntityDetail_Faction"
+import SenatorDetails from "@/components/entityDetails/SenatorDetails"
+import FactionDetails from "@/components/entityDetails/FactionDetails"
 import { useGameContext } from "@/contexts/GameContext"
 import SelectedDetail from "@/types/SelectedDetail"
 import terms from "@/componentTables/termComponents"
@@ -111,9 +111,9 @@ const DetailSection = () => {
         className="box-border h-full flex-1 overflow-y-auto bg-white dark:bg-neutral-600 rounded-b"
       >
         {selectedDetail.type === "Senator" && (
-          <SenatorDetailSection detailSectionRef={detailSectionRef} />
+          <SenatorDetails detailSectionRef={detailSectionRef} />
         )}
-        {selectedDetail.type === "Faction" && <FactionDetailSection />}
+        {selectedDetail.type === "Faction" && <FactionDetails />}
         {selectedDetail.type === "Term" && getTermDetails()}
       </div>
     </div>
diff --git a/frontend/components/Dialog.tsx b/frontend/components/Dialog.tsx
index 3cd3138c..2bbb6b22 100644
--- a/frontend/components/Dialog.tsx
+++ b/frontend/components/Dialog.tsx
@@ -2,10 +2,10 @@ import React from "react"
 
 import Collection from "@/classes/Collection"
 import Action from "@/classes/Action"
-import SelectFactionLeaderDialog from "@/components/actionDialogs/ActionDialog_SelectFactionLeader"
-import FaceMortalityDialog from "@/components/actionDialogs/ActionDialog_FaceMortality"
-import InitiateSituationDialog from "@/components/actionDialogs/ActionDialog_InitiateSituation"
-import AssignConcessionsDialog from "@/components/actionDialogs/ActionDialog_AssignConcessions"
+import SelectFactionLeaderDialog from "@/components/actionDialogs/SelectFactionLeaderDialog"
+import FaceMortalityDialog from "@/components/actionDialogs/FaceMortalityDialog"
+import InitiateSituationDialog from "@/components/actionDialogs/InitiateSituationDialog"
+import AssignConcessionsDialog from "@/components/actionDialogs/AssignConcessionsDialog"
 
 interface ActionDialogProps {
   open: boolean
diff --git a/frontend/components/FactionIcon.tsx b/frontend/components/FactionIcon.tsx
index 9f0e781d..cd000f40 100644
--- a/frontend/components/FactionIcon.tsx
+++ b/frontend/components/FactionIcon.tsx
@@ -1,7 +1,7 @@
 import Faction from "@/classes/Faction"
 import SelectedDetail from "@/types/SelectedDetail"
 import { useGameContext } from "@/contexts/GameContext"
-import FactionSummary from "@/components/FactionSummary"
+import FactionSummary from "@/components/entitySummaries/FactionSummary"
 
 interface FactionIconProps {
   size: number
diff --git a/frontend/components/FactionLink.tsx b/frontend/components/FactionLink.tsx
index 3302c028..4d4013a7 100644
--- a/frontend/components/FactionLink.tsx
+++ b/frontend/components/FactionLink.tsx
@@ -4,7 +4,7 @@ import { useGameContext } from "@/contexts/GameContext"
 import Faction from "@/classes/Faction"
 import SelectedDetail from "@/types/SelectedDetail"
 import FactionIcon from "@/components/FactionIcon"
-import FactionSummary from "@/components/FactionSummary"
+import FactionSummary from "@/components/entitySummaries/FactionSummary"
 
 interface FactionLinkProps {
   faction: Faction
diff --git a/frontend/components/SenatorLink.tsx b/frontend/components/SenatorLink.tsx
index 3902c83e..cca5da2d 100644
--- a/frontend/components/SenatorLink.tsx
+++ b/frontend/components/SenatorLink.tsx
@@ -3,7 +3,7 @@ import { Link } from "@mui/material"
 import { useGameContext } from "@/contexts/GameContext"
 import Senator from "@/classes/Senator"
 import SelectedDetail from "@/types/SelectedDetail"
-import SenatorSummary from "@/components/SenatorSummary"
+import SenatorSummary from "@/components/entitySummaries/SenatorSummary"
 
 interface SenatorLinkProps {
   senator: Senator
diff --git a/frontend/components/SenatorPortrait.tsx b/frontend/components/SenatorPortrait.tsx
index cd568476..20bb5ed0 100644
--- a/frontend/components/SenatorPortrait.tsx
+++ b/frontend/components/SenatorPortrait.tsx
@@ -12,7 +12,7 @@ import FactionLeaderPattern from "@/images/patterns/factionLeader.svg"
 import DeadIcon from "@/images/icons/dead.svg"
 import { useGameContext } from "@/contexts/GameContext"
 import Collection from "@/classes/Collection"
-import SenatorSummary from "@/components/SenatorSummary"
+import SenatorSummary from "@/components/entitySummaries/SenatorSummary"
 
 import Cornelius from "@/images/portraits/cornelius.png"
 import Fabius from "@/images/portraits/fabius.png"
diff --git a/frontend/components/actionDialogs/ActionDialog_AssignConcessions.tsx b/frontend/components/actionDialogs/AssignConcessionsDialog.tsx
similarity index 100%
rename from frontend/components/actionDialogs/ActionDialog_AssignConcessions.tsx
rename to frontend/components/actionDialogs/AssignConcessionsDialog.tsx
diff --git a/frontend/components/actionDialogs/ActionDialog_FaceMortality.tsx b/frontend/components/actionDialogs/FaceMortalityDialog.tsx
similarity index 100%
rename from frontend/components/actionDialogs/ActionDialog_FaceMortality.tsx
rename to frontend/components/actionDialogs/FaceMortalityDialog.tsx
diff --git a/frontend/components/actionDialogs/ActionDialog_InitiateSituation.tsx b/frontend/components/actionDialogs/InitiateSituationDialog.tsx
similarity index 100%
rename from frontend/components/actionDialogs/ActionDialog_InitiateSituation.tsx
rename to frontend/components/actionDialogs/InitiateSituationDialog.tsx
diff --git a/frontend/components/actionDialogs/ActionDialog_SelectFactionLeader.tsx b/frontend/components/actionDialogs/SelectFactionLeaderDialog.tsx
similarity index 100%
rename from frontend/components/actionDialogs/ActionDialog_SelectFactionLeader.tsx
rename to frontend/components/actionDialogs/SelectFactionLeaderDialog.tsx
diff --git a/frontend/components/actionLogs/ActionLog_EraEnds.tsx b/frontend/components/actionLogs/EraEndsActionLog.tsx
similarity index 100%
rename from frontend/components/actionLogs/ActionLog_EraEnds.tsx
rename to frontend/components/actionLogs/EraEndsActionLog.tsx
diff --git a/frontend/components/actionLogs/ActionLog_FactionWins.tsx b/frontend/components/actionLogs/FactionWinsActionLog.tsx
similarity index 100%
rename from frontend/components/actionLogs/ActionLog_FactionWins.tsx
rename to frontend/components/actionLogs/FactionWinsActionLog.tsx
diff --git a/frontend/components/actionLogs/ActionLog_MatchedEnemyLeader.tsx b/frontend/components/actionLogs/MatchedEnemyLeaderActionLog.tsx
similarity index 100%
rename from frontend/components/actionLogs/ActionLog_MatchedEnemyLeader.tsx
rename to frontend/components/actionLogs/MatchedEnemyLeaderActionLog.tsx
diff --git a/frontend/components/actionLogs/ActionLog_MatchedWar.tsx b/frontend/components/actionLogs/MatchedWarActionLog.tsx
similarity index 100%
rename from frontend/components/actionLogs/ActionLog_MatchedWar.tsx
rename to frontend/components/actionLogs/MatchedWarActionLog.tsx
diff --git a/frontend/components/actionLogs/ActionLog_Mortality.tsx b/frontend/components/actionLogs/MortalityActionLog.tsx
similarity index 100%
rename from frontend/components/actionLogs/ActionLog_Mortality.tsx
rename to frontend/components/actionLogs/MortalityActionLog.tsx
diff --git a/frontend/components/actionLogs/ActionLog_NewConcession.tsx b/frontend/components/actionLogs/NewConcessionActionLog.tsx
similarity index 100%
rename from frontend/components/actionLogs/ActionLog_NewConcession.tsx
rename to frontend/components/actionLogs/NewConcessionActionLog.tsx
diff --git a/frontend/components/actionLogs/ActionLog_NewEnemyLeader.tsx b/frontend/components/actionLogs/NewEnemyLeaderActionLog.tsx
similarity index 100%
rename from frontend/components/actionLogs/ActionLog_NewEnemyLeader.tsx
rename to frontend/components/actionLogs/NewEnemyLeaderActionLog.tsx
diff --git a/frontend/components/actionLogs/ActionLog_NewFactionLeader.tsx b/frontend/components/actionLogs/NewFactionLeaderActionLog.tsx
similarity index 100%
rename from frontend/components/actionLogs/ActionLog_NewFactionLeader.tsx
rename to frontend/components/actionLogs/NewFactionLeaderActionLog.tsx
diff --git a/frontend/components/actionLogs/ActionLog_NewFamily.tsx b/frontend/components/actionLogs/NewFamilyActionLog.tsx
similarity index 100%
rename from frontend/components/actionLogs/ActionLog_NewFamily.tsx
rename to frontend/components/actionLogs/NewFamilyActionLog.tsx
diff --git a/frontend/components/actionLogs/ActionLog_NewSecret.tsx b/frontend/components/actionLogs/NewSecretActionLog.tsx
similarity index 100%
rename from frontend/components/actionLogs/ActionLog_NewSecret.tsx
rename to frontend/components/actionLogs/NewSecretActionLog.tsx
diff --git a/frontend/components/actionLogs/ActionLog_NewTurn.tsx b/frontend/components/actionLogs/NewTurnActionLog.tsx
similarity index 100%
rename from frontend/components/actionLogs/ActionLog_NewTurn.tsx
rename to frontend/components/actionLogs/NewTurnActionLog.tsx
diff --git a/frontend/components/actionLogs/ActionLog_NewWar.tsx b/frontend/components/actionLogs/NewWarActionLog.tsx
similarity index 100%
rename from frontend/components/actionLogs/ActionLog_NewWar.tsx
rename to frontend/components/actionLogs/NewWarActionLog.tsx
diff --git a/frontend/components/actionLogs/ActionLog_PersonalRevenue.tsx b/frontend/components/actionLogs/PersonalRevenueActionLog.tsx
similarity index 100%
rename from frontend/components/actionLogs/ActionLog_PersonalRevenue.tsx
rename to frontend/components/actionLogs/PersonalRevenueActionLog.tsx
diff --git a/frontend/components/actionLogs/ActionLog_TemporaryRomeConsul.tsx b/frontend/components/actionLogs/TemporaryRomeConsulActionLog.tsx
similarity index 100%
rename from frontend/components/actionLogs/ActionLog_TemporaryRomeConsul.tsx
rename to frontend/components/actionLogs/TemporaryRomeConsulActionLog.tsx
diff --git a/frontend/components/entityDetails/EntityDetail_Faction.tsx b/frontend/components/entityDetails/FactionDetails.tsx
similarity index 100%
rename from frontend/components/entityDetails/EntityDetail_Faction.tsx
rename to frontend/components/entityDetails/FactionDetails.tsx
diff --git a/frontend/components/entityDetails/EntityDetail_Senator.tsx b/frontend/components/entityDetails/SenatorDetails.tsx
similarity index 100%
rename from frontend/components/entityDetails/EntityDetail_Senator.tsx
rename to frontend/components/entityDetails/SenatorDetails.tsx
diff --git a/frontend/components/FactionSummary.tsx b/frontend/components/entitySummaries/FactionSummary.tsx
similarity index 100%
rename from frontend/components/FactionSummary.tsx
rename to frontend/components/entitySummaries/FactionSummary.tsx
diff --git a/frontend/components/SenatorSummary.tsx b/frontend/components/entitySummaries/SenatorSummary.tsx
similarity index 100%
rename from frontend/components/SenatorSummary.tsx
rename to frontend/components/entitySummaries/SenatorSummary.tsx
diff --git a/frontend/components/terms/Term_ActiveWar.tsx b/frontend/components/terms/ActiveWarTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_ActiveWar.tsx
rename to frontend/components/terms/ActiveWarTerm.tsx
diff --git a/frontend/components/terms/Term_AlignedSenator.tsx b/frontend/components/terms/AlignedSenatorTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_AlignedSenator.tsx
rename to frontend/components/terms/AlignedSenatorTerm.tsx
diff --git a/frontend/components/terms/Term_CombatPhase.tsx b/frontend/components/terms/CombatPhaseTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_CombatPhase.tsx
rename to frontend/components/terms/CombatPhaseTerm.tsx
diff --git a/frontend/components/terms/Term_EnemyLeader.tsx b/frontend/components/terms/EnemyLeaderTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_EnemyLeader.tsx
rename to frontend/components/terms/EnemyLeaderTerm.tsx
diff --git a/frontend/components/terms/Term_FactionLeader.tsx b/frontend/components/terms/FactionLeaderTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_FactionLeader.tsx
rename to frontend/components/terms/FactionLeaderTerm.tsx
diff --git a/frontend/components/terms/Term_FactionPhase.tsx b/frontend/components/terms/FactionPhaseTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_FactionPhase.tsx
rename to frontend/components/terms/FactionPhaseTerm.tsx
diff --git a/frontend/components/terms/Term_Faction.tsx b/frontend/components/terms/FactionTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_Faction.tsx
rename to frontend/components/terms/FactionTerm.tsx
diff --git a/frontend/components/terms/Term_Family.tsx b/frontend/components/terms/FamilyTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_Family.tsx
rename to frontend/components/terms/FamilyTerm.tsx
diff --git a/frontend/components/terms/Term_FinalForumPhase.tsx b/frontend/components/terms/FinalForumPhaseTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_FinalForumPhase.tsx
rename to frontend/components/terms/FinalForumPhaseTerm.tsx
diff --git a/frontend/components/terms/Term_ForumPhase.tsx b/frontend/components/terms/ForumPhaseTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_ForumPhase.tsx
rename to frontend/components/terms/ForumPhaseTerm.tsx
diff --git a/frontend/components/terms/Term_Hrao.tsx b/frontend/components/terms/HraoTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_Hrao.tsx
rename to frontend/components/terms/HraoTerm.tsx
diff --git a/frontend/components/terms/Term_ImminentWar.tsx b/frontend/components/terms/ImminentWarTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_ImminentWar.tsx
rename to frontend/components/terms/ImminentWarTerm.tsx
diff --git a/frontend/components/terms/Term_InactiveWar.tsx b/frontend/components/terms/InactiveWarTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_InactiveWar.tsx
rename to frontend/components/terms/InactiveWarTerm.tsx
diff --git a/frontend/components/terms/Term_Influence.tsx b/frontend/components/terms/InfluenceTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_Influence.tsx
rename to frontend/components/terms/InfluenceTerm.tsx
diff --git a/frontend/components/terms/Term_Knights.tsx b/frontend/components/terms/KnightsTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_Knights.tsx
rename to frontend/components/terms/KnightsTerm.tsx
diff --git a/frontend/components/terms/Term_Loyalty.tsx b/frontend/components/terms/LoyaltyTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_Loyalty.tsx
rename to frontend/components/terms/LoyaltyTerm.tsx
diff --git a/frontend/components/terms/Term_MatchingWarsAndEnemyLeadersTerm.tsx b/frontend/components/terms/MatchingWarsAndEnemyLeadersTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_MatchingWarsAndEnemyLeadersTerm.tsx
rename to frontend/components/terms/MatchingWarsAndEnemyLeadersTerm.tsx
diff --git a/frontend/components/terms/Term_Military.tsx b/frontend/components/terms/MilitaryTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_Military.tsx
rename to frontend/components/terms/MilitaryTerm.tsx
diff --git a/frontend/components/terms/Term_MortalityPhase.tsx b/frontend/components/terms/MortalityPhaseTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_MortalityPhase.tsx
rename to frontend/components/terms/MortalityPhaseTerm.tsx
diff --git a/frontend/components/terms/Term_Oratory.tsx b/frontend/components/terms/OratoryTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_Oratory.tsx
rename to frontend/components/terms/OratoryTerm.tsx
diff --git a/frontend/components/terms/Term_PersonalTreasury.tsx b/frontend/components/terms/PersonalTreasuryTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_PersonalTreasury.tsx
rename to frontend/components/terms/PersonalTreasuryTerm.tsx
diff --git a/frontend/components/terms/Term_Popularity.tsx b/frontend/components/terms/PopularityTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_Popularity.tsx
rename to frontend/components/terms/PopularityTerm.tsx
diff --git a/frontend/components/terms/Term_PopulationPhase.tsx b/frontend/components/terms/PopulationPhaseTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_PopulationPhase.tsx
rename to frontend/components/terms/PopulationPhaseTerm.tsx
diff --git a/frontend/components/terms/Term_PriorConsul.tsx b/frontend/components/terms/PriorConsulTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_PriorConsul.tsx
rename to frontend/components/terms/PriorConsulTerm.tsx
diff --git a/frontend/components/terms/Term_RevenuePhase.tsx b/frontend/components/terms/RevenuePhaseTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_RevenuePhase.tsx
rename to frontend/components/terms/RevenuePhaseTerm.tsx
diff --git a/frontend/components/terms/Term_RevolutionPhase.tsx b/frontend/components/terms/RevolutionPhaseTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_RevolutionPhase.tsx
rename to frontend/components/terms/RevolutionPhaseTerm.tsx
diff --git a/frontend/components/terms/Term_RomeConsul.tsx b/frontend/components/terms/RomeConsulTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_RomeConsul.tsx
rename to frontend/components/terms/RomeConsulTerm.tsx
diff --git a/frontend/components/terms/Term_Secret.tsx b/frontend/components/terms/SecretTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_Secret.tsx
rename to frontend/components/terms/SecretTerm.tsx
diff --git a/frontend/components/terms/Term_SenatePhase.tsx b/frontend/components/terms/SenatePhaseTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_SenatePhase.tsx
rename to frontend/components/terms/SenatePhaseTerm.tsx
diff --git a/frontend/components/terms/Term_Senator.tsx b/frontend/components/terms/SenatorTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_Senator.tsx
rename to frontend/components/terms/SenatorTerm.tsx
diff --git a/frontend/components/terms/Term_Statesman.tsx b/frontend/components/terms/StatesmanTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_Statesman.tsx
rename to frontend/components/terms/StatesmanTerm.tsx
diff --git a/frontend/components/terms/Term_Talents.tsx b/frontend/components/terms/TalentsTerm.tsx
similarity index 97%
rename from frontend/components/terms/Term_Talents.tsx
rename to frontend/components/terms/TalentsTerm.tsx
index 2ba0827e..d8bb5b8b 100644
--- a/frontend/components/terms/Term_Talents.tsx
+++ b/frontend/components/terms/TalentsTerm.tsx
@@ -13,7 +13,6 @@ const TalentTerm = () => (
         <Image src={TalentIcon} height={40} width={40} alt="Talent icon" />
       </Avatar>
     }
-    category="attribute"
     wikipediaPage="Talent_(measurement)"
   >
     <p>
diff --git a/frontend/components/terms/Term_Turn.tsx b/frontend/components/terms/TurnTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_Turn.tsx
rename to frontend/components/terms/TurnTerm.tsx
diff --git a/frontend/components/terms/Term_UnalignedSenator.tsx b/frontend/components/terms/UnalignedSenatorTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_UnalignedSenator.tsx
rename to frontend/components/terms/UnalignedSenatorTerm.tsx
diff --git a/frontend/components/terms/Term_Votes.tsx b/frontend/components/terms/VotesTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_Votes.tsx
rename to frontend/components/terms/VotesTerm.tsx
diff --git a/frontend/components/terms/Term_War.tsx b/frontend/components/terms/WarTerm.tsx
similarity index 100%
rename from frontend/components/terms/Term_War.tsx
rename to frontend/components/terms/WarTerm.tsx