Issue #26 - convert loggers to proper naming convention