diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php
index bf0250ad..bb2cd111 100644
--- a/app/Http/Controllers/CommentController.php
+++ b/app/Http/Controllers/CommentController.php
@@ -39,11 +39,11 @@ public function store(StoreCommentRequest $request)
         $comment->content = $validatedData['content'];
         $comment->user_id = Auth::id();
 
-        $commentableType = $this->modelResolver->getModelClass($validatedData['commentable_type']);
+        $commentableType = $this->modelResolver->getModelClass($validatedData['commentable_key']);
         $commentableId = $validatedData['commentable_id'];
         
         // Ensure that the model exists
-        $model = $this->modelResolver->resolve($validatedData['commentable_type'], $commentableId);
+        $model = $this->modelResolver->resolve($validatedData['commentable_key'], $commentableId);
         if (!$model) {
             return response()->json(['message' => 'Model not found'], 404);
         }    
@@ -140,7 +140,7 @@ public function store(StoreCommentRequest $request)
     /**
      * Display the specified comment, with pagination.
      */
-    public function show(Request $request, string $commentableType, int $commentableId, int $index, int $paginationLimit = -1)
+    public function show(Request $request, string $commentableKey, int $commentableId, int $index, int $paginationLimit = -1)
     {
         if ($paginationLimit == -1)
         {
@@ -149,8 +149,8 @@ public function show(Request $request, string $commentableType, int $commentable
 
         $sortBy = $request->query('sort_by', 'top');
         
-        Log::debug("Request is, commentable_type: " .  $commentableType . ". id: " . $commentableId . ". index: " . $index . ". Sorting: " . $sortBy);
-        $paginatedResults = $this->commentService->getPaginatedComments($commentableType, $commentableId, $index, $paginationLimit, $sortBy);
+        Log::debug("Request is, commentable_type: " .  $commentableKey . ". id: " . $commentableId . ". index: " . $index . ". Sorting: " . $sortBy);
+        $paginatedResults = $this->commentService->getPaginatedComments($commentableKey, $commentableId, $index, $paginationLimit, $sortBy);
         
         return $paginatedResults;
     }
diff --git a/app/Http/Controllers/UpvoteController.php b/app/Http/Controllers/UpvoteController.php
index e2961ab2..2dc0c9f3 100644
--- a/app/Http/Controllers/UpvoteController.php
+++ b/app/Http/Controllers/UpvoteController.php
@@ -19,20 +19,20 @@ function __construct(ModelResolverService $modelResolver)
     }
 
     /**
-     * Upvote a Model (type, id)
+     * Upvote a Model
      */
-    public function upvote($type, $id)
+    public function upvote($typeKey, $id)
     {
         validator(
             [
-                'type' => $type,
+                'type_key' => $typeKey,
             ],
             [
-                'type' => ['required', Rule::in(config('upvotes.upvotable_types'))]
+                'type_key' => ['required', Rule::in(config('upvotes.upvotable_keys'))]
             ]
         )->validate(); 
 
-        $model = $this->modelResolver->resolve($type, $id);
+        $model = $this->modelResolver->resolve($typeKey, $id);
 
         if (!$model) {
             return response()->json(['message' => 'Model not found'], 404);
@@ -50,18 +50,18 @@ public function upvote($type, $id)
     /**
      * Downvote a Model (type, id)
      */
-    public function downvote($type, $id)
+    public function downvote($typeKey, $id)
     {
         validator(
             [
-                'type' => $type,
+                'type_key' => $typeKey,
             ],
             [
-                'type' => ['required', Rule::in(config('upvotes.upvotable_types'))]
+                'type_key' => ['required', Rule::in(config('upvotes.upvotable_keys'))]
             ]
         )->validate(); 
 
-        $model = $this->modelResolver->resolve($type, $id);
+        $model = $this->modelResolver->resolve($typeKey, $id);
 
         if (!$model) {
             return response()->json(['message' => 'Model not found'], 404);
diff --git a/app/Http/Requests/Comment/StoreCommentRequest.php b/app/Http/Requests/Comment/StoreCommentRequest.php
index c151e359..e27e4502 100644
--- a/app/Http/Requests/Comment/StoreCommentRequest.php
+++ b/app/Http/Requests/Comment/StoreCommentRequest.php
@@ -34,10 +34,10 @@ public function rules(): array
     {
         return [
             "commentable_id" => ['required', 'integer'],
-            "commentable_type" => [
+            "commentable_key" => [
                 'required',
                 'string',
-                Rule::in(config('comment.commentable_types_shorthand')),
+                Rule::in(config('comment.commentable_keys')),
             ],
             "content" => ["required", "string", "max:4000"],
             "parent_comment_id" => ["nullable", "exists:App\Models\Comment,id"]
diff --git a/app/Services/CommentService.php b/app/Services/CommentService.php
index 5c267ec8..7910a050 100644
--- a/app/Services/CommentService.php
+++ b/app/Services/CommentService.php
@@ -28,7 +28,7 @@ function __construct(ModelResolverService $resolver)
      * @return array
      */
     // TODO: Refactor commentable types, and commentable types short for all other objects
-    public function getPaginatedComments(string $commentableTypeShorthand, int $commentableId, int $index, int $paginationLimit = -1, string $sortBy = 'top'): array
+    public function getPaginatedComments(string $commentableKey, int $commentableId, int $index, int $paginationLimit = -1, string $sortBy = 'top'): array
     {
         if ($paginationLimit == -1)
         {
@@ -37,15 +37,15 @@ public function getPaginatedComments(string $commentableTypeShorthand, int $comm
 
         Validator::make([
             'index' => $index,
-            'commentable_type_short' => $commentableTypeShorthand,
+            'commentable_key' => $commentableKey,
             'pagination_limit' => $paginationLimit,
         ], [
             'index' => ['required', 'integer', 'min:0'],
-            'commentable_type_short' => ['required', Rule::in(config('comment.commentable_types_shorthand'))],
+            'commentable_key' => ['required', Rule::in(config('comment.commentable_keys'))],
             'pagination_limit' => ['required', 'integer', 'max:' . config('comment.pagination_limit')],
         ])->validate();
 
-        $commentableType = $this->modelResolver->getModelClass($commentableTypeShorthand);   
+        $commentableType = $this->modelResolver->getModelClass($commentableKey);   
         Log::debug("Request is, commentable_type: {$commentableType}. id: {$commentableId}. index: {$index}");
 
         // Get the root comments:
diff --git a/config/comment.php b/config/comment.php
index 20f863db..293683a3 100644
--- a/config/comment.php
+++ b/config/comment.php
@@ -5,6 +5,6 @@
     'max_depth' => 7, // 1-indexed, 1 is the start
     'pagination_limit' => 150,
     'default_pagination_limit' => 5,
-    'commentable_types_shorthand' => ['review', 'comment', 'edit', 'resource'],
+    'commentable_keys' => ['review', 'comment', 'edit', 'resource'],
     'sortable_options' => ['latest', 'top', 'bottom', 'controversial', 'mine']
 ];
\ No newline at end of file
diff --git a/config/upvotes.php b/config/upvotes.php
index 2c8edb6e..8c0b1f57 100644
--- a/config/upvotes.php
+++ b/config/upvotes.php
@@ -1,5 +1,5 @@
 <?php
 
 return [
-    'upvotable_types' => ['review', 'comment', 'edit', 'resource']
+    'upvotable_keys' => ['review', 'comment', 'edit', 'resource']
 ];
\ No newline at end of file
diff --git a/database/factories/CommentFactory.php b/database/factories/CommentFactory.php
index 4bcb9d82..4c6c22a9 100644
--- a/database/factories/CommentFactory.php
+++ b/database/factories/CommentFactory.php
@@ -23,9 +23,9 @@ class CommentFactory extends Factory
     public function definition(): array
     {
         // Pick a random commentable type from config.
-        $commentableName = $this->faker->randomElement(['comment', 'resource']);
+        $commentableKey = $this->faker->randomElement(['comment', 'resource']);
         $modelResolver = app(ModelResolverService::class);
-        $modelClass = $modelResolver->getModelClass($commentableName);
+        $modelClass = $modelResolver->getModelClass($commentableKey);
     
         // Use an existing user or create one.
         $user = User::inRandomOrder()->first() ?? User::factory()->create();
diff --git a/resources/js/Components/Comments/CommentActionsForm.vue b/resources/js/Components/Comments/CommentActionsForm.vue
index 16698661..739c9522 100644
--- a/resources/js/Components/Comments/CommentActionsForm.vue
+++ b/resources/js/Components/Comments/CommentActionsForm.vue
@@ -18,7 +18,7 @@ const props = defineProps({
 
 const isOpen = ref(false);
 
-const commentableType = inject("commentableType");
+const commentableKey = inject("commentableKey");
 const commentableId = inject("commentableId");
 const createdNewCommentCallback = inject("createdNewCommentCallback");
 
@@ -29,7 +29,7 @@ const toggleOpen = () => {
 const form = reactive({
     content: "",
     commentable_id: commentableId,
-    commentable_type: commentableType,
+    commentable_key: commentableKey,
     parent_comment_id: props.parentCommentId ?? null,
     errors: {},
     processing: false,
diff --git a/resources/js/Components/Comments/Commentable.vue b/resources/js/Components/Comments/Commentable.vue
index a1f67801..5ffd217e 100644
--- a/resources/js/Components/Comments/Commentable.vue
+++ b/resources/js/Components/Comments/Commentable.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, provide, readonly, nextTick, onMounted, reactive } from "vue";
+import { ref, provide, readonly, nextTick, onMounted } from "vue";
 import axios from "axios";
 import CommentActionsForm from "@/Components/Comments/CommentActionsForm.vue";
 import SortByDropdown from "@/Components/Comments/SortUpvotesByDropdown.vue";
@@ -10,7 +10,7 @@ const props = defineProps({
         type: Number,
         required: true,
     },
-    commentableType: {
+    commentableKey: {
         type: String,
         required: true,
     },
@@ -69,7 +69,7 @@ const createdNewCommentCallback = (newComment, userData) => {
 };
 
 provide("commentableId", props.commentableId);
-provide("commentableType", props.commentableType);
+provide("commentableKey", props.commentableKey);
 provide("users", readonly(usersMap));
 provide("createdNewCommentCallback", createdNewCommentCallback);
 
@@ -139,7 +139,7 @@ async function loadComments() {
         const response = await axios.get(
             route("comments.show", {
                 id: props.commentableId,
-                type: props.commentableType,
+                type: props.commentableKey,
                 index: currentIndex.value,
                 paginationLimit: props.paginationLimit,
                 sort_by: sortBy.value,
diff --git a/resources/js/Components/Comments/SingleComment.vue b/resources/js/Components/Comments/SingleComment.vue
index 133b9beb..f9dccb48 100644
--- a/resources/js/Components/Comments/SingleComment.vue
+++ b/resources/js/Components/Comments/SingleComment.vue
@@ -33,7 +33,7 @@ const formattedDate = computed(() =>
     <div class="p-4 border-b border-gray-200" :key="comment.id" :id="'comment_'+comment.id">
 
         <Upvotable
-            :upvotable-type="'comment'"
+            :upvotable-key="'comment'"
             :upvotable-id="comment.id"
             :initial-votes="comment.vote_score"
             :user-vote="comment.user_vote"
diff --git a/resources/js/Components/Resources/ResourceEdit/ResourceEdits.vue b/resources/js/Components/Resources/ResourceEdit/ResourceEdits.vue
index 1555ff45..2145d77d 100644
--- a/resources/js/Components/Resources/ResourceEdit/ResourceEdits.vue
+++ b/resources/js/Components/Resources/ResourceEdit/ResourceEdits.vue
@@ -42,7 +42,7 @@ const props = defineProps({
                 >
                     <div class="flex flex-col bg-slate-100">
                         <Upvotable
-                            :upvotable-type="'edit'"
+                            :upvotable-key="'edit'"
                             :upvotable-id="edit.id"
                             :initial-votes="edit.vote_score"
                             :user-vote="edit.user_vote"
diff --git a/resources/js/Components/Resources/ResourceItem.vue b/resources/js/Components/Resources/ResourceItem.vue
index 260451c0..7feacb2c 100644
--- a/resources/js/Components/Resources/ResourceItem.vue
+++ b/resources/js/Components/Resources/ResourceItem.vue
@@ -19,7 +19,7 @@ const emit = defineEmits(["upvote", "downvote"]);
         <td class="align-top pr-6">
             <Upvotable
                 :upvotable-id="resource.id"
-                :upvotable-type="'resource'"
+                :upvotable-key="'resource'"
                 :initial-votes="resource.vote_score"
                 :user-vote="resource.user_vote"
             ></Upvotable>
diff --git a/resources/js/Components/Resources/Reviews/ResourceReview.vue b/resources/js/Components/Resources/Reviews/ResourceReview.vue
index 21d6f998..e2beaec3 100644
--- a/resources/js/Components/Resources/Reviews/ResourceReview.vue
+++ b/resources/js/Components/Resources/Reviews/ResourceReview.vue
@@ -18,7 +18,7 @@ const ratingFeatures = Object.entries(ratingLabels).map(([key, label]) => ({
 
 <template>
     <Upvotable
-        :upvotable-type="'review'"
+        :upvotable-key="'review'"
         :upvotable-id="props.review.id"
         :initial-votes="props.review.vote_score"
         :user-vote="props.review.user_vote"
@@ -75,7 +75,7 @@ const ratingFeatures = Object.entries(ratingLabels).map(([key, label]) => ({
 
     <Commentable 
         :commentable-id="review.id" 
-        :commentable-type="'review'"
+        :commentable-key="'review'"
         :comments-count="review.comments_count"
     />
 </template>
diff --git a/resources/js/Components/Upvote/Upvotable.vue b/resources/js/Components/Upvote/Upvotable.vue
index d05e025d..4a52de97 100644
--- a/resources/js/Components/Upvote/Upvotable.vue
+++ b/resources/js/Components/Upvote/Upvotable.vue
@@ -5,7 +5,7 @@ import { Icon } from "@iconify/vue";
 import { router } from '@inertiajs/vue3'
 
 const props = defineProps({
-    upvotableType: {
+    upvotableKey: {
         type: String,
         required: true,
     },
@@ -52,7 +52,7 @@ async function handleUpvote() {
         const response = await axios.post(
             route("upvote", {
                 id: props.upvotableId,
-                type: props.upvotableType,
+                type: props.upvotableKey,
             })
         );
         userVote.value = response.data.userVote;
@@ -77,7 +77,7 @@ async function handleDownvote() {
         const response = await axios.post(
             route("downvote", {
                 id: props.upvotableId,
-                type: props.upvotableType,
+                type: props.upvotableKey,
             })
         );
         userVote.value = response.data.userVote;
diff --git a/resources/js/Pages/ResourceEdits/Show.vue b/resources/js/Pages/ResourceEdits/Show.vue
index 2816ac3a..93452fc9 100644
--- a/resources/js/Pages/ResourceEdits/Show.vue
+++ b/resources/js/Pages/ResourceEdits/Show.vue
@@ -513,7 +513,7 @@ function mergeEdits(id) {
                         <!-- TODO: Add partial reload to the refresh -->
                         <Upvotable
                             :flexRow="true"
-                            :upvotable-type="'edit'"
+                            :upvotable-key="'edit'"
                             :upvotable-id="resourceId"
                             :initial-votes="editedResource.vote_score"
                             :user-vote="editedResource.user_vote"
@@ -565,7 +565,7 @@ function mergeEdits(id) {
 
                     <Commentable
                         :commentable-id="props.editedResource.id"
-                        :commentable-type="'edit'"
+                        :commentable-key="'edit'"
                         :comments-count="props.editedResource.comments_count"
                     ></Commentable>
                 </div>
diff --git a/resources/js/Pages/Resources/Show.vue b/resources/js/Pages/Resources/Show.vue
index d98d5ea4..76866645 100644
--- a/resources/js/Pages/Resources/Show.vue
+++ b/resources/js/Pages/Resources/Show.vue
@@ -65,7 +65,7 @@ const sortingType = urlParams.get('sort_by') || 'top';
                                 >
                                     <UpvoteResource
                                         :upvotable-id="props.resource.id"
-                                        :upvotable-type="'resource'"
+                                        :upvotable-key="'resource'"
                                         :initial-votes="
                                             props.resource.vote_score
                                         "
@@ -246,7 +246,7 @@ const sortingType = urlParams.get('sort_by') || 'top';
                                     :sort-by-initial-value="props.discussionSortByValue"
                                     :has-sort-by-dropdown="false"
                                     :commentable-id="props.resource.id"
-                                    :commentable-type="'resource'"
+                                    :commentable-key="'resource'"
                                     :comments-count="
                                         props.resource.comments_count
                                     "
diff --git a/tests/Feature/CommentsTest.php b/tests/Feature/CommentsTest.php
index 023a46ed..4900f419 100644
--- a/tests/Feature/CommentsTest.php
+++ b/tests/Feature/CommentsTest.php
@@ -25,7 +25,7 @@ public function test_can_post_top_level_comment()
 
         $payload = [
             'content' => 'This is a top level comment.',
-            'commentable_type' => 'resource',
+            'commentable_key' => 'resource',
             'commentable_id' => $resource->id,
             'parent_comment_id' => null,
         ];
@@ -52,7 +52,7 @@ public function test_invalid_comment_data_not_allowed()
 
         // Omitting the 'content' field should trigger a validation error.
         $payload = [
-            'commentable_type' => 'resource',
+            'commentable_key' => 'resource',
             'commentable_id' => $resource->id,
             'parent_comment_id' => null,
         ];
@@ -72,7 +72,7 @@ public function test_cannot_comment_on_non_existent_resource()
         // Resource does not exist
         $payload = [
             'content' => 'test',
-            'commentable_type' => 'resource',
+            'commentable_key' => 'resource',
             'commentable_id' => 0, // does not exist
             'parent_comment_id' => null,
         ];
@@ -89,7 +89,7 @@ public function test_can_comment_all_commentable_types()
         $user = User::factory()->create();
         $this->actingAs($user);
 
-        foreach (config('comment.commentable_types_shorthand') as $typeKey) {
+        foreach (config('comment.commentable_keys') as $typeKey) {
             $modelClass = app(ModelResolverService::class)->getModelClass($typeKey);
 
             // Skip comments
@@ -100,7 +100,7 @@ public function test_can_comment_all_commentable_types()
             $commentable = $modelClass::factory()->create();
             $payload = [
                 'content' => 'top level comment',
-                'commentable_type' => $typeKey,
+                'commentable_key' => $typeKey,
                 'commentable_id' => $commentable->id,
                 'parent_comment_id' => null,
             ];
@@ -127,7 +127,7 @@ public function test_cannot_reply_on_non_existent_comment()
         // Comment does not exist
         $payload = [
             'content' => 'test',
-            'commentable_type' => 'comment',
+            'commentable_key' => 'comment',
             'commentable_id' => 0,
             'parent_comment_id' => null,
         ];
@@ -149,7 +149,7 @@ public function test_can_post_nested_comment_within_max_depth()
         // Create a top-level comment first.
         $parentPayload = [
             'content' => 'Top level comment.',
-            'commentable_type' => 'resource',
+            'commentable_key' => 'resource',
             'commentable_id' => $resource->id,
             'parent_comment_id' => null,
         ];
@@ -160,7 +160,7 @@ public function test_can_post_nested_comment_within_max_depth()
         // Post a reply to the top-level comment; its depth should be parent's depth + 1.
         $replyPayload = [
             'content' => 'This is a reply.',
-            'commentable_type' => 'resource',
+            'commentable_key' => 'resource',
             'commentable_id' => $resource->id,
             'parent_comment_id' => $parentCommentId,
         ];
@@ -185,7 +185,7 @@ public function test_cannot_post_nested_comment_exceeding_max_depth()
         // Create a top-level comment (depth 1).
         $parentPayload = [
             'content' => 'Top level comment.',
-            'commentable_type' => 'resource',
+            'commentable_key' => 'resource',
             'commentable_id' => $resource->id,
             'parent_comment_id' => null,
         ];
@@ -196,7 +196,7 @@ public function test_cannot_post_nested_comment_exceeding_max_depth()
         // Create a reply (depth 2) – this is allowed.
         $replyPayload = [
             'content' => 'Reply level 2.',
-            'commentable_type' => 'resource',
+            'commentable_key' => 'resource',
             'commentable_id' => $resource->id,
             'parent_comment_id' => $parentCommentId,
         ];
@@ -207,7 +207,7 @@ public function test_cannot_post_nested_comment_exceeding_max_depth()
         // Attempt to post a nested comment (would be depth 3) – should fail.
         $nestedReplyPayload = [
             'content' => 'Reply level 3 exceeds depth limit.',
-            'commentable_type' => 'resource',
+            'commentable_key' => 'resource',
             'commentable_id' => $resource->id,
             'parent_comment_id' => $replyCommentId,
         ];
@@ -231,7 +231,7 @@ public function test_cannot_post_more_than_max_replies()
         // Create a top-level comment.
         $payload = [
             'content' => 'Top level comment for replies limit test.',
-            'commentable_type' => 'resource',
+            'commentable_key' => 'resource',
             'commentable_id' => $resource->id,
             'parent_comment_id' => null,
         ];
@@ -243,7 +243,7 @@ public function test_cannot_post_more_than_max_replies()
         for ($i = 1; $i <= config('comment.max_replies'); $i++) {
             $replyPayload = [
                 'content' => "Reply $i",
-                'commentable_type' => 'resource',
+                'commentable_key' => 'resource',
                 'commentable_id' => $resource->id,
                 'parent_comment_id' => $rootCommentId,
             ];
@@ -254,7 +254,7 @@ public function test_cannot_post_more_than_max_replies()
         // Attempt one more reply, which should be rejected.
         $extraReplyPayload = [
             'content' => 'This reply should fail due to reply limit.',
-            'commentable_type' => 'resource',
+            'commentable_key' => 'resource',
             'commentable_id' => $resource->id,
             'parent_comment_id' => $rootCommentId,
         ];
@@ -280,7 +280,7 @@ public function test_paginated_comment_retrieval_returns_all_posted_comments()
         for ($i = 1; $i <= 3; $i++) {
             $topPayload = [
                 'content' => "Top level comment $i",
-                'commentable_type' => 'resource',
+                'commentable_key' => 'resource',
                 'commentable_id' => $resource->id,
                 'parent_comment_id' => null,
             ];
@@ -292,7 +292,7 @@ public function test_paginated_comment_retrieval_returns_all_posted_comments()
             for ($j = 1; $j <= 2; $j++) {
                 $replyPayload = [
                     'content' => "Reply $j to comment $i",
-                    'commentable_type' => 'resource',
+                    'commentable_key' => 'resource',
                     'commentable_id' => $resource->id,
                     'parent_comment_id' => $topId,
                 ];
diff --git a/tests/Feature/UpvoteTest.php b/tests/Feature/UpvoteTest.php
index 3a087e45..c6b1d3b7 100644
--- a/tests/Feature/UpvoteTest.php
+++ b/tests/Feature/UpvoteTest.php
@@ -44,7 +44,7 @@ public function test_can_upvote_all_upvotable_types()
         $user = User::factory()->create();
         $this->actingAs($user);
 
-        foreach (config('upvotes.upvotable_types') as $typeKey) {
+        foreach (config('upvotes.upvotable_keys') as $typeKey) {
             // Get the Model service with app
             $modelClass = app(ModelResolverService::class)->getModelClass($typeKey); // Resolve the model class.