diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts
index 1346d3d839..044ab854b7 100644
--- a/packages/backend/src/core/CustomEmojiService.ts
+++ b/packages/backend/src/core/CustomEmojiService.ts
@@ -60,7 +60,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async Request(data: {
+	public async request(data: {
 		driveFile: MiDriveFile;
 		name: string;
 		category: string | null;
@@ -196,7 +196,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 		}
 	}
 	@bindThis
-	public async RequestUpdate(id: MiEmoji['id'], data: {
+	public async updateRequest(id: MiEmoji['id'], data: {
 		driveFile?: MiDriveFile;
 		name?: string;
 		category?: string | null;
@@ -332,7 +332,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 		}
 	}
 	@bindThis
-	public async RequestDelete(id: MiEmojiRequest['id']) {
+	public async deleteRequest(id: MiEmojiRequest['id']) {
 		const emoji = await this.emojiRequestsRepository.findOneByOrFail({ id: id });
 
 		await this.emojiRequestsRepository.delete(emoji.id);
diff --git a/packages/backend/src/core/entities/DriveFileEntityService.ts b/packages/backend/src/core/entities/DriveFileEntityService.ts
index d5406373b7..9ff986592e 100644
--- a/packages/backend/src/core/entities/DriveFileEntityService.ts
+++ b/packages/backend/src/core/entities/DriveFileEntityService.ts
@@ -135,10 +135,7 @@ export class DriveFileEntityService {
 	}
 	@bindThis
 	public async getFromUrl(url: string): Promise<MiDriveFile | null> {
-		const file = await this.driveFilesRepository.findOneBy({ url: url });
-		if (file === null ) return null;
-
-		return file;
+		return this.driveFilesRepository.findOneBy({ url: url });
 	}
 	@bindThis
 	public async calcDriveUsageOf(user: MiUser['id'] | { id: MiUser['id'] }): Promise<number> {
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add-request.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add-request.ts
index 50ffb89b06..609297f667 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/add-request.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/add-request.ts
@@ -68,7 +68,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 			if (driveFile == null) throw new ApiError(meta.errors.noSuchFile);
 
-			const emoji = await this.customEmojiService.Request({
+			const emoji = await this.customEmojiService.request({
 				driveFile,
 				name: ps.name,
 				category: ps.category ?? null,
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts b/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts
index 9711db5a11..99747d3808 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts
@@ -42,7 +42,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				await this.customEmojiService.delete(ps.id, me);
 			}
 			if (RequestEmoji != null) {
-				await this.customEmojiService.RequestDelete(ps.id);
+				await this.customEmojiService.deleteRequest(ps.id);
 			}
 		});
 	}
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/update-request.ts b/packages/backend/src/server/api/endpoints/admin/emoji/update-request.ts
index 98e50389cc..4be16bb780 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/update-request.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/update-request.ts
@@ -101,9 +101,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					localOnly: ps.localOnly ?? false,
 					roleIdsThatCanBeUsedThisEmojiAsReaction: [],
 				}, me);
-				await this.customEmojiService.RequestDelete(ps.id);
+				await this.customEmojiService.deleteRequest(ps.id);
 			} else {
-				await this.customEmojiService.RequestUpdate(ps.id, {
+				await this.customEmojiService.updateRequest(ps.id, {
 					name: ps.name,
 					category: ps.category ?? null,
 					aliases: ps.aliases ?? [],
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
index 7f7dc774d5..89bf0880f6 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
@@ -101,7 +101,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			} else {
 				const file = await this.driveFileEntityService.getFromUrl(emoji.originalUrl);
 				if (file === null) throw new ApiError(meta.errors.noSuchFile);
-				await this.customEmojiService.Request({
+				await this.customEmojiService.request({
 					driveFile: file,
 					name: ps.name,
 					category: ps.category ?? null,