Also help to solve #67 - Update window name