Fix variable names for Windows and Unix