diff --git a/components/LogOutButton.vue b/components/ButtonLogOut.vue
similarity index 100%
rename from components/LogOutButton.vue
rename to components/ButtonLogOut.vue
diff --git a/components/EventCard.vue b/components/CardEvent.vue
similarity index 100%
rename from components/EventCard.vue
rename to components/CardEvent.vue
diff --git a/components/Header.vue b/components/Header.vue
index 0833aec..e4ff675 100644
--- a/components/Header.vue
+++ b/components/Header.vue
@@ -19,7 +19,7 @@
 				(s:{{ sessionStore.id }} a:{{ accountStore.id }}{{ sessionStore.push ? " push" : null }})
 				{{ accountStore.type }}
 				<NuxtLink to="/account/settings">Settings</NuxtLink>
-				<LogOutButton v-if="accountStore.type !== 'anonymous'"/>
+				<ButtonLogOut v-if="accountStore.type !== 'anonymous'"/>
 			</template>
 			<template v-else>
 				<NuxtLink to="/login">Log In</NuxtLink>
diff --git a/components/ScheduleTable.vue b/components/TableScheduleEventSlots.vue
similarity index 100%
rename from components/ScheduleTable.vue
rename to components/TableScheduleEventSlots.vue
diff --git a/components/EventsTable.vue b/components/TableScheduleEvents.vue
similarity index 100%
rename from components/EventsTable.vue
rename to components/TableScheduleEvents.vue
diff --git a/components/LocationsTable.vue b/components/TableScheduleLocations.vue
similarity index 100%
rename from components/LocationsTable.vue
rename to components/TableScheduleLocations.vue
diff --git a/components/RolesTable.vue b/components/TableScheduleRoles.vue
similarity index 100%
rename from components/RolesTable.vue
rename to components/TableScheduleRoles.vue
diff --git a/components/ShiftScheduleTable.vue b/components/TableScheduleShiftSlots.vue
similarity index 100%
rename from components/ShiftScheduleTable.vue
rename to components/TableScheduleShiftSlots.vue
diff --git a/components/ShiftsTable.vue b/components/TableScheduleShifts.vue
similarity index 100%
rename from components/ShiftsTable.vue
rename to components/TableScheduleShifts.vue
diff --git a/pages/edit.vue b/pages/edit.vue
index f32b9d4..41ddb51 100644
--- a/pages/edit.vue
+++ b/pages/edit.vue
@@ -19,7 +19,7 @@
 			</select>
 		</label>
 		<h2>Locations</h2>
-		<LocationsTable :edit="accountStore.canEditPublic" />
+		<TableScheduleLocations :edit="accountStore.canEditPublic" />
 		<h2>Schedule</h2>
 		<label>
 			Location Filter:
@@ -39,11 +39,11 @@
 				>{{ location.name }}</option>
 			</select>
 		</label>
-		<ScheduleTable :edit="true" :locationId="locationFilter" :eventSlotFilter :shiftSlotFilter />
+		<TableScheduleEventSlots :edit="true" :locationId="locationFilter" :eventSlotFilter :shiftSlotFilter />
 		<h2>Events</h2>
-		<EventsTable :edit="true" />
+		<TableScheduleEvents :edit="true" />
 		<h2>Roles</h2>
-		<RolesTable :edit="true" />
+		<TableScheduleRoles :edit="true" />
 		<h2>Shift Schedule</h2>
 		<label>
 			Role Filter:
@@ -63,9 +63,9 @@
 				>{{ role.name }}</option>
 			</select>
 		</label>
-		<ShiftScheduleTable :edit="true" :roleId="roleFilter" :eventSlotFilter :shiftSlotFilter />
+		<TableScheduleShiftSlots :edit="true" :roleId="roleFilter" :eventSlotFilter :shiftSlotFilter />
 		<h2>Shifts</h2>
-		<ShiftsTable :edit="true" :roleId="roleFilter" />
+		<TableScheduleShifts :edit="true" :roleId="roleFilter" />
 		<p v-if="schedule.modified">
 			Changes are not saved yet.
 			<button
diff --git a/pages/schedule.vue b/pages/schedule.vue
index f2ffae8..119cd5e 100644
--- a/pages/schedule.vue
+++ b/pages/schedule.vue
@@ -42,7 +42,7 @@
 		</label>
 		<Timetable :schedule :eventSlotFilter :shiftSlotFilter />
 		<h2>Events</h2>
-		<EventCard v-for="event in [...schedule.events.values()].filter(e => !e.deleted && [...e.slots.values()].some(eventSlotFilter))" :event/>
+		<CardEvent v-for="event in [...schedule.events.values()].filter(e => !e.deleted && [...e.slots.values()].some(eventSlotFilter))" :event/>
 		<h2>Locations</h2>
 		<ul>
 			<li v-for="location in schedule.locations.values()" :key="location.id">