Simplify path names, correct naming error for logs