diff --git a/js/check_config.js b/js/check_config.js
index da2a4aa5..ab7944c6 100644
--- a/js/check_config.js
+++ b/js/check_config.js
@@ -17,7 +17,7 @@ const fs = require("fs");
 
 const rootPath = path.resolve(__dirname + "/../");
 const config = require(rootPath + "/.eslintrc.json");
-const Logger = require(rootPath + "/js/logger.js");
+const Log = require(rootPath + "/js/logger.js");
 const Utils = require(rootPath + "/js/utils.js");
 
 /* getConfigFile()
@@ -37,19 +37,19 @@ function checkConfigFile() {
 	const configFileName = getConfigFile();
 	// Check if file is present
 	if (fs.existsSync(configFileName) === false) {
-		Logger.error(Utils.colors.error("File not found: "), configFileName);
+		Log.error(Utils.colors.error("File not found: "), configFileName);
 		return;
 	}
 	// check permission
 	try {
 		fs.accessSync(configFileName, fs.F_OK);
 	} catch (e) {
-		Logger.log(Utils.colors.error(e));
+		Log.log(Utils.colors.error(e));
 		return;
 	}
 
 	// Validate syntax of the configuration file.
-	Logger.info(Utils.colors.info("Checking file... "), configFileName);
+	Log.info(Utils.colors.info("Checking file... "), configFileName);
 
 	// I'm not sure if all ever is utf-8
 	fs.readFile(configFileName, "utf-8", function (err, data) {
@@ -58,12 +58,12 @@ function checkConfigFile() {
 		}
 		const messages = linter.verify(data, config);
 		if (messages.length === 0) {
-			Logger.log("Your configuration file doesn't contain syntax errors :)");
+			Log.log("Your configuration file doesn't contain syntax errors :)");
 			return true;
 		} else {
 			// In case the there errors show messages and return
 			messages.forEach((error) => {
-				Logger.log("Line", error.line, "col", error.column, error.message);
+				Log.log("Line", error.line, "col", error.column, error.message);
 			});
 		}
 	});
diff --git a/modules/default/calendar/calendarfetcher.js b/modules/default/calendar/calendarfetcher.js
index d4cc4f4a..6258ed39 100644
--- a/modules/default/calendar/calendarfetcher.js
+++ b/modules/default/calendar/calendarfetcher.js
@@ -4,7 +4,7 @@
  * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
-
+const Log = require("../../../js/logger.js");
 const ical = require("./vendor/ical.js");
 const moment = require("moment");
 
@@ -436,7 +436,7 @@ var CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntr
 	 * Broadcast the existing events.
 	 */
 	this.broadcastEvents = function () {
-		console.info("Broadcasting " + events.length + " events.");
+		Log.info("Broadcasting " + events.length + " events.");
 		eventsReceivedCallback(self);
 	};
 
diff --git a/modules/default/calendar/node_helper.js b/modules/default/calendar/node_helper.js
index 6ac5395f..e731ca6c 100644
--- a/modules/default/calendar/node_helper.js
+++ b/modules/default/calendar/node_helper.js
@@ -8,12 +8,12 @@
 const NodeHelper = require("node_helper");
 const validUrl = require("valid-url");
 const CalendarFetcher = require("./calendarfetcher.js");
