Fixed bugs changed log file names

Change-Id: I40ff24f54f6b860f262a779f03a0a4e803356dc7