diff --git a/src/collections/queries/modelById.js b/src/collections/queries/findByID.js
similarity index 85%
rename from src/collections/queries/modelById.js
rename to src/collections/queries/findByID.js
index b3c2dc59b2..ec41033346 100644
--- a/src/collections/queries/modelById.js
+++ b/src/collections/queries/findByID.js
@@ -1,4 +1,4 @@
-const modelById = async (query) => {
+const findByID = async (query) => {
   const options = {};
   const { depth } = query;
 
@@ -20,4 +20,4 @@ const modelById = async (query) => {
   }
 };
 
-module.exports = modelById;
+module.exports = findByID;
diff --git a/src/collections/queries/index.js b/src/collections/queries/index.js
index 8d5bee994e..9e28bcf040 100644
--- a/src/collections/queries/index.js
+++ b/src/collections/queries/index.js
@@ -1,9 +1,9 @@
-const modelById = require('./modelById');
+const findByID = require('./findByID');
 const find = require('./find');
 const create = require('./create');
 
 module.exports = {
-  modelById,
+  findByID,
   find,
   create,
 };
diff --git a/src/collections/requestHandlers/create.js b/src/collections/requestHandlers/create.js
index 5ae1d3a63f..67bf121a84 100644
--- a/src/collections/requestHandlers/create.js
+++ b/src/collections/requestHandlers/create.js
@@ -1,8 +1,9 @@
 const httpStatus = require('http-status');
 const formatErrorResponse = require('../../responses/formatError');
 const formatSuccessResponse = require('../../responses/formatSuccess');
+const { create } = require('../queries');
 
-const create = (req, res) => {
+const createHandler = (req, res) => {
   req.model.create(req.body, (err, doc) => {
     if (err) {
       return res.status(httpStatus.INTERNAL_SERVER_ERROR)
@@ -17,4 +18,4 @@ const create = (req, res) => {
   });
 };
 
-module.exports = create;
+module.exports = createHandler;
diff --git a/src/collections/requestHandlers/findOne.js b/src/collections/requestHandlers/findByID.js
similarity index 71%
rename from src/collections/requestHandlers/findOne.js
rename to src/collections/requestHandlers/findByID.js
index 7bc470938c..80cd490d52 100644
--- a/src/collections/requestHandlers/findOne.js
+++ b/src/collections/requestHandlers/findByID.js
@@ -1,8 +1,8 @@
 const httpStatus = require('http-status');
-const { modelById } = require('../queries');
+const { findByID } = require('../queries');
 const formatErrorResponse = require('../../responses/formatError');
 
-const findOne = async (req, res) => {
+const findByIDHandler = async (req, res) => {
   const query = {
     Model: req.model,
     id: req.params.id,
@@ -12,12 +12,11 @@ const findOne = async (req, res) => {
   };
 
   try {
-    const doc = await modelById(query);
+    const doc = await findByID(query);
     return res.json(doc);
   } catch (err) {
-    console.log(err);
     return res.status(httpStatus.INTERNAL_SERVER_ERROR).json(formatErrorResponse(err, 'mongoose'));
   }
 };
 
-module.exports = findOne;
+module.exports = findByIDHandler;
diff --git a/src/collections/requestHandlers/index.js b/src/collections/requestHandlers/index.js
index 79ac5f3290..59be6f1bbb 100644
--- a/src/collections/requestHandlers/index.js
+++ b/src/collections/requestHandlers/index.js
@@ -1,13 +1,13 @@
 const create = require('./create');
 const destroy = require('./destroy');
-const findOne = require('./findOne');
+const findByID = require('./findByID');
 const query = require('./query');
 const update = require('./update');
 
 module.exports = {
   create,
   destroy,
-  findOne,
+  findByID,
   query,
   update,
 };
diff --git a/src/collections/routes.js b/src/collections/routes.js
index 977feea46d..5864249a4f 100644
--- a/src/collections/routes.js
+++ b/src/collections/routes.js
@@ -6,7 +6,7 @@ const loadPolicy = require('../auth/loadPolicy');
 const bindCollectionMiddleware = require('./bindCollection');
 
 const {
-  query, create, findOne, destroy, update,
+  query, create, findByID, destroy, update,
 } = requestHandlers;
 
 const router = express.Router();
@@ -22,7 +22,7 @@ const registerRoutes = ({ model, config }) => {
     .post(loadPolicy(config.policies.create), create);
 
   router.route(`/${config.slug}/:id`)
-    .get(loadPolicy(config.policies.read), findOne)
+    .get(loadPolicy(config.policies.read), findByID)
     .put(loadPolicy(config.policies.update), update)
     .delete(loadPolicy(config.policies.destroy), destroy);
 
diff --git a/src/uploads/requestHandlers.js b/src/uploads/requestHandlers.js
index 696b274f1c..0d8b74acd9 100644
--- a/src/uploads/requestHandlers.js
+++ b/src/uploads/requestHandlers.js
@@ -1,7 +1,7 @@
 const mkdirp = require('mkdirp');
 const httpStatus = require('http-status');
 const resizeAndSave = require('./images/imageResizer');
-const modelById = require('../collections/queries/modelById');
+const findByID = require('../collections/queries/findByID');
 const { NotFound } = require('../errors');
 
 async function fileTypeHandler(config, uploadConfig, file) {
@@ -19,7 +19,7 @@ const update = async (req, res, next, config) => {
     id: req.params.id,
     locale: req.locale,
   };
-  const doc = await modelById(query, { returnRawDoc: true });
+  const doc = await findByID(query, { returnRawDoc: true });
   if (!doc) {
     res.status(httpStatus.NOT_FOUND)
       .json(new NotFound());