diff --git a/src/db/relations/collection-like.relation.ts b/src/db/relations/collection-like.relation.ts
index 6c919854d3fd59f20ad58071587d2b59c4791b91..0fa5a2425891d15c2fdc7bfe27954e09e5b44d47 100644
--- a/src/db/relations/collection-like.relation.ts
+++ b/src/db/relations/collection-like.relation.ts
@@ -1,6 +1,6 @@
 import { integer, pgTable, serial } from "drizzle-orm/pg-core";
 import userTable from "../schema/user.schema";
-import collectionTable from "../schema/collection.schema";
+import collectionTable from "../schema/collections.schema";
 import { createInsertSchema, createSelectSchema } from "drizzle-zod";
 import type { z } from "zod";
 import { relations } from "drizzle-orm";
diff --git a/src/db/relations/resource-subject.relation.ts b/src/db/relations/resource-subject.relation.ts
index 8d97f3ce849b07fa06d09d92e33ad19e301575ef..7ea04b4da66b8eedf2101f106ad79d055a77ce76 100644
--- a/src/db/relations/resource-subject.relation.ts
+++ b/src/db/relations/resource-subject.relation.ts
@@ -1,6 +1,6 @@
 import { integer, pgTable, serial } from "drizzle-orm/pg-core";
 import resourceTable from "../schema/resource.schema";
-import subjectsTable from "../schema/subject.schema";
+import subjectsTable from "../schema/subjects.schema";
 import { createInsertSchema, createSelectSchema } from "drizzle-zod";
 import type { z } from "zod";
 import { relations } from "drizzle-orm";
diff --git a/src/db/repo/achievement.repo.ts b/src/db/repo/achievement.repo.ts
index 749ba7616f39fe559c7370751d562330d227651b..4e700700125fb1823399996ae536b852fa4581dc 100644
--- a/src/db/repo/achievement.repo.ts
+++ b/src/db/repo/achievement.repo.ts
@@ -1,7 +1,7 @@
 import { Service } from "typedi";
-import type { AchievementInput, AchievementModel, AchievementUpdate } from "../schema/achievement.schema";
+import type { AchievementInput, AchievementModel, AchievementUpdate } from "../schema/achievements.schema";
 import db from "..";
-import achievementTable, { achievementSchemas } from "../schema/achievement.schema";
+import achievementTable, { achievementSchemas } from "../schema/achievements.schema";
 import { eq } from "drizzle-orm";
 
 @Service()
diff --git a/src/db/repo/action.repo.ts b/src/db/repo/action.repo.ts
index 75f8e16e64ccfdf94c24c192350284d1c2227672..f6071ddb3d7ed300954c3d9271162ecaee1c1e6b 100644
--- a/src/db/repo/action.repo.ts
+++ b/src/db/repo/action.repo.ts
@@ -1,7 +1,7 @@
 import { Service } from "typedi";
-import type { ActionInput, ActionModel, ActionUpdate } from "../schema/action.schema";
+import type { ActionInput, ActionModel, ActionUpdate } from "../schema/actions.schema";
 import db from "..";
-import actionTable, { actionSchemas } from "../schema/action.schema";
+import actionTable, { actionSchemas } from "../schema/actions.schema";
 import { eq } from "drizzle-orm";
 import { z } from "zod";
 
diff --git a/src/db/repo/collection-likes.repo.ts b/src/db/repo/collection-likes.repo.ts
index e23bc4e688ed37a4a09657969ee0f1653587f1e6..8063c07a0ecdc69e141dc0392d53f7a090943b22 100644
--- a/src/db/repo/collection-likes.repo.ts
+++ b/src/db/repo/collection-likes.repo.ts
@@ -1,11 +1,11 @@
 import { Service } from "typedi";
-import type { CollectionModel } from "../schema/collection.schema";
+import type { CollectionModel } from "../schema/collections.schema";
 import type { UserModel } from "../schema/user.schema";
 import db from "..";
 import collectionLikesTable from "../relations/collection-like.relation";
 import { and, eq, inArray } from "drizzle-orm";
 import userTable from "../schema/user.schema";
