diff --git a/elektronLogging/clsfnTaskDistOverheadLogger.go b/elektronLogging/clsfnTaskDistOverheadLogger.go
index d674233..2b70b62 100644
--- a/elektronLogging/clsfnTaskDistOverheadLogger.go
+++ b/elektronLogging/clsfnTaskDistOverheadLogger.go
@@ -14,7 +14,7 @@ type ClsfnTaskDistrOverheadLogger struct {
 func NewClsfnTaskDistrOverheadLogger(logType int, prefix string) *ClsfnTaskDistrOverheadLogger {
 	cLog := &ClsfnTaskDistrOverheadLogger{}
 	cLog.Type = logType
-	cLog.SetLogFile(prefix)
+	cLog.CreateLogFile(prefix)
 	return cLog
 }
 
@@ -28,7 +28,7 @@ func (cLog ClsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, logDa
 			logger.WithFields(logData).Println(message)
 		}
 
-		logger.SetOutput(cLog.LogFileName)
+		logger.SetOutput(cLog.LogFile)
 		logger.WithFields(logData).Println(message)
 	}
 	if cLog.next != nil {
@@ -36,7 +36,7 @@ func (cLog ClsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, logDa
 	}
 }
 
-func (cLog *ClsfnTaskDistrOverheadLogger) SetLogFile(prefix string) {
+func (cLog *ClsfnTaskDistrOverheadLogger) CreateLogFile(prefix string) {
 
 	filename := strings.Join([]string{prefix, config.TaskDistrConfig.FilenameExtension}, "")
 	dirName := logDir.getDirName()
@@ -44,7 +44,7 @@ func (cLog *ClsfnTaskDistrOverheadLogger) SetLogFile(prefix string) {
 		if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
 			log.Fatal("Unable to create logFile: ", err)
 		} else {
-			cLog.LogFileName = logFile
+			cLog.LogFile = logFile
 			cLog.AllowOnConsole = config.TaskDistrConfig.AllowOnConsole
 		}
 	}
diff --git a/elektronLogging/consoleLogger.go b/elektronLogging/consoleLogger.go
index a213003..fd2d079 100644
--- a/elektronLogging/consoleLogger.go
+++ b/elektronLogging/consoleLogger.go
@@ -14,7 +14,7 @@ type ConsoleLogger struct {
 func NewConsoleLogger(logType int, prefix string) *ConsoleLogger {
 	cLog := &ConsoleLogger{}
 	cLog.Type = logType
-	cLog.SetLogFile(prefix)
+	cLog.CreateLogFile(prefix)
 	return cLog
 }
 func (cLog ConsoleLogger) Log(logType int, level log.Level, logData log.Fields, message string) {
@@ -25,7 +25,7 @@ func (cLog ConsoleLogger) Log(logType int, level log.Level, logData log.Fields,
 		logger.SetOutput(os.Stdout)
 		logger.WithFields(logData).Println(message)
 
-		logger.SetOutput(cLog.LogFileName)
+		logger.SetOutput(cLog.LogFile)
 		logger.WithFields(logData).Println(message)
 	}
 	if cLog.next != nil {
@@ -33,7 +33,7 @@ func (cLog ConsoleLogger) Log(logType int, level log.Level, logData log.Fields,
 	}
 }
 
-func (cLog *ConsoleLogger) SetLogFile(prefix string) {
+func (cLog *ConsoleLogger) CreateLogFile(prefix string) {
 
 	filename := strings.Join([]string{prefix, config.ConsoleConfig.FilenameExtension}, "")
 	dirName := logDir.getDirName()
@@ -41,7 +41,7 @@ func (cLog *ConsoleLogger) SetLogFile(prefix string) {
 		if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
 			log.Fatal("Unable to create logFile: ", err)
 		} else {
-			cLog.LogFileName = logFile
+			cLog.LogFile = logFile
 			cLog.AllowOnConsole = config.ConsoleConfig.AllowOnConsole
 		}
 	}
diff --git a/elektronLogging/logger.go b/elektronLogging/logger.go
index 72d32d7..9178c39 100644
--- a/elektronLogging/logger.go
+++ b/elektronLogging/logger.go
@@ -35,7 +35,7 @@ func BuildLogger(prefix string) {
 	// create a chain of loggers
 	head := &LoggerImpl{}
 	cLog := NewConsoleLogger(CONSOLE, prefix)
-	pLog := NewPcpLogger(PCP, prefix)
+	pLog := NewPCPLogger(PCP, prefix)
 	schedTraceLog := NewSchedTraceLogger(SCHED_TRACE, prefix)
 	spsLog := NewSchedPolicySwitchLogger(SPS, prefix)
 	schedWindowLog := NewSchedWindowLogger(SCHED_WINDOW, prefix)
diff --git a/elektronLogging/loggerChain.go b/elektronLogging/loggerChain.go
index 8a8207a..b92904c 100644
--- a/elektronLogging/loggerChain.go
+++ b/elektronLogging/loggerChain.go
@@ -8,12 +8,12 @@ import (
 type Logger interface {
 	SetNext(logType Logger)
 	Log(logType int, level log.Level, logData log.Fields, message string)
-	SetLogFile(prefix string)
+	CreateLogFile(prefix string)
 }
 type LoggerImpl struct {
 	Type           int
 	AllowOnConsole bool
-	LogFileName    *os.File
+	LogFile    *os.File
 	next           Logger
 }
 
diff --git a/elektronLogging/loggerConfig.go b/elektronLogging/loggerConfig.go
index a4f57ec..344540e 100644
--- a/elektronLogging/loggerConfig.go
+++ b/elektronLogging/loggerConfig.go
@@ -56,7 +56,7 @@ func (c *LoggerConfig) GetConfig() *LoggerConfig {
 	}
 	err = yaml.Unmarshal(yamlFile, c)
 	if err != nil {
-		log.Fatalf("Error in yaml unmarshal: %v", err)
+		log.Fatalf("Error in unmarshalling yaml: %v", err)
 	}
 
 	return c
diff --git a/elektronLogging/pcpLogger.go b/elektronLogging/pcpLogger.go
index c6e7692..db1e432 100644
--- a/elektronLogging/pcpLogger.go
+++ b/elektronLogging/pcpLogger.go
@@ -7,18 +7,18 @@ import (
 	"strings"
 )
 
-type PcpLogger struct {
+type PCPLogger struct {
 	LoggerImpl
 }
 
-func NewPcpLogger(logType int, prefix string) *PcpLogger {
-	pLog := &PcpLogger{}
+func NewPCPLogger(logType int, prefix string) *PCPLogger {
+	pLog := &PCPLogger{}
 	pLog.Type = logType
-	pLog.SetLogFile(prefix)
+	pLog.CreateLogFile(prefix)
 	return pLog
 }
 
-func (pLog PcpLogger) Log(logType int, level log.Level, logData log.Fields, message string) {
+func (pLog PCPLogger) Log(logType int, level log.Level, logData log.Fields, message string) {
 	if pLog.Type == logType {
 
 		logger.SetLevel(level)
@@ -28,7 +28,7 @@ func (pLog PcpLogger) Log(logType int, level log.Level, logData log.Fields, mess
 			logger.WithFields(logData).Println(message)
 		}
 
-		logger.SetOutput(pLog.LogFileName)
+		logger.SetOutput(pLog.LogFile)
 		logger.WithFields(logData).Println(message)
 	}
 	if pLog.next != nil {
@@ -36,7 +36,7 @@ func (pLog PcpLogger) Log(logType int, level log.Level, logData log.Fields, mess
 	}
 }
 
-func (pLog *PcpLogger) SetLogFile(prefix string) {
+func (pLog *PCPLogger) CreateLogFile(prefix string) {
 
 	filename := strings.Join([]string{prefix, config.PCPConfig.FilenameExtension}, "")
 	dirName := logDir.getDirName()
@@ -44,7 +44,7 @@ func (pLog *PcpLogger) SetLogFile(prefix string) {
 		if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
 			log.Fatal("Unable to create logFile: ", err)
 		} else {
-			pLog.LogFileName = logFile
+			pLog.LogFile = logFile
 			pLog.AllowOnConsole = config.PCPConfig.AllowOnConsole
 		}
 	}
diff --git a/elektronLogging/schedPolicySwitchLogger.go b/elektronLogging/schedPolicySwitchLogger.go
index 7275871..bae2c3e 100644
--- a/elektronLogging/schedPolicySwitchLogger.go
+++ b/elektronLogging/schedPolicySwitchLogger.go
@@ -14,7 +14,7 @@ type SchedPolicySwitchLogger struct {
 func NewSchedPolicySwitchLogger(logType int, prefix string) *SchedPolicySwitchLogger {
 	sLog := &SchedPolicySwitchLogger{}
 	sLog.Type = logType
-	sLog.SetLogFile(prefix)
+	sLog.CreateLogFile(prefix)
 	return sLog
 }
 
@@ -28,7 +28,7 @@ func (sLog SchedPolicySwitchLogger) Log(logType int, level log.Level, logData lo
 			logger.WithFields(logData).Println(message)
 		}
 
-		logger.SetOutput(sLog.LogFileName)
+		logger.SetOutput(sLog.LogFile)
 		logger.WithFields(logData).Println(message)
 	}
 	if sLog.next != nil {
@@ -36,7 +36,7 @@ func (sLog SchedPolicySwitchLogger) Log(logType int, level log.Level, logData lo
 	}
 }
 
-func (sLog *SchedPolicySwitchLogger) SetLogFile(prefix string) {
+func (sLog *SchedPolicySwitchLogger) CreateLogFile(prefix string) {
 
 	filename := strings.Join([]string{prefix, config.SPSConfig.FilenameExtension}, "")
 	dirName := logDir.getDirName()
@@ -44,7 +44,7 @@ func (sLog *SchedPolicySwitchLogger) SetLogFile(prefix string) {
 		if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
 			log.Fatal("Unable to create logFile: ", err)
 		} else {
-			sLog.LogFileName = logFile
+			sLog.LogFile = logFile
 			sLog.AllowOnConsole = config.SPSConfig.AllowOnConsole
 		}
 	}
diff --git a/elektronLogging/schedTraceLogger.go b/elektronLogging/schedTraceLogger.go
index da3df7c..8a4c5ba 100644
--- a/elektronLogging/schedTraceLogger.go
+++ b/elektronLogging/schedTraceLogger.go
@@ -14,7 +14,7 @@ type SchedTraceLogger struct {
 func NewSchedTraceLogger(logType int, prefix string) *SchedTraceLogger {
 	sLog := &SchedTraceLogger{}
 	sLog.Type = logType
-	sLog.SetLogFile(prefix)
+	sLog.CreateLogFile(prefix)
 	return sLog
 }
 
@@ -28,7 +28,7 @@ func (sLog SchedTraceLogger) Log(logType int, level log.Level, logData log.Field
 			logger.WithFields(logData).Println(message)
 		}
 
-		logger.SetOutput(sLog.LogFileName)
+		logger.SetOutput(sLog.LogFile)
 		logger.WithFields(logData).Println(message)
 	}
 	if sLog.next != nil {
@@ -36,7 +36,7 @@ func (sLog SchedTraceLogger) Log(logType int, level log.Level, logData log.Field
 	}
 }
 
-func (sLog *SchedTraceLogger) SetLogFile(prefix string) {
+func (sLog *SchedTraceLogger) CreateLogFile(prefix string) {
 
 	filename := strings.Join([]string{prefix, config.SchedTraceConfig.FilenameExtension}, "")
 	dirName := logDir.getDirName()
@@ -44,7 +44,7 @@ func (sLog *SchedTraceLogger) SetLogFile(prefix string) {
 		if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
 			log.Fatal("Unable to create logFile: ", err)
 		} else {
-			sLog.LogFileName = logFile
+			sLog.LogFile = logFile
 			sLog.AllowOnConsole = config.SchedTraceConfig.AllowOnConsole
 		}
 	}
diff --git a/elektronLogging/schedWindowLogger.go b/elektronLogging/schedWindowLogger.go
index e51677c..09fc633 100644
--- a/elektronLogging/schedWindowLogger.go
+++ b/elektronLogging/schedWindowLogger.go
@@ -14,7 +14,7 @@ type SchedWindowLogger struct {
 func NewSchedWindowLogger(logType int, prefix string) *SchedWindowLogger {
 	sLog := &SchedWindowLogger{}
 	sLog.Type = logType
-	sLog.SetLogFile(prefix)
+	sLog.CreateLogFile(prefix)
 	return sLog
 }
 
@@ -28,7 +28,7 @@ func (sLog SchedWindowLogger) Log(logType int, level log.Level, logData log.Fiel
 			logger.WithFields(logData).Println(message)
 		}
 
-		logger.SetOutput(sLog.LogFileName)
+		logger.SetOutput(sLog.LogFile)
 		logger.WithFields(logData).Println(message)
 	}
 	if sLog.next != nil {
@@ -36,7 +36,7 @@ func (sLog SchedWindowLogger) Log(logType int, level log.Level, logData log.Fiel
 	}
 }
 
-func (sLog *SchedWindowLogger) SetLogFile(prefix string) {
+func (sLog *SchedWindowLogger) CreateLogFile(prefix string) {
 
 	filename := strings.Join([]string{prefix, config.SchedWindowConfig.FilenameExtension}, "")
 	dirName := logDir.getDirName()
@@ -44,7 +44,7 @@ func (sLog *SchedWindowLogger) SetLogFile(prefix string) {
 		if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
 			log.Fatal("Unable to create logFile: ", err)
 		} else {
-			sLog.LogFileName = logFile
+			sLog.LogFile = logFile
 			sLog.AllowOnConsole = config.SchedWindowConfig.AllowOnConsole
 		}
 	}