diff --git a/src/assets/js/index.js b/src/assets/js/index.js
index b13a3be3..912a8076 100644
--- a/src/assets/js/index.js
+++ b/src/assets/js/index.js
@@ -16,7 +16,7 @@
 █████████████████████████████████████████████████████████████
 */
 
-const functions = require('./modules/functions.js');
+const functions = require('./modules/function.js');
 
 const init = () => {
 	// init() gets executed only when the page is fully loaded
diff --git a/src/assets/js/modules/backgrounds.js b/src/assets/js/modules/background.js
similarity index 100%
rename from src/assets/js/modules/backgrounds.js
rename to src/assets/js/modules/background.js
diff --git a/src/assets/js/modules/codes.js b/src/assets/js/modules/code.js
similarity index 100%
rename from src/assets/js/modules/codes.js
rename to src/assets/js/modules/code.js
diff --git a/src/assets/js/modules/functions.js b/src/assets/js/modules/function.js
similarity index 93%
rename from src/assets/js/modules/functions.js
rename to src/assets/js/modules/function.js
index 4858cc7c..eba0c0d2 100644
--- a/src/assets/js/modules/functions.js
+++ b/src/assets/js/modules/function.js
@@ -16,15 +16,15 @@
 █████████████████████████████████████████████████████████████
 */
 
-const util       = require('./utility.js');
-const message    = require('./messages.js');
-const quotes     = require('./quotes.js');
-const background = require('./backgrounds.js');
-const codes      = require('./codes.js');
+const util       = require('./util.js');
+const message    = require('./message.js');
+const quotes     = require('./quote.js');
+const background = require('./background.js');
+const codes      = require('./code.js');
 
 let nal = navigator.language;
 
-module.exports = class Functions {
+module.exports = class Function {
     static setDaytimeMessage() {
         if (util.contains.call(codes.itcodes, nal)) message.itMessageSet(); //Italian
         else if (util.contains.call(codes.nlcodes, nal)) message.nlMessageSet(); //Dutch
diff --git a/src/assets/js/modules/messages.js b/src/assets/js/modules/message.js
similarity index 98%
rename from src/assets/js/modules/messages.js
rename to src/assets/js/modules/message.js
index 75d21c90..4cedc9e8 100644
--- a/src/assets/js/modules/messages.js
+++ b/src/assets/js/modules/message.js
@@ -16,9 +16,9 @@
 █████████████████████████████████████████████████████████████
 */
 
-const { setHTMLContent } = require('./utility.js');
+const { setHTMLContent } = require('./util.js');
 
-module.exports = class Messages {
+module.exports = class Message {
     // English
     static engMessageSet() {
         let hour = new Date().getHours(); // Get the current hour
diff --git a/src/assets/js/modules/quotes.js b/src/assets/js/modules/quote.js
similarity index 100%
rename from src/assets/js/modules/quotes.js
rename to src/assets/js/modules/quote.js
diff --git a/src/assets/js/modules/utility.js b/src/assets/js/modules/util.js
similarity index 98%
rename from src/assets/js/modules/utility.js
rename to src/assets/js/modules/util.js
index 6aed5304..ea04118a 100644
--- a/src/assets/js/modules/utility.js
+++ b/src/assets/js/modules/util.js
@@ -16,7 +16,7 @@
 █████████████████████████████████████████████████████████████
 */
 
-module.exports = class Utility {
+module.exports = class Util {
     // format time
     static formatTimeUnit(unit) {
         return unit < 10 ? '0' + unit : unit;
@@ -27,7 +27,7 @@ module.exports = class Utility {
         return document.querySelector(selector).innerHTML = content;
     };
 
-    // get random item
+    // get random item 
     static getRandIndex(array) {
         return Math.floor(Math.random() * (array.length - 1));
     }