Improved naming of global variable and log messages