-const Logger = require("../../../js/logger");
+const Log = require("../../../js/logger");
 
 module.exports = NodeHelper.create({
 	// Override start method.
 	start: function () {
-		Logger.log("Starting node helper for: " + this.name);
+		Log.log("Starting node helper for: " + this.name);
 		this.fetchers = [];
 	},
 
@@ -41,7 +41,7 @@ module.exports = NodeHelper.create({
 
 		var fetcher;
 		if (typeof self.fetchers[identifier + url] === "undefined") {
-			Logger.log("Create new calendar fetcher for url: " + url + " - Interval: " + fetchInterval);
+			Log.log("Create new calendar fetcher for url: " + url + " - Interval: " + fetchInterval);
 			fetcher = new CalendarFetcher(url, fetchInterval, excludedEvents, maximumEntries, maximumNumberOfDays, auth, broadcastPastEvents);
 
 			fetcher.onReceive(function (fetcher) {
@@ -53,7 +53,7 @@ module.exports = NodeHelper.create({
 			});
 
 			fetcher.onError(function (fetcher, error) {
-				Logger.error("Calendar Error. Could not fetch calendar: ", fetcher.url(), error);
+				Log.error("Calendar Error. Could not fetch calendar: ", fetcher.url(), error);
 				self.sendSocketNotification("FETCH_ERROR", {
 					id: identifier,
 					url: fetcher.url(),
@@ -63,7 +63,7 @@ module.exports = NodeHelper.create({
 
 			self.fetchers[identifier + url] = fetcher;
 		} else {
-			Logger.log("Use existing calendar fetcher for url: " + url);
+			Log.log("Use existing calendar fetcher for url: " + url);
 			fetcher = self.fetchers[identifier + url];
 			fetcher.broadcastEvents();
 		}
diff --git a/modules/default/newsfeed/fetcher.js b/modules/default/newsfeed/fetcher.js
index 3877818b..6140780a 100644
--- a/modules/default/newsfeed/fetcher.js
+++ b/modules/default/newsfeed/fetcher.js
@@ -5,9 +5,10 @@
  * MIT Licensed.
  */
 
-var FeedMe = require("feedme");
-var request = require("request");
-var iconv = require("iconv-lite");
+const Log = require("../../../js/logger.js");
+const FeedMe = require("feedme");
+const request = require("request");
+const iconv = require("iconv-lite");
 
 /* Fetcher
  * Responsible for requesting an update on the set interval and broadcasting the data.
@@ -130,7 +131,7 @@ var Fetcher = function (url, reloadInterval, encoding, logFeedWarnings) {
 			//console.log('No items to broadcast yet.');
 			return;
 		}
-		//console.log('Broadcasting ' + items.length + ' items.');
+		Log.info("Broadcasting " + items.length + " items.");
 		itemsReceivedCallback(self);
 	};
 
diff --git a/modules/default/newsfeed/node_helper.js b/modules/default/newsfeed/node_helper.js
index e7748f5f..4ccef958 100644
--- a/modules/default/newsfeed/node_helper.js
+++ b/modules/default/newsfeed/node_helper.js
@@ -8,12 +8,12 @@
 const NodeHelper = require("node_helper");
 const validUrl = require("valid-url");
 const Fetcher = require("./fetcher.js");
-const Logger = require("../../../js/logger");
+const Log = require("../../../js/logger");
 
 module.exports = NodeHelper.create({
 	// Override start method.
 	start: function () {
-		Logger.log("Starting node helper for: " + this.name);
+		Log.log("Starting node helper for: " + this.name);
 		this.fetchers = [];
 	},
 
@@ -45,7 +45,7 @@ module.exports = NodeHelper.create({
 
 		var fetcher;
 		if (typeof self.fetchers[url] === "undefined") {
-			Logger.log("Create new news fetcher for url: " + url + " - Interval: " + reloadInterval);
+			Log.log("Create new news fetcher for url: " + url + " - Interval: " + reloadInterval);
 			fetcher = new Fetcher(url, reloadInterval, encoding, config.logFeedWarnings);
 
 			fetcher.onReceive(function (fetcher) {
@@ -61,7 +61,7 @@ module.exports = NodeHelper.create({
 
 			self.fetchers[url] = fetcher;
 		} else {
-			Logger.log("Use existing news fetcher for url: " + url);
+			Log.log("Use existing news fetcher for url: " + url);
 			fetcher = self.fetchers[url];
 			fetcher.setReloadInterval(reloadInterval);
 			fetcher.broadcastItems();
diff --git a/modules/default/updatenotification/node_helper.js b/modules/default/updatenotification/node_helper.js
index 1e47b47e..0c206c5f 100644
--- a/modules/default/updatenotification/node_helper.js
+++ b/modules/default/updatenotification/node_helper.js
@@ -1,9 +1,10 @@
-var SimpleGit = require("simple-git");
-var simpleGits = [];
-var fs = require("fs");
-var path = require("path");
-var defaultModules = require(__dirname + "/../defaultmodules.js");
-var NodeHelper = require("node_helper");
+const SimpleGit = require("simple-git");
+const simpleGits = [];
+const fs = require("fs");
+const path = require("path");
+const defaultModules = require(__dirname + "/../defaultmodules.js");
+const Log = require(__dirname + "/../../../js/logger.js");
+const NodeHelper = require("node_helper");
 
 module.exports = NodeHelper.create({
 	config: {},
@@ -27,7 +28,7 @@ module.exports = NodeHelper.create({
 				var moduleFolder = path.normalize(__dirname + "/../../" + moduleName);
 
 				try {
-					//console.log("checking git for module="+moduleName)
+					Log.info("Checking git for module: " + moduleName);
 					let stat = fs.statSync(path.join(moduleFolder, ".git"));
 					promises.push(this.resolveRemote(moduleName, moduleFolder));
 				} catch (err) {