-import collectionTable from "../schema/collection.schema";
+import collectionTable from "../schema/collections.schema";
 
 @Service()
 export class collectionLikesRepo {
diff --git a/src/db/repo/collection-resources.repo.ts b/src/db/repo/collection-resources.repo.ts
index b2471a04304b41e6e11e3d522d61cd3e5c22e482..225227fd801e99c2d2ada69b1fad988792a593d8 100644
--- a/src/db/repo/collection-resources.repo.ts
+++ b/src/db/repo/collection-resources.repo.ts
@@ -1,11 +1,11 @@
 import { Service } from "typedi";
-import type { CollectionModel } from "../schema/collection.schema";
+import type { CollectionModel } from "../schema/collections.schema";
 import type { ResourceModel } from "../schema/resource.schema";
 import db from "..";
 import collectionResourcesTable from "../relations/collection-resource.relation";
 import { and, eq, inArray, name } from "drizzle-orm";
 import resourceTable from "../schema/resource.schema";
-import collectionTable from "../schema/collection.schema";
+import collectionTable from "../schema/collections.schema";
 
 @Service()
 export class collectionResourcesRepo {
diff --git a/src/db/repo/collections.repo.ts b/src/db/repo/collections.repo.ts
index 44d1d674c7b523d3606762309e4c4ad0dbf69db3..eae48a3c92bf11009fc336192a5e270a367812db 100644
--- a/src/db/repo/collections.repo.ts
+++ b/src/db/repo/collections.repo.ts
@@ -3,9 +3,9 @@ import type {
   CollectionInput,
   CollectionModel,
   CollectionUpdate,
-} from '../schema/collection.schema'
+} from '../schema/collections.schema'
 import db from "..";
-import collectionTable, { collectionSchemas } from "../schema/collection.schema";
+import collectionTable, { collectionSchemas } from "../schema/collections.schema";
 import { and, eq, isNull } from 'drizzle-orm'
 import type { ResourceModel } from "../schema/resource.schema";
 import fs from 'fs';
diff --git a/src/db/repo/resource-subjects.repo.ts b/src/db/repo/resource-subjects.repo.ts
index 5108f3909f04ba7846b4bf6afae716d0219d6440..31ae26d3b77fa11c4d769b3adf07d6a9f4524673 100644
--- a/src/db/repo/resource-subjects.repo.ts
+++ b/src/db/repo/resource-subjects.repo.ts
@@ -3,8 +3,8 @@ import db from "..";
 import resourceSubjectsTable from "../relations/resource-subject.relation";
 import { and, eq, inArray } from "drizzle-orm";
 import type { ResourceModel } from "../schema/resource.schema";
-import type { SubjectModel } from "../schema/subject.schema";
-import subjectsTable from "../schema/subject.schema";
+import type { SubjectModel } from "../schema/subjects.schema";
+import subjectsTable from "../schema/subjects.schema";
 import resourceTable from "../schema/resource.schema";
 
 
diff --git a/src/db/repo/role.repo.ts b/src/db/repo/role.repo.ts
index 8b8b89d71db430934cd1eb20d7cb27fced133fd3..a5c5af3739e58a871f35441a8c4b9a17704c86b9 100644
--- a/src/db/repo/role.repo.ts
+++ b/src/db/repo/role.repo.ts
@@ -1,7 +1,7 @@
 import { Service } from "typedi";
-import type { RoleInput, RoleModel, RoleUpdate } from "../schema/role.schema";
+import type { RoleInput, RoleModel, RoleUpdate } from "../schema/roles.schema";
 import db from "..";
-import roleTable, { roleSchemas } from "../schema/role.schema";
+import roleTable, { roleSchemas } from "../schema/roles.schema";
 import { eq } from "drizzle-orm";
 import { z } from "zod";
 
diff --git a/src/db/repo/subjects.repo.ts b/src/db/repo/subjects.repo.ts
index 16b32c98fcac7b5a1b0852966fa0ddd503116de8..1ad4087786656ad17ade079df451f53eed7585dc 100644
--- a/src/db/repo/subjects.repo.ts
+++ b/src/db/repo/subjects.repo.ts
@@ -1,7 +1,7 @@
 import { Service } from "typedi";
-import {type SubjectInput, type SubjectModel, type SubjectUpdate}  from "../schema/subject.schema";
+import {type SubjectInput, type SubjectModel, type SubjectUpdate}  from "../schema/subjects.schema";
 import db from "..";
-import subjectsTable, { subjectSchema } from "../schema/subject.schema";
+import subjectsTable, { subjectSchema } from "../schema/subjects.schema";
 import { eq } from "drizzle-orm";
 
 @Service()
diff --git a/src/db/repo/user-achievements.repo.ts b/src/db/repo/user-achievements.repo.ts
index 06f63cbedafccdca46089a2807b5d14909dabee2..b9057c28b80540c7c75d7d6954233dc0ea9ab871 100644
--- a/src/db/repo/user-achievements.repo.ts
+++ b/src/db/repo/user-achievements.repo.ts
@@ -3,7 +3,7 @@ import type { UserModel } from "../schema/user.schema";
 import db from "..";
 import { achievementTable, userAchievementsTable, userTable } from "../schema";
 import { and, eq, inArray } from "drizzle-orm";
-import type { AchievementModel } from "../schema/achievement.schema";
+import type { AchievementModel } from "../schema/achievements.schema";
 
 @Service()
 export class userAchievementsRepo {
diff --git a/src/db/repo/user-collection.repo.ts b/src/db/repo/user-collection.repo.ts
index bf68f0a88458021f1631092fef37f33a94b334d0..636da3354ddb1c88cda0b47733344867e10f82c2 100644
--- a/src/db/repo/user-collection.repo.ts
+++ b/src/db/repo/user-collection.repo.ts
@@ -1,10 +1,10 @@
 import { Service } from "typedi";
 import type { UserModel } from "../schema/user.schema";
-import type { CollectionModel } from "../schema/collection.schema";
+import type { CollectionModel } from "../schema/collections.schema";
 import db from "..";
 import userCollectionTable from "../relations/user-collection.relation";
 import { and, eq, inArray } from "drizzle-orm";
-import collectionTable from "../schema/collection.schema";
+import collectionTable from "../schema/collections.schema";
 import userTable from "../schema/user.schema";
 
 @Service()
diff --git a/src/db/schema/achievement.schema.ts b/src/db/schema/achievements.schema.ts
similarity index 100%
rename from src/db/schema/achievement.schema.ts
rename to src/db/schema/achievements.schema.ts
diff --git a/src/db/schema/action.schema.ts b/src/db/schema/actions.schema.ts
similarity index 100%
rename from src/db/schema/action.schema.ts
rename to src/db/schema/actions.schema.ts
diff --git a/src/db/schema/collection.schema.ts b/src/db/schema/collections.schema.ts
similarity index 100%
rename from src/db/schema/collection.schema.ts
rename to src/db/schema/collections.schema.ts
diff --git a/src/db/schema/comments.schema.ts b/src/db/schema/comments.schema.ts
index 50681793843d0b2fb97ba3229821cfa01fa45f26..c03981d3ccfeda61bc7787d571b3c86a9a1e7c19 100644
--- a/src/db/schema/comments.schema.ts
+++ b/src/db/schema/comments.schema.ts
@@ -12,7 +12,7 @@ const commentsTable = pgTable('comments', {
     text: text('text').notNull(),
     created_at: timestamp('created_at', {mode:'string'}).notNull().defaultNow(),
     deleted_at: timestamp('deleted_at',{mode:'string'}),
-    update_at: timestamp('update_at', {mode:'string'}).notNull().defaultNow().$onUpdate(() => sql`current_timestamp`)
+    updated_at: timestamp('updated_at', {mode:'string'}).notNull().defaultNow().$onUpdate(() => sql`current_timestamp`)
 
 } )
 
diff --git a/src/db/schema/complaint.schema.ts b/src/db/schema/complaint.schema.ts
index 0d6d2e0c423ab383eff36707df195aaa8c0bd2a3..d447a641453d5680d5161c1c9f5413c99feb604b 100644
--- a/src/db/schema/complaint.schema.ts
+++ b/src/db/schema/complaint.schema.ts
@@ -3,7 +3,7 @@ import userTable from "./user.schema";
 import { createInsertSchema, createSelectSchema } from "drizzle-zod";
 import type { z } from "zod";
 import resourceTable from "./resource.schema";
-import collectionTable from "./collection.schema";
+import collectionTable from "./collections.schema";
 import stateEnum from "./stateEnum.schema";
 
 const complaintTable = pgTable('complaints', {
diff --git a/src/db/schema/index.ts b/src/db/schema/index.ts
index 797533280278d9379ff9a341309935b422265c6b..afcfe60c4d6ac74c0423280f91fc9952e3c227e5 100644
--- a/src/db/schema/index.ts
+++ b/src/db/schema/index.ts
@@ -1,8 +1,8 @@
 import resourceTable from './resource.schema'
 import resourceStatsTable from './resource-stats.schema'
 import collectionStatsTable from './collection-stats.schema'
-import collectionTable from './collection.schema'
-import subjectsTable from './subject.schema'
+import collectionTable from './collections.schema'
+import subjectsTable from './subjects.schema'
 import submissionTable from './submission.schema'
 import licenseTable from './license.schema'
 import languageTable from './language.schema'
@@ -12,10 +12,10 @@ import userTable from './user.schema'
 import objectTypeTable from './object-type.schema'
 import complaintTable from './complaint.schema'
 import resourceSubjectsTable from '../relations/resource-subject.relation'
-import achievementTable from './achievement.schema'
+import achievementTable from './achievements.schema'
 import resourceLanguagesTable from '../relations/resource-language.relation'
 import followRelationTable from '../relations/followers.relation'
-import roleTable from './role.schema'
+import roleTable from './roles.schema'
 import collectionLikesTable from '../relations/collection-like.relation'
 import userRoleRelationTable from '../relations/user-role.relation'
 import collectionResourcesTable from '../relations/collection-resource.relation'
@@ -25,7 +25,7 @@ import resourceLikesTable from '../relations/resource-like.relation'
 import resourceEducationalStagesTable from '../relations/resource-educational-stage.relation'
 import itemsTable from './item.schema'
 import userAchievementsTable from '../relations/user-achievement.relation'
-import actionTable from './action.schema'
+import actionTable from './actions.schema'
 import notificationRelationTable from '../relations/notification.relation'
 import userItemRelationTable from '../relations/user-item.relation'
 import stateEnum from './stateEnum.schema'
diff --git a/src/db/schema/item.schema.ts b/src/db/schema/item.schema.ts
index 97b277c8f6bdaf3b0373c331bc4cd4f2dbb6b9e1..5075696c41d9a1193c1181ede5845b8178bc95c5 100644
--- a/src/db/schema/item.schema.ts
+++ b/src/db/schema/item.schema.ts
@@ -1,6 +1,6 @@
 import { boolean, serial, text, timestamp, varchar } from "drizzle-orm/pg-core";
 import { integer, numeric, pgTable } from "drizzle-orm/pg-core";
-import achievementTable from "./achievement.schema";
+import achievementTable from "./achievements.schema";
 import { createInsertSchema, createSelectSchema } from "drizzle-zod";
 import type { z } from "zod";
 import { sql } from "drizzle-orm";
diff --git a/src/db/schema/role.schema.ts b/src/db/schema/roles.schema.ts
similarity index 100%
rename from src/db/schema/role.schema.ts
rename to src/db/schema/roles.schema.ts
diff --git a/src/db/schema/subject.schema.ts b/src/db/schema/subjects.schema.ts
similarity index 99%
rename from src/db/schema/subject.schema.ts
rename to src/db/schema/subjects.schema.ts
index ae5f499dc992aab8946c6e9b97de8c0de657e2a3..217effd23f5cfc5e001f4d45651436c5f79ece24 100644
--- a/src/db/schema/subject.schema.ts
+++ b/src/db/schema/subjects.schema.ts
@@ -6,9 +6,6 @@ import {
 import { createInsertSchema, createSelectSchema } from 'drizzle-zod'
 import type { z } from 'zod'
 
-
-
-
 const subjectsTable = pgTable('subjects', {
     id: serial('id').primaryKey()
       .unique()
diff --git a/src/db/seeds/achievement.seed.ts b/src/db/seeds/achievement.seed.ts
index bfb0da532b4e42e5b4dc89f9c74e81977dea0e33..4dd2ec0797ec96c320d2e7d78537e11c8cbdadf1 100644
--- a/src/db/seeds/achievement.seed.ts
+++ b/src/db/seeds/achievement.seed.ts
@@ -1,6 +1,6 @@
 import type db from "..";
 import { achievementTable } from "../schema";
-import type { AchievementInput } from "../schema/achievement.schema";
+import type { AchievementInput } from "../schema/achievements.schema";
 
 export default async function seed(db: db) {
     await db.insert(achievementTable).values(achievementData)
diff --git a/src/db/seeds/action.seed.ts b/src/db/seeds/action.seed.ts
index 1ff06318cedf7b51177d9e5d0ce589aa0f7f77b3..097e8e86c0bbe4211a743ba79095da37ffc5f8d5 100644
--- a/src/db/seeds/action.seed.ts
+++ b/src/db/seeds/action.seed.ts
@@ -1,5 +1,5 @@
 import type db from "@/db";
-import actionTable, { type ActionInput } from "../schema/action.schema";
+import actionTable, { type ActionInput } from "../schema/actions.schema";
 
 export default async function seed(db: db) {
   await db.insert(actionTable).values(actionsData)
diff --git a/src/db/seeds/collections.seed.ts b/src/db/seeds/collections.seed.ts
index 0447040892006c3301a3db059ee043d6a1f4407b..c7f96bf38c5b609bc61e72c8a846ee8e34abfbd3 100644
--- a/src/db/seeds/collections.seed.ts
+++ b/src/db/seeds/collections.seed.ts
@@ -1,6 +1,6 @@
 import type db from '..'
-import type { CollectionInput } from '../schema/collection.schema'
-import collectionTable from '../schema/collection.schema'
+import type { CollectionInput } from '../schema/collections.schema'
+import collectionTable from '../schema/collections.schema'
 
 export default async function seed(db:db) {
     await db.insert(collectionTable).values(collectionData)
diff --git a/src/db/seeds/role.seed.ts b/src/db/seeds/role.seed.ts
index 7db7573d2851adfb3bd650d20774f3f2f3ed920b..e615ef899a4aa24f8b20df2e2e54ede3af2bf143 100644
--- a/src/db/seeds/role.seed.ts
+++ b/src/db/seeds/role.seed.ts
@@ -1,5 +1,5 @@
 import type db from "@/db";
-import roleTable, { type RoleInput } from "../schema/role.schema";
+import roleTable, { type RoleInput } from "../schema/roles.schema";
 
 export default async function seed(db: db) {
   await db.insert(roleTable).values(rolesData)
diff --git a/src/db/seeds/subjects.seed.ts b/src/db/seeds/subjects.seed.ts
index 5e8e10203d387ed3b6c81bd82335aacee2df1cb8..80a1ffd235ce3a81f006fed6117ae032d429ce45 100644
--- a/src/db/seeds/subjects.seed.ts
+++ b/src/db/seeds/subjects.seed.ts
@@ -1,6 +1,6 @@
 import type db from "..";
-import type { SubjectInput } from "../schema/subject.schema";
-import subjectsTable from "../schema/subject.schema";
+import type { SubjectInput } from "../schema/subjects.schema";
+import subjectsTable from "../schema/subjects.schema";
 
 export default async function seed(db:db) {
     await db.insert(subjectsTable).values(subjectsData)
diff --git a/src/routes/achievement.route.ts b/src/routes/achievement.route.ts
index 57180c4352771206fcec35cf1bec7ce8cba2721c..fad3cf00d6fffdf4dd57de966a52eaeac930cafe 100644
--- a/src/routes/achievement.route.ts
+++ b/src/routes/achievement.route.ts
@@ -2,7 +2,7 @@ import { AchievementService } from "@/services/achievement.service";
 import Container from "typedi";
 import { honoWithJwt } from "..";
 import { zValidator } from "@hono/zod-validator";
-import { achievementSchemas } from "@/db/schema/achievement.schema";
+import { achievementSchemas } from "@/db/schema/achievements.schema";
 import { createApexError, HttpStatus } from "@/services/error.service";
 import { Hono } from "hono";
 
diff --git a/src/routes/action.route.ts b/src/routes/action.route.ts
index bc8582f149f0da429855a950e28ff5e423eb6bd6..eb219c13f00eb0c87310c93900cbf1fe785c6a03 100644
--- a/src/routes/action.route.ts
+++ b/src/routes/action.route.ts
@@ -2,7 +2,7 @@ import { ActionService } from "@/services/action.service"
 import Container from "typedi"
 import { honoWithJwt } from ".."
 import { zValidator } from "@hono/zod-validator"
-import { actionSchemas } from "@/db/schema/action.schema"
+import { actionSchemas } from "@/db/schema/actions.schema"
 import { createApexError, HttpStatus } from "@/services/error.service"
 import { z } from "zod"
 
diff --git a/src/routes/collections.route.ts b/src/routes/collections.route.ts
index 9ae45c74003c6afb25f62185504d1ac5b342f2fa..c413eb660938ae6b0317d602ed35653aa2157067 100644
--- a/src/routes/collections.route.ts
+++ b/src/routes/collections.route.ts
@@ -2,7 +2,7 @@ import { CollectionsService } from "@/services/collections.service";
 import Container from "typedi";
 import { honoWithJwt } from "..";
 import { zValidator } from "@hono/zod-validator";
-import { collectionSchemas } from "@/db/schema/collection.schema";
+import { collectionSchemas } from "@/db/schema/collections.schema";
 import { createApexError, HttpStatus } from "@/services/error.service";
 import { Hono } from "hono";
 import { collectionStatsSchemas } from "@/db/schema/collection-stats.schema";
diff --git a/src/routes/role.route.ts b/src/routes/role.route.ts
index 7d7195c7e7ce363459976d36f5ba1c5ff915dc79..7c1a8920e01adf88211557c41787ae3cfb3c4ac2 100644
--- a/src/routes/role.route.ts
+++ b/src/routes/role.route.ts
@@ -2,7 +2,7 @@ import { RoleService } from "@/services/role.service"
 import Container from "typedi"
 import { honoWithJwt } from ".."
 import { zValidator } from "@hono/zod-validator"
-import { roleSchemas } from "@/db/schema/role.schema"
+import { roleSchemas } from "@/db/schema/roles.schema"
 import { createApexError, HttpStatus } from "@/services/error.service"
 import { z } from "zod"
 
diff --git a/src/routes/subjects.route.ts b/src/routes/subjects.route.ts
index d7396046edcfb3119ad12d85b6b68ecc9175ce31..ff981a963e3bd7088bec7b3e44f3ae172f8f2267 100644
--- a/src/routes/subjects.route.ts
+++ b/src/routes/subjects.route.ts
@@ -2,7 +2,7 @@ import { SubjectsService } from "@/services/subjects.service";
 import { createApexError, HttpStatus } from "@/services/error.service";
 import Container from "typedi";
 import { honoWithJwt } from "..";
-import { subjectSchema } from "@/db/schema/subject.schema";
+import { subjectSchema } from "@/db/schema/subjects.schema";
 import { Hono } from "hono";
 import { zValidator } from "@hono/zod-validator";
 
diff --git a/src/routes/user-role.route.ts b/src/routes/user-role.route.ts
index c2caaf8f537fe22f3b5f86da4a9ee11c6e0073d6..8bf74376c36b0e314ea18968621c6bcf4ea3a2bb 100644
--- a/src/routes/user-role.route.ts
+++ b/src/routes/user-role.route.ts
@@ -8,7 +8,7 @@ import { z } from "zod";
 import { UserService } from "@/services/user.service";
 import { userSchemas, type UserProfile } from "@/db/schema/user.schema";
 import { RoleService } from "@/services/role.service";
-import { roleSchemas, type RoleModel } from "@/db/schema/role.schema";
+import { roleSchemas, type RoleModel } from "@/db/schema/roles.schema";
 
 const service = Container.get(UserRoleRelationService)
 const userService = Container.get(UserService)
diff --git a/src/services/achievement.service.ts b/src/services/achievement.service.ts
index f5abce83416f79921ae422fbd8b6aa380fb30a44..fb28f6280109c583413d9b589eeb7ad8d97db81f 100644
--- a/src/services/achievement.service.ts
+++ b/src/services/achievement.service.ts
@@ -1,5 +1,5 @@
 import { AchievementRepo } from "@/db/repo/achievement.repo";
-import type { AchievementInput, AchievementModel, AchievementUpdate } from "@/db/schema/achievement.schema";
+import type { AchievementInput, AchievementModel, AchievementUpdate } from "@/db/schema/achievements.schema";
 import { Inject, Service } from "typedi";
 
 @Service()
diff --git a/src/services/action.service.ts b/src/services/action.service.ts
index abb012c403bb7e6d6b04abba8a3e225a54d42884..a8734335a8b4aec98266b1a48bd224056e3bb30d 100644
--- a/src/services/action.service.ts
+++ b/src/services/action.service.ts
@@ -1,6 +1,6 @@
 import type db from "@/db"
 import { ActionRepo } from "@/db/repo/action.repo"
-import type { ActionModel, ActionInput, ActionUpdate } from "@/db/schema/action.schema"
+import type { ActionModel, ActionInput, ActionUpdate } from "@/db/schema/actions.schema"
 import { Inject, Service } from "typedi"
 
 @Service()
diff --git a/src/services/collection-likes.service.ts b/src/services/collection-likes.service.ts
index 658360b1b0b4a2e3e11d9e857963be4d29969d86..1300be1b72cb6dcec2db981a349116835b603960 100644
--- a/src/services/collection-likes.service.ts
+++ b/src/services/collection-likes.service.ts
@@ -1,5 +1,5 @@
 import { collectionLikesRepo } from "@/db/repo/collection-likes.repo";
-import type { CollectionModel } from "@/db/schema/collection.schema";
+import type { CollectionModel } from "@/db/schema/collections.schema";
 import type { UserModel } from "@/db/schema/user.schema";
 import { Inject, Service } from "typedi";
 
diff --git a/src/services/collection-resources.service.ts b/src/services/collection-resources.service.ts
index 4d0b98487f322ae20bdb6e4eb79b6e26f9d882a7..8da5647f30b5f17e13a88f40f70344643dfdf19d 100644
--- a/src/services/collection-resources.service.ts
+++ b/src/services/collection-resources.service.ts
@@ -1,5 +1,5 @@
 import { collectionResourcesRepo } from "@/db/repo/collection-resources.repo";
-import type { CollectionModel } from "@/db/schema/collection.schema";
+import type { CollectionModel } from "@/db/schema/collections.schema";
 import type { ResourceModel } from "@/db/schema/resource.schema";
 import { Inject, Service } from "typedi";
 
diff --git a/src/services/collections.service.ts b/src/services/collections.service.ts
index 8bfeae954d08cccbcee672a24f94a17ae3859980..c843d030a5623640007a2abb4a6b695b8bbdfe13 100644
--- a/src/services/collections.service.ts
+++ b/src/services/collections.service.ts
@@ -4,7 +4,7 @@ import type {
   CollectionInput, 
   CollectionModel,
   CollectionUpdate
-} from '@/db/schema/collection.schema'
+} from '@/db/schema/collections.schema'
 
 @Service()
 export class CollectionsService {
diff --git a/src/services/resource-subjects.service.ts b/src/services/resource-subjects.service.ts
index 8157f92d35df240ce01ebb0e49a7d45b4f39cc05..72306d5b0b5bd2293340544c0bd3f969e61c1303 100644
--- a/src/services/resource-subjects.service.ts
+++ b/src/services/resource-subjects.service.ts
@@ -1,6 +1,6 @@
 import { resourceSubjects } from "@/db/repo/resource-subjects.repo";
 import type { ResourceModel } from "@/db/schema/resource.schema";
-import type { SubjectModel } from "@/db/schema/subject.schema";
+import type { SubjectModel } from "@/db/schema/subjects.schema";
 import { Inject, Service } from "typedi";
 
 
diff --git a/src/services/role.service.ts b/src/services/role.service.ts
index 1c606afb8c9c5d4de9ca552e618b5d72ccfca74b..025c31d10af71a113588418e53bf61cd9ab60e03 100644
--- a/src/services/role.service.ts
+++ b/src/services/role.service.ts
@@ -1,6 +1,6 @@
 import type db from "@/db"
 import { RoleRepo } from "@/db/repo/role.repo"
-import type { RoleModel, RoleInput, RoleUpdate } from "@/db/schema/role.schema"
+import type { RoleModel, RoleInput, RoleUpdate } from "@/db/schema/roles.schema"
 import { Inject, Service } from "typedi"
 
 @Service()
diff --git a/src/services/subjects.service.ts b/src/services/subjects.service.ts
index 8bbb445166d836b9c7a6a8de8d228b54075fd01f..d8b2f0c6e1821d87c0b9a988f1b4029fbcdc1b29 100644
--- a/src/services/subjects.service.ts
+++ b/src/services/subjects.service.ts
@@ -1,5 +1,5 @@
 import  { subjectsRepo } from "@/db/repo/subjects.repo";
-import type { SubjectInput, SubjectModel, SubjectUpdate } from "@/db/schema/subject.schema";
+import type { SubjectInput, SubjectModel, SubjectUpdate } from "@/db/schema/subjects.schema";
 import { Inject, Service } from "typedi";
 
 
diff --git a/src/services/user-achievements.service.ts b/src/services/user-achievements.service.ts
index ad2b9f6ca9ea9c257532d9003ec86d48d12d2ca4..c94c632d0a5424c217e123ae4d44009840758efd 100644
--- a/src/services/user-achievements.service.ts
+++ b/src/services/user-achievements.service.ts
@@ -1,5 +1,5 @@
 import { userAchievementsRepo } from "@/db/repo/user-achievements.repo";
-import type { AchievementModel } from "@/db/schema/achievement.schema";
+import type { AchievementModel } from "@/db/schema/achievements.schema";
 import type { UserModel } from "@/db/schema/user.schema";
 import { Inject, Service } from "typedi";
 
diff --git a/src/services/user-collection.service.ts b/src/services/user-collection.service.ts
index 99cad76c504b5c44d53457a8f2a484c60d973796..8c8de31c319599f1c6ebe4aadb8158cc7ca7d652 100644
--- a/src/services/user-collection.service.ts
+++ b/src/services/user-collection.service.ts
@@ -1,5 +1,5 @@
 import { userCollectionsRepo } from "@/db/repo/user-collection.repo";
-import type { CollectionModel } from "@/db/schema/collection.schema";
+import type { CollectionModel } from "@/db/schema/collections.schema";
 import type { UserModel } from "@/db/schema/user.schema";
 import { Inject, Service } from "typedi";