diff --git a/wherehows-web/app/routes/search.js b/wherehows-web/app/routes/search.js
index 5ae9a6f3d0..ccf2e26027 100644
--- a/wherehows-web/app/routes/search.js
+++ b/wherehows-web/app/routes/search.js
@@ -3,7 +3,7 @@ import { isBlank } from '@ember/utils';
 import $ from 'jquery';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 import buildUrl from 'wherehows-web/utils/build-url';
-import highlightResults from 'wherehows-web/utils/api/datasets/highlight-results';
+import createSearchEntries from 'wherehows-web/utils/datasets/create-search-entries';
 
 const queryParams = ['keyword', 'category', 'page', 'source'];
 // TODO: DSS-6581 Create URL retrieval module
@@ -50,7 +50,7 @@ export default Route.extend(AuthenticatedRouteMixin, {
       if (status === 'ok') {
         const { keywords, data } = result;
 
-        highlightResults(data, keywords);
+        createSearchEntries(data, keywords);
 
         return result;
       }
diff --git a/wherehows-web/app/utils/api/datasets/highlight-results.ts b/wherehows-web/app/utils/datasets/create-search-entries.ts
similarity index 90%
rename from wherehows-web/app/utils/api/datasets/highlight-results.ts
rename to wherehows-web/app/utils/datasets/create-search-entries.ts
index f643ec6bf9..7077da0983 100644
--- a/wherehows-web/app/utils/api/datasets/highlight-results.ts
+++ b/wherehows-web/app/utils/datasets/create-search-entries.ts
@@ -13,7 +13,7 @@ interface ISearchDataset extends IDataset {
  * @param {Array<IDataset>} datum - given dataset data
  * @param keyword - keyword
  */
-const highlightResult = (datum: ISearchDataset, keyword: string): void => {
+const createSearchEntry = (datum: ISearchDataset, keyword: string): void => {
   const content = datum.schema;
 
   if (content === undefined) {
@@ -50,6 +50,6 @@ const highlightResult = (datum: ISearchDataset, keyword: string): void => {
  * @param {Array<IDataset>} data - given dataset data
  * @param {string} keyword - keyword
  */
-export default function apiDatasetsHighlightResults(data: Array<ISearchDataset>, keyword: string) {
-  data.forEach(datum => highlightResult(datum, keyword));
+export default function datasetsCreateSearchEntries(data: Array<ISearchDataset>, keyword: string) {
+  data.forEach(datum => createSearchEntry(datum, keyword));
 }
diff --git a/wherehows-web/tests/unit/utils/api/datasets/highlight-results-test.js b/wherehows-web/tests/unit/utils/datasets/create-search-entries-test.js
similarity index 79%
rename from wherehows-web/tests/unit/utils/api/datasets/highlight-results-test.js
rename to wherehows-web/tests/unit/utils/datasets/create-search-entries-test.js
index ba951f4bb9..8a07d1594d 100644
--- a/wherehows-web/tests/unit/utils/api/datasets/highlight-results-test.js
+++ b/wherehows-web/tests/unit/utils/datasets/create-search-entries-test.js
@@ -1,9 +1,9 @@
-import apiDatasetsHighlightResults from 'wherehows-web/utils/api/datasets/highlight-results';
+import datasetsCreateSearchEntries from 'wherehows-web/utils/datasets/create-search-entries';
 import { module, test } from 'qunit';
 import startMirage from 'wherehows-web/tests/helpers/setup-mirage';
 import { testSchemaA } from 'wherehows-web/mirage/data/schema';
 
-module('Unit | Utility | api/datasets/highlight results', {
+module('Unit | Utility | datasets/create search entries', {
   beforeEach() {
     startMirage(this.container);
   },
@@ -17,10 +17,10 @@ test('it works base case', function(assert) {
   const model = server.createList('dataset', 1, 'forUnitTests');
   const dataset = model[0];
 
-  let result = apiDatasetsHighlightResults([]);
+  let result = datasetsCreateSearchEntries([]);
   assert.ok(!result, 'Returns without error for nothing case');
 
-  result = apiDatasetsHighlightResults(model);
+  result = datasetsCreateSearchEntries(model);
   assert.equal(dataset.id, 0, 'Sanity check: Created model successfully');
   assert.equal(dataset.originalSchema, testSchemaA, 'Preserves original schema properly');
   assert.equal(dataset.schema, testSchemaA.slice(0, 499), 'Partial schema from beginning if no keyword found');
@@ -31,7 +31,7 @@ test('it works for keyword cases', function(assert) {
   const model = server.createList('dataset', 1, 'forUnitTests');
   const dataset = model[0];
 
-  let result = apiDatasetsHighlightResults(model, 'Rebel');
+  let result = datasetsCreateSearchEntries(model, 'Rebel');
   assert.equal(dataset.id, 0, 'Sanity check: Created model successfully again');
   assert.equal(dataset.schema, testSchemaA.slice(29, 529), 'Partial schema starts from keyword index');
 });